diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index aa0b44d08..bd236d85f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -20,6 +20,7 @@ import com.iformall.domain.po.WxEnergyFees; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxShop; +import com.iformall.domain.po.WxShopUsers; import com.iformall.domain.po.WxShopUsersInfo; import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.BaseEntity; @@ -160,10 +161,10 @@ public class WxAllBillController extends BillBaseController { if (null != shopPage && null != shopPage.getList() && shopPage.getList().size() > 0 ) { Map floorMap = wxMallFloorService.getFloorMap(wxShop); Map buildingMap = wxMallBuildingService.getBuildingMap(wxShop); - WxShopUsersInfo suq = new WxShopUsersInfo(); + WxShopUsers suq = new WxShopUsers(); suq.updateTenantInfo(wxShop); suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); - Map suMap = wxShopSerivce.getShopUserMap(suq); + Map suMap = wxShopSerivce.getShopUserMap(suq); List retList = new ArrayList(); for (int i = 0 ; i < shopPage.getList().size(); i ++) { WxShopBillVo vo = new WxShopBillVo(); @@ -183,7 +184,7 @@ public class WxAllBillController extends BillBaseController { vo.setShopNumber(s.getShopNumber()); if (null != suMap) { - WxShopUsersInfo su = suMap.get(s.getId()); + WxShopUsers su = suMap.get(s.getId()); if (null != su ) { vo.setCusName(su.getName()); vo.setCusPerson(su.getLinkPerson()); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java index fcfc1fe43..f7b40983a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -16,6 +16,7 @@ import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxShop; +import com.iformall.domain.po.WxShopUsers; import com.iformall.domain.po.WxShopUsersInfo; import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.TenantEntity; @@ -117,12 +118,19 @@ public class WxBillController extends BaseController { WxRentLoginUserDTO user = this.getRentLoginUser(); WxShopUsersInfo su = new WxShopUsersInfo(); su.updateTenantInfo(user); - su.setPhone(user.getPhone()); - su.setStatus(EnumShopUsersStatus.LIVE.getCode()); - List shopIds = wxShopService.getUserShopIds(su); - if (null == shopIds || shopIds.size() <= 0 ) { + su.setPhoneEqual(user.getPhone()); + List infoIds = wxShopService.getUserInfoIds(su); + if (null == infoIds || infoIds.size() <= 0 ) { return null; }else { + WxShopUsers wxShopUsers = new WxShopUsers(); + wxShopUsers.updateTenantInfo(user); + wxShopUsers.setInfoIds(infoIds); + wxShopUsers.setStatus(EnumShopUsersStatus.LIVE.getCode()); + List shopIds = wxShopService.getUserShopIds(wxShopUsers); + if (null == shopIds || shopIds.size() <= 0 ) { + return null; + } WxShop shop = new WxShop(); shop.updateTenantInfo(user); shop.setIds(shopIds); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShopUsers.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShopUsers.java index 9a1ecf0d2..8f5cd15e5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShopUsers.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShopUsers.java @@ -70,6 +70,9 @@ public class WxShopUsers extends TenantEntity { @TableField(exist = false) private List shopIds; + @TableField(exist = false) + private List infoIds; + @TableField(exist = false) private Integer principalType; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShopUsersInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShopUsersInfo.java index 7e68d461e..86463e156 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShopUsersInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShopUsersInfo.java @@ -73,4 +73,7 @@ public class WxShopUsersInfo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + @TableField(exist = false) + private String phoneEqual; + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopUsersInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopUsersInfoMapper.java index ffb857589..910714626 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopUsersInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopUsersInfoMapper.java @@ -9,4 +9,5 @@ import java.util.List; public interface WxShopUsersInfoMapper extends CommonMapper { List findList(WxShopUsersInfo wxShop); + List findIdList(WxShopUsersInfo wxShop); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java index e1f355dc8..1f82af58f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java @@ -145,8 +145,9 @@ public interface WxShopService { void deleteShopUsersPerson(WxShopUsersPerson wxShopUsers); - List getUserShopIds(WxShopUsersInfo wxShopUsers); - Map getShopUserMap(WxShopUsersInfo wxShopUsers); + List getUserInfoIds(WxShopUsersInfo wxShopUsersInfo); + List getUserShopIds(WxShopUsers wxShopUsers); + Map getShopUserMap(WxShopUsers wxShopUsers); WxShopUsersInfo getCurrentShopUser(TenantEntity tenantEntity,Long shopId); diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index 6a7a169e8..25cf27382 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -31,6 +31,7 @@ import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxShop; +import com.iformall.domain.po.WxShopUsers; import com.iformall.domain.po.WxShopUsersInfo; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; @@ -246,16 +247,16 @@ public class WxBillAllHelper { } if (shopIdList.size() > 0) { - WxShopUsersInfo suq = new WxShopUsersInfo(); + WxShopUsers suq = new WxShopUsers(); suq.updateTenantInfo(wxShop); suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); suq.setShopIds(shopIdList); - Map shopUserMap = wxShopService.getShopUserMap(suq); + Map shopUserMap = wxShopService.getShopUserMap(suq); if (null != shopUserMap) { for (int i = 0 ; i < retList.size() ; i++) { WxBillNotify bn = retList.get(i); if (null != bn.getShopId()) { - WxShopUsersInfo s = shopUserMap.get(bn.getShopId()); + WxShopUsers s = shopUserMap.get(bn.getShopId()); if (null != s) { bn.setShopUserName(s.getName()); bn.setShopUserPerson(s.getLinkPerson()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java index 8cb5eff86..9662e94ec 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java @@ -19,6 +19,7 @@ import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxShop; +import com.iformall.domain.po.WxShopUsers; import com.iformall.domain.po.WxShopUsersInfo; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.RatioVo; @@ -172,14 +173,14 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill } Map shopMap = null; - Map shopUserMap = null; + Map shopUserMap = null; if (shopIds.size() > 0 ) { WxShop sq = new WxShop(); sq.updateTenantInfo(record); sq.setIds(shopIds); shopMap = wxShopService.findShopMap(sq); - WxShopUsersInfo suq = new WxShopUsersInfo(); + WxShopUsers suq = new WxShopUsers(); suq.updateTenantInfo(record); suq.setShopIds(shopIds); suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); @@ -200,7 +201,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill } if (null != shopUserMap) { - WxShopUsersInfo wsu = shopUserMap.get(e.getShopId()); + WxShopUsers wsu = shopUserMap.get(e.getShopId()); if (null != wsu) { if (StringUtils.isBlank(e.getCusName())) { e.setCusName(wsu.getName()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java index 59a403b71..f9fe252e3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -20,6 +20,7 @@ import com.iformall.domain.po.WxFinanceReceive; import com.iformall.domain.po.WxFinanceReceiveBill; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxShop; +import com.iformall.domain.po.WxShopUsers; import com.iformall.domain.po.WxShopUsersInfo; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.PrintVo; @@ -260,10 +261,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { shopq.setTenantId(tenantId); shopq.setIsDel(EnumYesOrNo.NO.getCode()); Map shopMap = wxShopService.findShopMap(shopq); - WxShopUsersInfo suq = new WxShopUsersInfo(); + WxShopUsers suq = new WxShopUsers(); suq.setTenantId(tenantId); suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); - Map shopUserMap = wxShopService.getShopUserMap(suq); + Map shopUserMap = wxShopService.getShopUserMap(suq); WxEnergyFees feq = new WxEnergyFees(); feq.setTenantId(tenantId); Map feesMap = wxEnergyService.getFeesMap(feq); @@ -339,7 +340,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { bq.setOwe(oweTotal.toPlainString()); bq.setCurrentTime(new Date()); if (null != shopUserMap && null != bq.getShopId()) { - WxShopUsersInfo su = shopUserMap.get(bq.getShopId()); + WxShopUsers su = shopUserMap.get(bq.getShopId()); if (null != su) { bq.setCusName(su.getName()); bq.setCusPhone(su.getPhone()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index dfdde4b8a..5e72d8499 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -1161,22 +1161,28 @@ public class WxShopServiceImpl implements WxShopService { } @Override - public List getUserShopIds(WxShopUsersInfo wxShopUsers) { + public List getUserInfoIds(WxShopUsersInfo wxShopUsersInfo) { + return wxShopUsersInfoMapper.findIdList(wxShopUsersInfo); + } + + @Override + public List getUserShopIds(WxShopUsers wxShopUsers) { return wxShopUsersMapper.findShopIdList(wxShopUsers); } @Override - public Map getShopUserMap(WxShopUsersInfo wxShopUsers) { + public Map getShopUserMap(WxShopUsers wxShopUsers) { wxShopUsers.setSortColumn(" status asc, type desc"); - List list = wxShopUsersMapper.findList(wxShopUsers); + List list = wxShopUsersMapper.findList(wxShopUsers); if (null == list || list.size() <= 0 ) { return null; } - Map retMap = new HashMap(); + Map retMap = new HashMap(); for (int i = 0 ; i < list.size(); i++) { - WxShopUsersInfo su = list.get(i); + WxShopUsers su = list.get(i); if (null != su.getShopId()) { if (!retMap.containsKey(su.getShopId())) { + this.setShopUserProperty(su); retMap.put(su.getShopId(), su); } } diff --git a/mallinkService/src/main/resources/mapper/WxShopUsersInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxShopUsersInfoMapper.xml index 78826f513..8ecfb7ca4 100644 --- a/mallinkService/src/main/resources/mapper/WxShopUsersInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopUsersInfoMapper.xml @@ -52,6 +52,10 @@ and `phone` like concat('%', #{phone},'%') + + and `phone` = #{phoneEqual} + + and id in @@ -67,4 +71,10 @@ from wx_shop_users_info + + diff --git a/mallinkService/src/main/resources/mapper/WxShopUsersMapper.xml b/mallinkService/src/main/resources/mapper/WxShopUsersMapper.xml index 82a04ffc8..bdfef2b34 100644 --- a/mallinkService/src/main/resources/mapper/WxShopUsersMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopUsersMapper.xml @@ -55,6 +55,13 @@ #{idItem} + + + and info_id in + + #{iidItem} + + and id in