| @@ -78,6 +78,7 @@ public class ChartDataSchedule { | |||
| for (WxMall wxMall : wxMalls) { | |||
| TenantEntity tenantEntity = wxMall.getTenantInfo(); | |||
| params.put("tenantId", tenantEntity.getTenantId()); | |||
| params.put("finalTenantId", tenantEntity.getFinalTenantId()); | |||
| if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { | |||
| params.put("parentTenantId", wxMall.getTenantId()); | |||
| } | |||
| @@ -55,6 +55,7 @@ public class TenantEntity extends BaseEntity { | |||
| public void setTenantId(String tenantId) { | |||
| this.tenantId = tenantId; | |||
| setFinalTenantId(getFinalTenantId()); | |||
| } | |||
| public String getParentTenantId() { | |||
| @@ -63,6 +64,7 @@ public class TenantEntity extends BaseEntity { | |||
| public void setParentTenantId(String parentTenantId) { | |||
| this.parentTenantId = parentTenantId; | |||
| setFinalTenantId(getFinalTenantId()); | |||
| } | |||
| public void setFinalTenantId(String finalTenantId) { | |||
| @@ -46,7 +46,7 @@ public interface WxCUserBasicInfoMapper extends CommonMapper<WxCUserBasicInfo, S | |||
| List<WxCUserBasicInfo> findBirthdayList(@Param("finalTenantId")String finalTenantId, @Param("begin")String begin, @Param("end")String end); | |||
| List<WxCUserBasicInfo> findBirthdayList1(@Param("tenantId")String tenantId,@Param("parentTenantId")String parentTenantId, @Param("begin")String begin, @Param("end")String end); | |||
| List<WxCUserBasicInfo> findBirthdayList1(@Param("finalTenantId")String finalTenantId,@Param("tenantId")String tenantId,@Param("parentTenantId")String parentTenantId, @Param("begin")String begin, @Param("end")String end); | |||
| long findCount(WxCUserBasicInfoDto dto); | |||
| long findCount1(@Param("tenantInfo")TenantEntity tenantInfo,@Param("basicInfo")WxCUserBasicInfoDto dto); | |||
| @@ -15,7 +15,7 @@ public interface WxCUserTagsMapper extends CommonMapper<WxCUserTags, String> { | |||
| List<WxCUserTags> findList(WxCUserTags wxCUserTags); | |||
| long countUser(@Param("tagIds")String tagIds,@Param("tenantId")String tenantId, | |||
| long countUser(@Param("tagIds")String tagIds,@Param("tenantId")String tenantId,@Param("finalTenantId")String finalTenantId, | |||
| @Param("startTime")Date startTime,@Param("endTime")Date endTime); | |||
| void updateNewId(CUserTagNewIdVo record); | |||
| @@ -48,7 +48,7 @@ public interface WxCouponOrderMapper extends CommonMapper<WxCouponOrder, Long> { | |||
| WxCouponOrderCVo findDetailOfCUser(@Param("id")Long id,@Param("tenantId")String tenantId); | |||
| WxCouponOrderCVo findSimpleDetailOfCUser(@Param("id")Long id,@Param("tenantId")String tenantId); | |||
| List<WxCouponOrderBVo> findListOfAdmin(WxCouponOrderBVo wxCouponOrder); | |||
| WxCouponOrderBVo findDetailOfAdmin(@Param("id")Long id,@Param("tenantId")String tenantId); | |||
| WxCouponOrderBVo findDetailOfAdmin(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("finalTenantId")String finalTenantId); | |||
| //营销报表 券数据图表 | |||
| List<MarkingCouponDataReportVo> couponDataMap(HashMap<String,Object> params); | |||
| @@ -533,6 +533,7 @@ public class DataTowerServiceImpl implements DataTowerService { | |||
| logger.info("停车-查询近一周的缴费车辆-开始"); | |||
| HashMap<String, Object> weekParams = new HashMap<>(); | |||
| weekParams.put("tenantId", tenantEntity.getTenantId()); | |||
| weekParams.put("finalTenantId", tenantEntity.getFinalTenantId()); | |||
| if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { | |||
| weekParams.put("parentTenantId", tenantEntity.getParentTenantId()); | |||
| } | |||
| @@ -1202,7 +1202,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc | |||
| public List<WxCUserBasicInfo> findBirthdayList(TenantEntity tenantEntity, String format, String format1) { | |||
| if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ | |||
| //关联微信表查询 | |||
| return wxCUserBasicInfoMapper.findBirthdayList1(tenantEntity.getTenantId(),tenantEntity.getParentTenantId(),format,format1); | |||
| return wxCUserBasicInfoMapper.findBirthdayList1(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId(),tenantEntity.getParentTenantId(),format,format1); | |||
| }else{ | |||
| //直接查询本表 | |||
| String finalTenantId = tenantEntity.getTenantId(); | |||
| @@ -91,7 +91,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||
| @Override | |||
| public long countUser(TenantEntity tenantEntity, Long tagId, Date startTime, Date endTime ) { | |||
| String str = JSON.toJSONString(tagId); | |||
| return wxCUserTagsMapper.countUser(str, tenantEntity.getTenantId(), startTime, endTime); | |||
| return wxCUserTagsMapper.countUser(str, tenantEntity.getTenantId(),tenantEntity.getFinalTenantId(), startTime, endTime); | |||
| } | |||
| @@ -1041,6 +1041,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||
| HashMap<String, Object> datamap = new HashMap<>(); | |||
| HashMap<String, Object> weekParams = new HashMap<>(); | |||
| weekParams.put("tenantId", tenantEntity.getTenantId()); | |||
| weekParams.put("finalTenantId", tenantEntity.getFinalTenantId()); | |||
| if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { | |||
| weekParams.put("parentTenantId", tenantEntity.getParentTenantId()); | |||
| } | |||
| @@ -2210,7 +2211,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||
| for (int i = 0; i < tags.length; i++) { | |||
| WxTags tag = new WxTags(); | |||
| tag.setName(tags[i].getMessage()); | |||
| tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantEntity.getTenantId(), startTime, endTime)); | |||
| tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantEntity.getTenantId(),tenantEntity.getFinalTenantId(), startTime, endTime)); | |||
| tagList.add(tag); | |||
| total -= tag.getCount(); | |||
| } | |||
| @@ -2245,7 +2246,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||
| for (int i = 0; i < tags.length; i++) { | |||
| WxTags tag = new WxTags(); | |||
| tag.setName(tags[i].getMessage()); | |||
| tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantEntity.getTenantId(), startTime, endTime)); | |||
| tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantEntity.getTenantId(),tenantEntity.getFinalTenantId(), startTime, endTime)); | |||
| tagList.add(tag); | |||
| total -= tag.getCount(); | |||
| } | |||
| @@ -220,6 +220,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||
| dateMap.put("endDate", endDate); | |||
| dateMap.put("merchantId", wxMerchant.getId()); | |||
| dateMap.put("tenantId", wxMerchant.getTenantId()); | |||
| dateMap.put("finalTenantId", wxMerchant.getFinalTenantId()); | |||
| Map resultMap = new HashMap(); | |||
| @@ -314,7 +315,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||
| @Override | |||
| public ResultData detailAdminVo(Long couponOrderId,TenantEntity tenantinfo) { | |||
| WxCouponOrderBVo wxCouponOrderBVo = wxCouponOrderMapper.findDetailOfAdmin(couponOrderId,tenantinfo.getTenantId()); | |||
| WxCouponOrderBVo wxCouponOrderBVo = wxCouponOrderMapper.findDetailOfAdmin(couponOrderId,tenantinfo.getTenantId(),tenantinfo.getFinalTenantId()); | |||
| if (wxCouponOrderBVo == null) | |||
| return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); | |||
| return new ResultData(wxCouponOrderBVo); | |||
| @@ -120,70 +120,70 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { | |||
| return new PageInfo<>(wxCreditHistoryVoList); | |||
| } | |||
| public void supplyCreditInfo(List<WxCreditHistoryVo> wxCreditHistoryVoList) { | |||
| List<Long> cUserIds = wxCreditHistoryVoList.stream().filter(a -> a.getOperatorType().equals(EnumUserType.CUSER.getCode())).map(WxCreditHistoryVo::getOperatorId).collect(Collectors.toList()); | |||
| List<Long> cUserBasicIds = wxCreditHistoryVoList.stream().filter(a -> a.getOperatorType().equals(EnumUserType.CUSERBASIC.getCode())).map(WxCreditHistoryVo::getOperatorId).collect(Collectors.toList()); | |||
| List<Long> bUserIds = wxCreditHistoryVoList.stream().filter(a -> a.getOperatorType().equals(EnumUserType.BUSER.getCode())).map(WxCreditHistoryVo::getOperatorId).collect(Collectors.toList()); | |||
| List<Long> mallUserIds = wxCreditHistoryVoList.stream().filter(a -> a.getOperatorType().equals(EnumUserType.MALLUSER.getCode())).map(WxCreditHistoryVo::getOperatorId).collect(Collectors.toList()); | |||
| List<WxCUserBasicInfo> wxCUserList = Lists.newArrayList(); | |||
| List<WxCUserBasicInfo> wxCUserBasicInfoList = Lists.newArrayList(); | |||
| List<WxMerchantBUser> wxMerchantBUserList = Lists.newArrayList(); | |||
| List<MallUserInfo> mallUserInfoList = Lists.newArrayList(); | |||
| if (cUserIds != null && cUserIds.size() > 0) { | |||
| //兼容老数据 | |||
| WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); | |||
| wxCUserBasicInfo.setIds(cUserIds); | |||
| wxCUserList = wxCUserBasicInfoMapper.findList(wxCUserBasicInfo); | |||
| } | |||
| if (cUserBasicIds != null && cUserBasicIds.size() > 0) { | |||
| WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); | |||
| wxCUserBasicInfo.setIds(cUserBasicIds); | |||
| wxCUserBasicInfoList = wxCUserBasicInfoMapper.findList(wxCUserBasicInfo); | |||
| } | |||
| if (bUserIds != null && bUserIds.size() > 0) { | |||
| WxMerchantBUser wxMerchantBUser = new WxMerchantBUser(); | |||
| wxMerchantBUser.setIds(bUserIds); | |||
| wxMerchantBUserList = wxMerchantBUserMapper.findList(wxMerchantBUser); | |||
| } | |||
| if (mallUserIds != null && mallUserIds.size() > 0) { | |||
| MallUserInfo mallUserInfo = new MallUserInfo(); | |||
| mallUserInfo.setIds(mallUserIds); | |||
| mallUserInfoList = mallUserInfoMapper.findList(mallUserInfo); | |||
| } | |||
| for (WxCreditHistoryVo credit : wxCreditHistoryVoList) { | |||
| if (wxCUserList != null && wxCUserList.size() > 0) { | |||
| wxCUserList.stream().forEach(cUser -> { | |||
| if (cUser.getId().longValue() == credit.getOperatorId().longValue()) { | |||
| credit.setOperator(cUser.getNickName()); | |||
| } | |||
| }); | |||
| } | |||
| if (wxCUserBasicInfoList != null && wxCUserBasicInfoList.size() > 0) { | |||
| wxCUserBasicInfoList.stream().forEach(cUserBasicInfo -> { | |||
| if (cUserBasicInfo.getId().longValue() == credit.getOperatorId().longValue()) { | |||
| credit.setOperator(cUserBasicInfo.getNickName()); | |||
| } | |||
| }); | |||
| } | |||
| if (wxMerchantBUserList != null && wxMerchantBUserList.size() > 0) { | |||
| wxMerchantBUserList.stream().forEach(bUser -> { | |||
| if (bUser.getId().longValue() == credit.getOperatorId().longValue()) { | |||
| credit.setOperator(bUser.getName()); | |||
| } | |||
| }); | |||
| } | |||
| if (mallUserInfoList != null && mallUserInfoList.size() > 0) { | |||
| mallUserInfoList.stream().forEach(mallUser -> { | |||
| if (mallUser.getId().longValue() == credit.getOperatorId().longValue()) { | |||
| credit.setOperator(mallUser.getName()); | |||
| } | |||
| }); | |||
| } | |||
| if (Long.valueOf(EnumMerchantType.MERCHANT_MORE.getCode()).equals(credit.getMerchantId())) { | |||
| credit.setMerchantName(EnumMerchantType.MERCHANT_MORE.getMessage()); | |||
| } | |||
| } | |||
| } | |||
| // public void supplyCreditInfo(List<WxCreditHistoryVo> wxCreditHistoryVoList) { | |||
| // List<Long> cUserIds = wxCreditHistoryVoList.stream().filter(a -> a.getOperatorType().equals(EnumUserType.CUSER.getCode())).map(WxCreditHistoryVo::getOperatorId).collect(Collectors.toList()); | |||
| // List<Long> cUserBasicIds = wxCreditHistoryVoList.stream().filter(a -> a.getOperatorType().equals(EnumUserType.CUSERBASIC.getCode())).map(WxCreditHistoryVo::getOperatorId).collect(Collectors.toList()); | |||
| // List<Long> bUserIds = wxCreditHistoryVoList.stream().filter(a -> a.getOperatorType().equals(EnumUserType.BUSER.getCode())).map(WxCreditHistoryVo::getOperatorId).collect(Collectors.toList()); | |||
| // List<Long> mallUserIds = wxCreditHistoryVoList.stream().filter(a -> a.getOperatorType().equals(EnumUserType.MALLUSER.getCode())).map(WxCreditHistoryVo::getOperatorId).collect(Collectors.toList()); | |||
| // List<WxCUserBasicInfo> wxCUserList = Lists.newArrayList(); | |||
| // List<WxCUserBasicInfo> wxCUserBasicInfoList = Lists.newArrayList(); | |||
| // List<WxMerchantBUser> wxMerchantBUserList = Lists.newArrayList(); | |||
| // List<MallUserInfo> mallUserInfoList = Lists.newArrayList(); | |||
| // if (cUserIds != null && cUserIds.size() > 0) { | |||
| // //兼容老数据 | |||
| // WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); | |||
| // wxCUserBasicInfo.setIds(cUserIds); | |||
| // wxCUserList = wxCUserBasicInfoMapper.findList(wxCUserBasicInfo); | |||
| // } | |||
| // if (cUserBasicIds != null && cUserBasicIds.size() > 0) { | |||
| // WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); | |||
| // wxCUserBasicInfo.setIds(cUserBasicIds); | |||
| // wxCUserBasicInfoList = wxCUserBasicInfoMapper.findList(wxCUserBasicInfo); | |||
| // } | |||
| // if (bUserIds != null && bUserIds.size() > 0) { | |||
| // WxMerchantBUser wxMerchantBUser = new WxMerchantBUser(); | |||
| // wxMerchantBUser.setIds(bUserIds); | |||
| // wxMerchantBUserList = wxMerchantBUserMapper.findList(wxMerchantBUser); | |||
| // } | |||
| // if (mallUserIds != null && mallUserIds.size() > 0) { | |||
| // MallUserInfo mallUserInfo = new MallUserInfo(); | |||
| // mallUserInfo.setIds(mallUserIds); | |||
| // mallUserInfoList = mallUserInfoMapper.findList(mallUserInfo); | |||
| // } | |||
| // for (WxCreditHistoryVo credit : wxCreditHistoryVoList) { | |||
| // if (wxCUserList != null && wxCUserList.size() > 0) { | |||
| // wxCUserList.stream().forEach(cUser -> { | |||
| // if (cUser.getId().longValue() == credit.getOperatorId().longValue()) { | |||
| // credit.setOperator(cUser.getNickName()); | |||
| // } | |||
| // }); | |||
| // } | |||
| // if (wxCUserBasicInfoList != null && wxCUserBasicInfoList.size() > 0) { | |||
| // wxCUserBasicInfoList.stream().forEach(cUserBasicInfo -> { | |||
| // if (cUserBasicInfo.getId().longValue() == credit.getOperatorId().longValue()) { | |||
| // credit.setOperator(cUserBasicInfo.getNickName()); | |||
| // } | |||
| // }); | |||
| // } | |||
| // if (wxMerchantBUserList != null && wxMerchantBUserList.size() > 0) { | |||
| // wxMerchantBUserList.stream().forEach(bUser -> { | |||
| // if (bUser.getId().longValue() == credit.getOperatorId().longValue()) { | |||
| // credit.setOperator(bUser.getName()); | |||
| // } | |||
| // }); | |||
| // } | |||
| // if (mallUserInfoList != null && mallUserInfoList.size() > 0) { | |||
| // mallUserInfoList.stream().forEach(mallUser -> { | |||
| // if (mallUser.getId().longValue() == credit.getOperatorId().longValue()) { | |||
| // credit.setOperator(mallUser.getName()); | |||
| // } | |||
| // }); | |||
| // } | |||
| // if (Long.valueOf(EnumMerchantType.MERCHANT_MORE.getCode()).equals(credit.getMerchantId())) { | |||
| // credit.setMerchantName(EnumMerchantType.MERCHANT_MORE.getMessage()); | |||
| // } | |||
| // } | |||
| // } | |||
| @Override | |||
| public WxCreditHistory getById(Long id,String tenantId) { | |||
| @@ -308,7 +308,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { | |||
| return new ResultData(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF); | |||
| } | |||
| WxOrder wxOrder = new WxOrder(); | |||
| wxOrder.setTenantId(wxOrderGroup.getTenantId()); | |||
| wxOrder.updateTenantInfo(wxOrderGroup); | |||
| wxOrder.setId(wxOrderGroup.getOrderId()); | |||
| List<Map<String, Object>> couponOrderGroupList = wxOrderGroupMapper.queryOrderGroup(wxOrder); | |||
| if (couponOrderGroupList.isEmpty()) { | |||
| @@ -281,6 +281,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| dateMap.put("merchantId", wxMerchant.getId()); | |||
| dateMap.put("type", type); | |||
| dateMap.put("tenantId", wxMerchantBUser.getTenantId()); | |||
| dateMap.put("finalTenantId", wxMerchantBUser.getFinalTenantId()); | |||
| Map resultMap = new HashMap(); | |||
| @@ -344,7 +345,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| dateMap.put("merchantId", wxMerchant.getId()); | |||
| dateMap.put("type", type); | |||
| dateMap.put("tenantId", wxMerchantBUser.getTenantId()); | |||
| dateMap.put("finalTenantId", wxMerchantBUser.getFinalTenantId()); | |||
| Map resultMap = new HashMap(); | |||
| if (pageIndex == null || pageSize == null) { | |||
| @@ -462,6 +462,7 @@ | |||
| select <include refid="allColumnsOfScoreList"/> | |||
| from wx_c_user_basic_info cub | |||
| where cub.status = 0 | |||
| and cub.final_tenant_id = #{finalTenantId} | |||
| AND DATE_FORMAT(cub.birthdate,'%m-%d') >= #{begin} | |||
| AND DATE_FORMAT(cub.birthdate,'%m-%d') <= #{end} | |||
| <if test=" null != tenantId and '' != tenantId"> | |||
| @@ -88,6 +88,7 @@ | |||
| <select id="countUser" resultType="java.lang.Long"> | |||
| select count(cut.user_id) from wx_c_user_tags cut, wx_c_user_basic_info cubi | |||
| where cut.user_id = cubi.id | |||
| and cubi.final_tenant_id = #{finalTenantId} | |||
| <if test="null != tenantId"> | |||
| and cut.tenant_id = #{tenantId} | |||
| </if> | |||
| @@ -899,7 +899,7 @@ | |||
| left join wx_merchant_b_user bu on co.b_user_id = bu.id | |||
| left join wx_merchant m on m.id = bu.merchant_id | |||
| left join wx_merchant_subsidy ms on co.id = ms.coupon_order_id and ms.type = 1 | |||
| where co.id = #{id} and co.tenant_id = #{tenantId} | |||
| where co.id = #{id} and co.tenant_id = #{tenantId} and cu.final_tenant_id = #{finalTenantId} | |||
| and c.id = co.coupon_id | |||
| </select> | |||