diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index ff1248932..c332a40cf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -58,7 +58,7 @@ public class WxRentContractController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getById(id)); + return wxRentContractService.getById(id); } @RequestMapping("/download") diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 7785c4b8e..e0f11c100 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -28,7 +28,7 @@ public interface WxRentContractService { * @param id * @return */ - WxRentContract getById(Long id); + ResultData getById(Long id); /** * 保存或更新实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index bf60069ab..fd364e03e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -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 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 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})