| @@ -20,6 +20,7 @@ import com.iformall.domain.po.WxEnergyFees; | |||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.domain.po.WxPayAccountBill; | import com.iformall.domain.po.WxPayAccountBill; | ||||
| import com.iformall.domain.po.WxShop; | import com.iformall.domain.po.WxShop; | ||||
| import com.iformall.domain.po.WxShopUsers; | |||||
| import com.iformall.domain.po.WxShopUsersInfo; | import com.iformall.domain.po.WxShopUsersInfo; | ||||
| import com.iformall.domain.po.WxUserDataRule; | import com.iformall.domain.po.WxUserDataRule; | ||||
| import com.iformall.domain.po.base.BaseEntity; | 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 ) { | if (null != shopPage && null != shopPage.getList() && shopPage.getList().size() > 0 ) { | ||||
| Map<Long, String> floorMap = wxMallFloorService.getFloorMap(wxShop); | Map<Long, String> floorMap = wxMallFloorService.getFloorMap(wxShop); | ||||
| Map<Long, String> buildingMap = wxMallBuildingService.getBuildingMap(wxShop); | Map<Long, String> buildingMap = wxMallBuildingService.getBuildingMap(wxShop); | ||||
| WxShopUsersInfo suq = new WxShopUsersInfo(); | |||||
| WxShopUsers suq = new WxShopUsers(); | |||||
| suq.updateTenantInfo(wxShop); | suq.updateTenantInfo(wxShop); | ||||
| suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); | suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); | ||||
| Map<Long, WxShopUsersInfo> suMap = wxShopSerivce.getShopUserMap(suq); | |||||
| Map<Long, WxShopUsers> suMap = wxShopSerivce.getShopUserMap(suq); | |||||
| List<WxShopBillVo> retList = new ArrayList<WxShopBillVo>(); | List<WxShopBillVo> retList = new ArrayList<WxShopBillVo>(); | ||||
| for (int i = 0 ; i < shopPage.getList().size(); i ++) { | for (int i = 0 ; i < shopPage.getList().size(); i ++) { | ||||
| WxShopBillVo vo = new WxShopBillVo(); | WxShopBillVo vo = new WxShopBillVo(); | ||||
| @@ -183,7 +184,7 @@ public class WxAllBillController extends BillBaseController { | |||||
| vo.setShopNumber(s.getShopNumber()); | vo.setShopNumber(s.getShopNumber()); | ||||
| if (null != suMap) { | if (null != suMap) { | ||||
| WxShopUsersInfo su = suMap.get(s.getId()); | |||||
| WxShopUsers su = suMap.get(s.getId()); | |||||
| if (null != su ) { | if (null != su ) { | ||||
| vo.setCusName(su.getName()); | vo.setCusName(su.getName()); | ||||
| vo.setCusPerson(su.getLinkPerson()); | vo.setCusPerson(su.getLinkPerson()); | ||||
| @@ -16,6 +16,7 @@ import com.iformall.domain.po.WxMerchant; | |||||
| import com.iformall.domain.po.WxMerchantBUser; | import com.iformall.domain.po.WxMerchantBUser; | ||||
| import com.iformall.domain.po.WxPayAccountBill; | import com.iformall.domain.po.WxPayAccountBill; | ||||
| import com.iformall.domain.po.WxShop; | import com.iformall.domain.po.WxShop; | ||||
| import com.iformall.domain.po.WxShopUsers; | |||||
| import com.iformall.domain.po.WxShopUsersInfo; | import com.iformall.domain.po.WxShopUsersInfo; | ||||
| import com.iformall.domain.po.WxUserDataRule; | import com.iformall.domain.po.WxUserDataRule; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| @@ -117,12 +118,19 @@ public class WxBillController extends BaseController { | |||||
| WxRentLoginUserDTO user = this.getRentLoginUser(); | WxRentLoginUserDTO user = this.getRentLoginUser(); | ||||
| WxShopUsersInfo su = new WxShopUsersInfo(); | WxShopUsersInfo su = new WxShopUsersInfo(); | ||||
| su.updateTenantInfo(user); | su.updateTenantInfo(user); | ||||
| su.setPhone(user.getPhone()); | |||||
| su.setStatus(EnumShopUsersStatus.LIVE.getCode()); | |||||
| List<Long> shopIds = wxShopService.getUserShopIds(su); | |||||
| if (null == shopIds || shopIds.size() <= 0 ) { | |||||
| su.setPhoneEqual(user.getPhone()); | |||||
| List<Long> infoIds = wxShopService.getUserInfoIds(su); | |||||
| if (null == infoIds || infoIds.size() <= 0 ) { | |||||
| return null; | return null; | ||||
| }else { | }else { | ||||
| WxShopUsers wxShopUsers = new WxShopUsers(); | |||||
| wxShopUsers.updateTenantInfo(user); | |||||
| wxShopUsers.setInfoIds(infoIds); | |||||
| wxShopUsers.setStatus(EnumShopUsersStatus.LIVE.getCode()); | |||||
| List<Long> shopIds = wxShopService.getUserShopIds(wxShopUsers); | |||||
| if (null == shopIds || shopIds.size() <= 0 ) { | |||||
| return null; | |||||
| } | |||||
| WxShop shop = new WxShop(); | WxShop shop = new WxShop(); | ||||
| shop.updateTenantInfo(user); | shop.updateTenantInfo(user); | ||||
| shop.setIds(shopIds); | shop.setIds(shopIds); | ||||
| @@ -70,6 +70,9 @@ public class WxShopUsers extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<Long> shopIds; | private List<Long> shopIds; | ||||
| @TableField(exist = false) | |||||
| private List<Long> infoIds; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer principalType; | private Integer principalType; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @@ -73,4 +73,7 @@ public class WxShopUsersInfo extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @TableField(exist = false) | |||||
| private String phoneEqual; | |||||
| } | } | ||||
| @@ -9,4 +9,5 @@ import java.util.List; | |||||
| public interface WxShopUsersInfoMapper extends CommonMapper<WxShopUsersInfo, String> { | public interface WxShopUsersInfoMapper extends CommonMapper<WxShopUsersInfo, String> { | ||||
| List<WxShopUsersInfo> findList(WxShopUsersInfo wxShop); | List<WxShopUsersInfo> findList(WxShopUsersInfo wxShop); | ||||
| List<Long> findIdList(WxShopUsersInfo wxShop); | |||||
| } | } | ||||
| @@ -145,8 +145,9 @@ public interface WxShopService { | |||||
| void deleteShopUsersPerson(WxShopUsersPerson wxShopUsers); | void deleteShopUsersPerson(WxShopUsersPerson wxShopUsers); | ||||
| List<Long> getUserShopIds(WxShopUsersInfo wxShopUsers); | |||||
| Map<Long,WxShopUsersInfo> getShopUserMap(WxShopUsersInfo wxShopUsers); | |||||
| List<Long> getUserInfoIds(WxShopUsersInfo wxShopUsersInfo); | |||||
| List<Long> getUserShopIds(WxShopUsers wxShopUsers); | |||||
| Map<Long,WxShopUsers> getShopUserMap(WxShopUsers wxShopUsers); | |||||
| WxShopUsersInfo getCurrentShopUser(TenantEntity tenantEntity,Long shopId); | WxShopUsersInfo getCurrentShopUser(TenantEntity tenantEntity,Long shopId); | ||||
| @@ -31,6 +31,7 @@ import com.iformall.domain.po.WxMerchantBUser; | |||||
| import com.iformall.domain.po.WxPropertyContract; | import com.iformall.domain.po.WxPropertyContract; | ||||
| import com.iformall.domain.po.WxRentContract; | import com.iformall.domain.po.WxRentContract; | ||||
| import com.iformall.domain.po.WxShop; | import com.iformall.domain.po.WxShop; | ||||
| import com.iformall.domain.po.WxShopUsers; | |||||
| import com.iformall.domain.po.WxShopUsersInfo; | import com.iformall.domain.po.WxShopUsersInfo; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.domain.vo.WxBillHotNotify; | import com.iformall.domain.vo.WxBillHotNotify; | ||||
| @@ -246,16 +247,16 @@ public class WxBillAllHelper { | |||||
| } | } | ||||
| if (shopIdList.size() > 0) { | if (shopIdList.size() > 0) { | ||||
| WxShopUsersInfo suq = new WxShopUsersInfo(); | |||||
| WxShopUsers suq = new WxShopUsers(); | |||||
| suq.updateTenantInfo(wxShop); | suq.updateTenantInfo(wxShop); | ||||
| suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); | suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); | ||||
| suq.setShopIds(shopIdList); | suq.setShopIds(shopIdList); | ||||
| Map<Long, WxShopUsersInfo> shopUserMap = wxShopService.getShopUserMap(suq); | |||||
| Map<Long, WxShopUsers> shopUserMap = wxShopService.getShopUserMap(suq); | |||||
| if (null != shopUserMap) { | if (null != shopUserMap) { | ||||
| for (int i = 0 ; i < retList.size() ; i++) { | for (int i = 0 ; i < retList.size() ; i++) { | ||||
| WxBillNotify bn = retList.get(i); | WxBillNotify bn = retList.get(i); | ||||
| if (null != bn.getShopId()) { | if (null != bn.getShopId()) { | ||||
| WxShopUsersInfo s = shopUserMap.get(bn.getShopId()); | |||||
| WxShopUsers s = shopUserMap.get(bn.getShopId()); | |||||
| if (null != s) { | if (null != s) { | ||||
| bn.setShopUserName(s.getName()); | bn.setShopUserName(s.getName()); | ||||
| bn.setShopUserPerson(s.getLinkPerson()); | bn.setShopUserPerson(s.getLinkPerson()); | ||||
| @@ -19,6 +19,7 @@ import com.iformall.domain.po.WxMerchantBUser; | |||||
| import com.iformall.domain.po.WxPropertyContract; | import com.iformall.domain.po.WxPropertyContract; | ||||
| import com.iformall.domain.po.WxRentContract; | import com.iformall.domain.po.WxRentContract; | ||||
| import com.iformall.domain.po.WxShop; | import com.iformall.domain.po.WxShop; | ||||
| import com.iformall.domain.po.WxShopUsers; | |||||
| import com.iformall.domain.po.WxShopUsersInfo; | import com.iformall.domain.po.WxShopUsersInfo; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.domain.vo.RatioVo; | import com.iformall.domain.vo.RatioVo; | ||||
| @@ -172,14 +173,14 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill | |||||
| } | } | ||||
| Map<Long, WxShop> shopMap = null; | Map<Long, WxShop> shopMap = null; | ||||
| Map<Long, WxShopUsersInfo> shopUserMap = null; | |||||
| Map<Long, WxShopUsers> shopUserMap = null; | |||||
| if (shopIds.size() > 0 ) { | if (shopIds.size() > 0 ) { | ||||
| WxShop sq = new WxShop(); | WxShop sq = new WxShop(); | ||||
| sq.updateTenantInfo(record); | sq.updateTenantInfo(record); | ||||
| sq.setIds(shopIds); | sq.setIds(shopIds); | ||||
| shopMap = wxShopService.findShopMap(sq); | shopMap = wxShopService.findShopMap(sq); | ||||
| WxShopUsersInfo suq = new WxShopUsersInfo(); | |||||
| WxShopUsers suq = new WxShopUsers(); | |||||
| suq.updateTenantInfo(record); | suq.updateTenantInfo(record); | ||||
| suq.setShopIds(shopIds); | suq.setShopIds(shopIds); | ||||
| suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); | suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); | ||||
| @@ -200,7 +201,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill | |||||
| } | } | ||||
| if (null != shopUserMap) { | if (null != shopUserMap) { | ||||
| WxShopUsersInfo wsu = shopUserMap.get(e.getShopId()); | |||||
| WxShopUsers wsu = shopUserMap.get(e.getShopId()); | |||||
| if (null != wsu) { | if (null != wsu) { | ||||
| if (StringUtils.isBlank(e.getCusName())) { | if (StringUtils.isBlank(e.getCusName())) { | ||||
| e.setCusName(wsu.getName()); | e.setCusName(wsu.getName()); | ||||
| @@ -20,6 +20,7 @@ import com.iformall.domain.po.WxFinanceReceive; | |||||
| import com.iformall.domain.po.WxFinanceReceiveBill; | import com.iformall.domain.po.WxFinanceReceiveBill; | ||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.domain.po.WxShop; | import com.iformall.domain.po.WxShop; | ||||
| import com.iformall.domain.po.WxShopUsers; | |||||
| import com.iformall.domain.po.WxShopUsersInfo; | import com.iformall.domain.po.WxShopUsersInfo; | ||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.domain.vo.PrintVo; | import com.iformall.domain.vo.PrintVo; | ||||
| @@ -260,10 +261,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||||
| shopq.setTenantId(tenantId); | shopq.setTenantId(tenantId); | ||||
| shopq.setIsDel(EnumYesOrNo.NO.getCode()); | shopq.setIsDel(EnumYesOrNo.NO.getCode()); | ||||
| Map<Long, WxShop> shopMap = wxShopService.findShopMap(shopq); | Map<Long, WxShop> shopMap = wxShopService.findShopMap(shopq); | ||||
| WxShopUsersInfo suq = new WxShopUsersInfo(); | |||||
| WxShopUsers suq = new WxShopUsers(); | |||||
| suq.setTenantId(tenantId); | suq.setTenantId(tenantId); | ||||
| suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); | suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); | ||||
| Map<Long, WxShopUsersInfo> shopUserMap = wxShopService.getShopUserMap(suq); | |||||
| Map<Long, WxShopUsers> shopUserMap = wxShopService.getShopUserMap(suq); | |||||
| WxEnergyFees feq = new WxEnergyFees(); | WxEnergyFees feq = new WxEnergyFees(); | ||||
| feq.setTenantId(tenantId); | feq.setTenantId(tenantId); | ||||
| Map<Long, WxEnergyFees> feesMap = wxEnergyService.getFeesMap(feq); | Map<Long, WxEnergyFees> feesMap = wxEnergyService.getFeesMap(feq); | ||||
| @@ -339,7 +340,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||||
| bq.setOwe(oweTotal.toPlainString()); | bq.setOwe(oweTotal.toPlainString()); | ||||
| bq.setCurrentTime(new Date()); | bq.setCurrentTime(new Date()); | ||||
| if (null != shopUserMap && null != bq.getShopId()) { | if (null != shopUserMap && null != bq.getShopId()) { | ||||
| WxShopUsersInfo su = shopUserMap.get(bq.getShopId()); | |||||
| WxShopUsers su = shopUserMap.get(bq.getShopId()); | |||||
| if (null != su) { | if (null != su) { | ||||
| bq.setCusName(su.getName()); | bq.setCusName(su.getName()); | ||||
| bq.setCusPhone(su.getPhone()); | bq.setCusPhone(su.getPhone()); | ||||
| @@ -1161,22 +1161,28 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public List<Long> getUserShopIds(WxShopUsersInfo wxShopUsers) { | |||||
| public List<Long> getUserInfoIds(WxShopUsersInfo wxShopUsersInfo) { | |||||
| return wxShopUsersInfoMapper.findIdList(wxShopUsersInfo); | |||||
| } | |||||
| @Override | |||||
| public List<Long> getUserShopIds(WxShopUsers wxShopUsers) { | |||||
| return wxShopUsersMapper.findShopIdList(wxShopUsers); | return wxShopUsersMapper.findShopIdList(wxShopUsers); | ||||
| } | } | ||||
| @Override | @Override | ||||
| public Map<Long, WxShopUsersInfo> getShopUserMap(WxShopUsersInfo wxShopUsers) { | |||||
| public Map<Long, WxShopUsers> getShopUserMap(WxShopUsers wxShopUsers) { | |||||
| wxShopUsers.setSortColumn(" status asc, type desc"); | wxShopUsers.setSortColumn(" status asc, type desc"); | ||||
| List<WxShopUsersInfo> list = wxShopUsersMapper.findList(wxShopUsers); | |||||
| List<WxShopUsers> list = wxShopUsersMapper.findList(wxShopUsers); | |||||
| if (null == list || list.size() <= 0 ) { | if (null == list || list.size() <= 0 ) { | ||||
| return null; | return null; | ||||
| } | } | ||||
| Map<Long,WxShopUsersInfo> retMap = new HashMap<Long,WxShopUsersInfo>(); | |||||
| Map<Long,WxShopUsers> retMap = new HashMap<Long,WxShopUsers>(); | |||||
| for (int i = 0 ; i < list.size(); i++) { | for (int i = 0 ; i < list.size(); i++) { | ||||
| WxShopUsersInfo su = list.get(i); | |||||
| WxShopUsers su = list.get(i); | |||||
| if (null != su.getShopId()) { | if (null != su.getShopId()) { | ||||
| if (!retMap.containsKey(su.getShopId())) { | if (!retMap.containsKey(su.getShopId())) { | ||||
| this.setShopUserProperty(su); | |||||
| retMap.put(su.getShopId(), su); | retMap.put(su.getShopId(), su); | ||||
| } | } | ||||
| } | } | ||||
| @@ -52,6 +52,10 @@ | |||||
| and `phone` like concat('%', #{phone},'%') | and `phone` like concat('%', #{phone},'%') | ||||
| </if> | </if> | ||||
| <if test=" null != phoneEqual and phoneEqual != '' "> | |||||
| and `phone` = #{phoneEqual} | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and id in | and id in | ||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | ||||
| @@ -67,4 +71,10 @@ | |||||
| from wx_shop_users_info | from wx_shop_users_info | ||||
| <include refid="dynamicWhereConditions"/> | <include refid="dynamicWhereConditions"/> | ||||
| </select> | </select> | ||||
| <select id="findIdList" parameterType="com.iformall.domain.po.WxShopUsersInfo" resultType="Long"> | |||||
| select id | |||||
| from wx_shop_users_info | |||||
| <include refid="dynamicWhereConditions"/> | |||||
| </select> | |||||
| </mapper> | </mapper> | ||||
| @@ -55,6 +55,13 @@ | |||||
| #{idItem} | #{idItem} | ||||
| </foreach> | </foreach> | ||||
| </if> | </if> | ||||
| <if test=" null != infoIds "> | |||||
| and info_id in | |||||
| <foreach collection="infoIds" index="index" item="iidItem" open="(" separator="," close=")"> | |||||
| #{iidItem} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and id in | and id in | ||||