|
|
|
@@ -6,7 +6,9 @@ import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.IdWorker; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.WxRentContract; |
|
|
|
import com.iformall.domain.po.WxShop; |
|
|
|
import com.iformall.enums.EnumRentContractStatus; |
|
|
|
import com.iformall.enums.EnumShopStatus; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
@@ -24,10 +26,7 @@ import javax.servlet.http.HttpServletRequest; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
import java.io.FileInputStream; |
|
|
|
import java.io.InputStream; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
/** |
|
|
|
* @author gongbiao |
|
|
|
@@ -59,8 +58,27 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public WxRentContract getById(Long id) { |
|
|
|
return wxRentContractMapper.selectByPrimaryKey(id); |
|
|
|
public ResultData getById(Long id) { |
|
|
|
Map<String,Object> result=new HashMap<>(); |
|
|
|
WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(id); |
|
|
|
result.put("wxRentContract",wxRentContract); |
|
|
|
//关联的商户 |
|
|
|
if(wxRentContract.getMerchantId()!=null){ |
|
|
|
WxMerchant wxMerchant = wxMerchantService.getById(wxRentContract.getMerchantId()); |
|
|
|
result.put("wxMerchant",wxMerchant); |
|
|
|
}else{ |
|
|
|
result.put("wxMerchant",null); |
|
|
|
} |
|
|
|
//关联的店铺 |
|
|
|
if(wxRentContract.getShopId()!=null){ |
|
|
|
List<WxShop> list=new ArrayList<>(); |
|
|
|
WxShop wxShop = wxShopMapper.selectByPrimaryKey(wxRentContract.getShopId()); |
|
|
|
list.add(wxShop); |
|
|
|
result.put("wxShops",list); |
|
|
|
}else{ |
|
|
|
result.put("wxShops",Collections.EMPTY_LIST); |
|
|
|
} |
|
|
|
return new ResultData(Result.SUCCESS, "查询成功",result); |
|
|
|
} |
|
|
|
|
|
|
|
@Transactional(rollbackFor = {Exception.class}) |
|
|
|
|