diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 47ad8bf3c..571526104 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -69,7 +69,7 @@ public class WxMerchantController extends BaseController { wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); - final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,true); + final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 7f6d652cd..fe80a96d7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -72,12 +72,12 @@ public class WxMerchant extends TenantEntity { private String linkPhone; @TableField(exist = false) - @Excel(name="租期开始时间",width = 20,format="yyyy-MM-dd",orderNum = "5") +// @Excel(name="租期开始时间",width = 20,format="yyyy-MM-dd",orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="租期开始时间",name="rentalStartDate") private Date rentalStartDate; @TableField(exist = false) - @Excel(name="租期结束时间",width = 20,format="yyyy-MM-dd",orderNum = "6") +// @Excel(name="租期结束时间",width = 20,format="yyyy-MM-dd",orderNum = "6") @io.swagger.annotations.ApiModelProperty(value="租期结束时间",name="rentalEndDate") private Date rentalEndDate; @@ -115,7 +115,7 @@ public class WxMerchant extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "是否保密", name = "isPrivate") private Integer isPrivate; - @Excel(name = "待缴提醒", width = 20, orderNum = "10") +// @Excel(name = "待缴提醒", width = 20, orderNum = "10") @io.swagger.annotations.ApiModelProperty(value = "待缴提醒", name = "billSetting") private Integer billSetting; @@ -125,7 +125,7 @@ public class WxMerchant extends TenantEntity { private String businessName; @TableField(exist = false) - @Excel(name = "子业态", width = 20, orderNum = "12") +// @Excel(name = "子业态", width = 20, orderNum = "12") @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusinessId") private String subBusinessName; @@ -141,11 +141,11 @@ public class WxMerchant extends TenantEntity { @Excel(name = "账户", width = 30, orderNum = "15") private String receivers; - @Excel(name = "主谈人", width = 20, orderNum = "16") +// @Excel(name = "主谈人", width = 20, orderNum = "16") @io.swagger.annotations.ApiModelProperty(value = "主谈人", name = "talkUserMain") private String talkUserMain; - @Excel(name = "辅谈人", width = 20, orderNum = "17") +// @Excel(name = "辅谈人", width = 20, orderNum = "17") @io.swagger.annotations.ApiModelProperty(value = "辅谈人", name = "talkUserAux") private String talkUserAux; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index eb98b76f9..eadf4b909 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1013,25 +1013,29 @@ public class WxMerchantServiceImpl implements WxMerchantService { List list = wxMerchantMapper.findList(wxMerchant); + WxBusiness bq = new WxBusiness(); + bq.setFinalTenantId(wxMerchant.getFinalTenantId()); + List bussinessList = wxBusinessMapper.findListAll(bq); + Map bussinessMap = new HashMap(); + if (null != bussinessList) { + for (int i = 0 ; i < bussinessList.size() ; i ++) { + WxBusiness bu = bussinessList.get(i); + bussinessMap.put(bu.getId() ,bu.getTitle()); + } + } + list.stream().forEach(m->{ List receivers = wxProfitSharingReceiverService.findReceivers(m, m.getId()); m.setWxProfitSharingReceiver(receivers); - //分账信息 可能有多个, 先干掉 -// WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(m,EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT); -// if (receiver != null) { -// m.setAccountId(receiver.getReceiverAccount()); -// m.setAccountName(receiver.getTrueName()); -// m.setAccountTypeValue(receiver.getReceiverType()); +// WxRentContract wxRentContract = new WxRentContract(); +// wxRentContract.setMerchantId(m.getId()); +// List lrc = wxRentContractMapper.selectRentContractByMerchantId(wxRentContract); +// if (!lrc.isEmpty()) { +// m.setRentalStartDate(lrc.get(0).getRentalStartDate()); +// m.setRentalEndDate(lrc.get(0).getRentalEndDate()); // } - WxRentContract wxRentContract = new WxRentContract(); - wxRentContract.setMerchantId(m.getId()); - List lrc = wxRentContractMapper.selectRentContractByMerchantId(wxRentContract); - if (!lrc.isEmpty()) { - m.setRentalStartDate(lrc.get(0).getRentalStartDate()); - m.setRentalEndDate(lrc.get(0).getRentalEndDate()); - } //商铺信息 m.setShopVos(wxShopService.findMerchantShopVoList(m,m.getId())); @@ -1041,6 +1045,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchantBUser.setMerchantId(m.getId()); wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode()); m.setUsers(wxMerchantBUserMapper.findList(wxMerchantBUser)); + + //业态 + m.setBusinessName(bussinessMap.get(m.getBusinessId())); }); excelService.exportExcel(list, null, "商户信息", WxMerchant.class, "商户信息数据.xlsx", response, false); } @@ -1204,18 +1211,18 @@ public class WxMerchantServiceImpl implements WxMerchantService { record.setIds(merchantIds); } - List noMerchantIds = new ArrayList(); - Integer rentShopType = record.getRentShopType(); - if (null != rentShopType) { - WxRentContract rentContractQ = new WxRentContract(); - rentContractQ.updateTenantInfo(record); - rentContractQ.setStatuss(EnumRentContractStatus.getValidStatus()); - List usedMerchantIds = wxRentContractMapper.getMerchantIdsByStatuss(rentContractQ); - if (null != usedMerchantIds && usedMerchantIds.size() >0 ) { - noMerchantIds.addAll(usedMerchantIds); -// record.setNotInids(usedMerchantIds); - } - } +// List noMerchantIds = new ArrayList(); +// Integer rentShopType = record.getRentShopType(); +// if (null != rentShopType) { +// WxRentContract rentContractQ = new WxRentContract(); +// rentContractQ.updateTenantInfo(record); +// rentContractQ.setStatuss(EnumRentContractStatus.getValidStatus()); +// List usedMerchantIds = wxRentContractMapper.getMerchantIdsByStatuss(rentContractQ); +// if (null != usedMerchantIds && usedMerchantIds.size() >0 ) { +// noMerchantIds.addAll(usedMerchantIds); +//// record.setNotInids(usedMerchantIds); +// } +// } // if(EnumProfitSharingUse.NO.getCode().equals(record.getIsUse())){ // if(noMerchantIds.size() > 0){ // noMerchantIds.retainAll(isUseMerchantIds); @@ -1224,9 +1231,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { // } // } - if(noMerchantIds.size() > 0){ - record.setNotInids(noMerchantIds); - } +// if(noMerchantIds.size() > 0){ +// record.setNotInids(noMerchantIds); +// } } @Override @@ -1284,34 +1291,34 @@ public class WxMerchantServiceImpl implements WxMerchantService { merchant.setRentalEndDate(contract.getRentalEndDate()); } } - if (record.getRentShopType() != null) { - List> shops = new ArrayList<>(); - WxMerchantShop wxMerchantShop = new WxMerchantShop(); - wxMerchantShop.setMerchantId(merchant.getId()); - wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - List wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); - for (WxMerchantShop merchantShop : wxMerchantShopList) { - WxShop shop = new WxShop(); - shop.setId(merchantShop.getShopId()); - shop.updateTenantInfo(merchant); - PageInfo> shopPageInfo = wxShopService.findListMap(shop,1,10000); - List> shoplist = shopPageInfo.getList(); - if (shoplist.size() > 0) { - shops.add(shoplist.get(0)); - } - } - merchant.setShoplist(shops); - } - - WxRentContract rc = new WxRentContract(); - rc.setMerchantId(merchant.getId()); - rc.setTenantId(merchant.getTenantId()); - List rentContractList = wxRentContractMapper.findList(rc); - if(CollectionUtils.isEmpty(rentContractList)){ - merchant.setHasContract(EnumHasContract.NO.getCode()); - }else{ - merchant.setHasContract(EnumHasContract.HAS.getCode()); - } +// if (record.getRentShopType() != null) { +// List> shops = new ArrayList<>(); +// WxMerchantShop wxMerchantShop = new WxMerchantShop(); +// wxMerchantShop.setMerchantId(merchant.getId()); +// wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); +// List wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); +// for (WxMerchantShop merchantShop : wxMerchantShopList) { +// WxShop shop = new WxShop(); +// shop.setId(merchantShop.getShopId()); +// shop.updateTenantInfo(merchant); +// PageInfo> shopPageInfo = wxShopService.findListMap(shop,1,10000); +// List> shoplist = shopPageInfo.getList(); +// if (shoplist.size() > 0) { +// shops.add(shoplist.get(0)); +// } +// } +// merchant.setShoplist(shops); +// } +// +// WxRentContract rc = new WxRentContract(); +// rc.setMerchantId(merchant.getId()); +// rc.setTenantId(merchant.getTenantId()); +// List rentContractList = wxRentContractMapper.findList(rc); +// if(CollectionUtils.isEmpty(rentContractList)){ +// merchant.setHasContract(EnumHasContract.NO.getCode()); +// }else{ +// merchant.setHasContract(EnumHasContract.HAS.getCode()); +// } } } return pageInfo;