From dc026d382a1d4fa9e0aa6fe1c67f5d4905d1dc49 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 27 Oct 2020 16:53:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mem/WxCreditHistoryController.java | 4 +-- .../mem/WxScoreRulesController.java | 2 +- .../controller/WxCUserController.java | 3 +- .../controller/WxCreditHistoryController.java | 10 +++--- .../controller/WxMerchantBUserController.java | 2 +- .../controller/WxUserGrantController.java | 3 +- .../iformall/service/impl/PosServiceImpl.java | 12 +++---- .../iformall/schedule/CouponSendSchedule.java | 2 +- .../iformall/domain/po/WxCreditHistory.java | 3 +- .../iformall/domain/vo/WxCreditHistoryVo.java | 3 +- .../mapper/WxCUserBasicInfoMapper.java | 3 +- .../service/WxCreditHistoryService.java | 2 +- .../iformall/service/WxScoreRulesService.java | 4 +-- .../impl/WxActivityJoinServiceImpl.java | 3 +- .../impl/WxCUserBasicInfoServiceImpl.java | 11 +++--- .../service/impl/WxCardSpendServiceImpl.java | 6 ++-- .../impl/WxCouponOrderServiceImpl.java | 6 ++-- .../impl/WxCreditHistoryServiceImpl.java | 35 ++++++++++--------- .../service/impl/WxOrderServiceImpl.java | 6 ++-- .../service/impl/WxScoreRulesServiceImpl.java | 14 ++++---- .../service/park/impl/util/ParkHelper.java | 3 +- .../java/com/iformall/utils/CreditUtil.java | 16 ++++----- .../mapper/WxCUserBasicInfoMapper.xml | 2 +- .../mapper/WxCreditHistoryMapper.xml | 18 ++-------- .../datafix/DataInitController.java | 2 +- 25 files changed, 89 insertions(+), 86 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 3609923e3..ead58575c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -67,7 +67,7 @@ public class WxCreditHistoryController extends BaseController { } try { - Map result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId, getTenantInfo()) ; + Map result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId, getTenantInfo().getFinalTenantId()) ; return new ResultData(result); } catch (MallinkException e) { return new ResultData(e.getErrorCode(),e.getMessage()); @@ -86,7 +86,7 @@ public class WxCreditHistoryController extends BaseController { wxCreditHistory.setTenantId(user.getFinalTenantId()); wxCreditHistory.setOperatorId(user.getId()); try { - wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),wxCreditHistory) ; + wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),getTenantInfo()) ; WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); return new ResultData(Result.SUCCESS, "操作成功", credit); } catch (MallinkException e) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java index 7838bcad3..a0be99868 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java @@ -56,7 +56,7 @@ public class WxScoreRulesController extends BaseController { @SystemControllerLog(description = "积分-配置") public ResultData creditRulesList() { logger.debug("[" + getIpAddr() + "] WxScoreRulesController::list"); - WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(ifParentUpdateTenantInfo()); + WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(getTenantInfo().getFinalTenantId()); return new ResultData(scoreRules); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index 1727cfc17..7d055b49f 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -192,7 +192,8 @@ public class WxCUserController extends BaseController { private void addCredit(WxCUserBasicInfo wxCUserBasicInfo, EnumScoreType enumScoreType, Long userId, TenantEntity tenantEntity) { WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setCUserId(wxCUserBasicInfo.getId()); - wxCreditHistory.updateTenantInfo(tenantEntity); +// wxCreditHistory.updateTenantInfo(tenantEntity); + wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId()); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(enumScoreType.getCode()); wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 38472c7a5..8a1f47768 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -71,7 +71,7 @@ public class WxCreditHistoryController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL) ; } try { - Map result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId, getTenantInfo()); + Map result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId, getTenantInfo().getFinalTenantId()); return new ResultData(result); } catch (MallinkException e) { return new ResultData(e.getErrorCode(), e.getMessage()); @@ -99,7 +99,9 @@ public class WxCreditHistoryController extends BaseController { @PostMapping("/add") public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) { log.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); - wxCreditHistory.updateTenantInfo(getTenantInfo()); +// wxCreditHistory.updateTenantInfo(getTenantInfo()); + TenantEntity tenantInfo = getTenantInfo(); + wxCreditHistory.setTenantId(tenantInfo.getFinalTenantId()); wxCreditHistory.setOperatorId(getLoginBUser().getId()); WxMerchant wxMerchant = new WxMerchant(); wxMerchant.setId(getLoginBUser().getMerchantId()); @@ -120,7 +122,7 @@ public class WxCreditHistoryController extends BaseController { //B端操作用户 wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); try { - wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),wxCreditHistory); + wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),tenantInfo); WxBuser buser = getWxBuser(); if (null != buser) { wxCreditHistory.setBuserId(buser.getId()); @@ -128,7 +130,7 @@ public class WxCreditHistoryController extends BaseController { WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); //更新标签 if (wxCreditHistory.getTags() != null && !wxCreditHistory.getTags().isEmpty()) { - wxCUserTagsService.updateTagByUserId(wxCreditHistory.getCUserId(),wxCreditHistory, wxCreditHistory.getTags()); + wxCUserTagsService.updateTagByUserId(wxCreditHistory.getCUserId(),tenantInfo, wxCreditHistory.getTags()); } return new ResultData(Result.SUCCESS, "操作成功", credit); } catch (MallinkException e) { diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 761803411..3ad9ed8be 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -83,7 +83,7 @@ public class WxMerchantBUserController extends BaseController { } resultMap.put("creditLocked", merchant.getCreditLocked()); - WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(user); + WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(user.getFinalTenantId()); if (scoreRules.getCreditLocked().equals(EnumCreditLockedStatus.CLOSE.getCode())) { resultMap.put("creditLocked", EnumCreditLockedStatus.CLOSE.getCode()); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 09ff7cf57..823e673d6 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -970,7 +970,8 @@ public class WxUserGrantController extends BaseController { //增加积分 WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setCUserId(record.getId()); - wxCreditHistory.updateTenantInfo(tenantEntity); +// wxCreditHistory.updateTenantInfo(tenantEntity); + wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId()); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode()); wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index a618b6799..69804f86d 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -1363,7 +1363,8 @@ public class PosServiceImpl implements PosService { creditHistory.setOperatorId(buUserId); creditHistory.setCUserId(couponOrderCVo.getcUserId()); creditHistory.setCreateDate(new Date()); - creditHistory.updateTenantInfo(couponOrderCVo); +// creditHistory.updateTenantInfo(couponOrderCVo); + creditHistory.setTenantId(couponOrderCVo.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCouponId(couponOrderCVo.getCouponId()); creditHistory.setBusinessId(coupon.getBusiness()); @@ -1390,7 +1391,8 @@ public class PosServiceImpl implements PosService { creditHistory.setOperatorId(buUserId); creditHistory.setCUserId(memId); creditHistory.setCreateDate(new Date()); - creditHistory.updateTenantInfo(merchant); +// creditHistory.updateTenantInfo(merchant); + creditHistory.setTenantId(merchant.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setBusinessId(merchant.getBusinessId()); creditHistory.setSpend(payment); @@ -1422,11 +1424,7 @@ public class PosServiceImpl implements PosService { creditHistory.setOperatorId(buUserId); creditHistory.setCUserId(couponOrderCVo.getcUserId()); // creditHistory.updateTenantInfo(couponOrderCVo); - if(StringUtils.isNotBlank(couponOrderCVo.getParentTenantId())){ - creditHistory.setTenantId(couponOrderCVo.getParentTenantId()); - }else{ - creditHistory.setTenantId(couponOrderCVo.getTenantId()); - } + creditHistory.setTenantId(couponOrderCVo.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCouponId(couponOrderCVo.getCouponId()); int num = creditHistoryService.cancelCredit(creditHistory); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java index d48109237..dde758d91 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java @@ -337,7 +337,7 @@ public class CouponSendSchedule { } } - int birthdayScale = CreditUtil.getBirthdayScoreScale(tenantEntity, wxScoreRulesService); + int birthdayScale = CreditUtil.getBirthdayScoreScale(tenantEntity.getFinalTenantId(), wxScoreRulesService); for (WxCUserBasicInfo cu : couponSendedUsers) { // 记录积分倍率日期 try { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java index fc8efeecd..467bf1871 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -2,6 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.BaseTenantEntity; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,7 +13,7 @@ import java.util.List; @TableName(value = "wx_credit_history") @Data @EqualsAndHashCode(callSuper = true) -public class WxCreditHistory extends TenantEntity { +public class WxCreditHistory extends BaseTenantEntity { protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java index 8031e0965..d7eaef5b0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java @@ -1,6 +1,7 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.iformall.domain.po.base.BaseTenantEntity; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,7 +10,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) -public class WxCreditHistoryVo extends TenantEntity { +public class WxCreditHistoryVo extends BaseTenantEntity { @Excel(name = "微信昵称", width = 20, orderNum = "1") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java index 303e342d2..84b40c233 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java @@ -77,7 +77,8 @@ public interface WxCUserBasicInfoMapper extends CommonMapper selectNotCUserList(); - void cuserOldToNew(@Param(value = "oldCuserId")Long oldCuserId, @Param(value = "newCuserId")Long newCuserId,@Param("tableIndex")Integer tableIndex); + void cuserOldToNew(@Param(value = "oldCuserId")Long oldCuserId, @Param(value = "newCuserId")Long newCuserId, + @Param("tableIndex")Integer tableIndex,@Param("finalTableIndex")Integer finalTableIndex); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java index 775b31c84..cc951076f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java @@ -68,7 +68,7 @@ public interface WxCreditHistoryService { */ //void deleteById(Long id); - Map findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, TenantEntity tenantEntity); + Map findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, String tenantId); void clearCreditByYear(); diff --git a/mallinkService/src/main/java/com/iformall/service/WxScoreRulesService.java b/mallinkService/src/main/java/com/iformall/service/WxScoreRulesService.java index 39e7e5137..b8fcb6ac5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxScoreRulesService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxScoreRulesService.java @@ -25,10 +25,10 @@ public interface WxScoreRulesService { /** * 获取租户的积分规则 - * @param tenantEntity + * @param * @return */ - WxScoreRules getCreditRules(TenantEntity tenantEntity); + WxScoreRules getCreditRules(String tenantId); /** * 保存或更新实体 * diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 40bc23d1e..bad198c23 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -181,7 +181,8 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { Integer credit = wxActivity.getCredit(); //积分历史 WxCreditHistory wxCreditHistory = new WxCreditHistory(); - wxCreditHistory.updateTenantInfo(wxActivity); +// wxCreditHistory.updateTenantInfo(wxActivity); + wxCreditHistory.setTenantId(wxActivity.getFinalTenantId()); wxCreditHistory.setCUserId(wxActivityJoin.getUserId()); wxCreditHistory.setCreditNum(credit); wxCreditHistory.setCreditType(EnumScoreType.ACTIVITY_JOIN.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 4d9192d7c..2edb12906 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1071,7 +1071,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc //积分处理逻辑:覆盖原积分 记录历史 if (credit != null) { WxCreditHistory wxCreditHistory = new WxCreditHistory(); - wxCreditHistory.updateTenantInfo(mallUserInfo); +// wxCreditHistory.updateTenantInfo(mallUserInfo); + wxCreditHistory.setTenantId(mallUserInfo.getFinalTenantId()); wxCreditHistory.setCreateDate(new Date()); if (mallUserInfo != null) { wxCreditHistory.setOperatorId(mallUserInfo.getId()); @@ -1215,9 +1216,11 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc @Override public void cuserOldToNew(Long oldCuserId, Long newCuserId,TenantEntity tenantinfo) { - String finalTenantId = tenantinfo.getFinalTenantId(); - Integer tableIndex = Integer.parseInt(String.valueOf(Long.parseLong(finalTenantId)%100)); - wxCUserBasicInfoMapper.cuserOldToNew(oldCuserId,newCuserId,tableIndex); + String tenantId = tenantinfo.getTenantId(); + String finalTenantId = tenantinfo.getFinalTenantId(); + Integer tableIndex = Integer.parseInt(String.valueOf(Long.parseLong(tenantId)%100)); + Integer finalTableIndex = Integer.parseInt(String.valueOf(Long.parseLong(finalTenantId)%100)); + wxCUserBasicInfoMapper.cuserOldToNew(oldCuserId,newCuserId,tableIndex,finalTableIndex); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 05102fd1b..6e6efe02b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -295,7 +295,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { creditHistory.setOperatorId(record.getOwnerId()); creditHistory.setCUserId(record.getOwnerId()); creditHistory.setCreateDate(new Date()); - creditHistory.updateTenantInfo(record); +// creditHistory.updateTenantInfo(record); + creditHistory.setTenantId(record.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setBusinessId(coupon.getBusiness()); creditHistory.setSpend(real_payment); @@ -914,7 +915,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { creditHistory.setOperatorId(buUser.getId()); creditHistory.setCUserId(record.getOwnerId()); creditHistory.setCreateDate(new Date()); - creditHistory.updateTenantInfo(record); +// creditHistory.updateTenantInfo(record); + creditHistory.setTenantId(record.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setBusinessId(merchant.getBusinessId()); creditHistory.setSpend(record.getRealPayment()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 59cb91493..3c353529a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -445,7 +445,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { creditHistory.setOperatorId(bUser.getId()); creditHistory.setCUserId(couponOrder.getcUserId()); creditHistory.setCreateDate(new Date()); - creditHistory.updateTenantInfo(couponOrder); +// creditHistory.updateTenantInfo(couponOrder); + creditHistory.setTenantId(couponOrder.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCouponId(wxCoupon.getId()); creditHistory.setBusinessId(wxCoupon.getBusiness()); @@ -476,7 +477,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { creditHistory.setOperatorId(cuUser.getId()); creditHistory.setCUserId(couponOrder.getcUserId()); creditHistory.setCreateDate(new Date()); - creditHistory.updateTenantInfo(couponOrder); +// creditHistory.updateTenantInfo(couponOrder); + creditHistory.setTenantId(couponOrder.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCouponId(wxCoupon.getId()); creditHistory.setBusinessId(wxCoupon.getBusiness()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index e1f130a0e..bece48beb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -199,7 +199,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public WxCreditHistory saveOrUpdate(WxCreditHistory record) { - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getFinalTenantId()); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getTenantId()); if (wxCUserBasicInfo == null) { //验证此用户是否存在 throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE); @@ -227,7 +227,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { if (record.getCreditType().equals(EnumScoreType.CONSUMPTION.getCode()) || record.getCreditType().equals(EnumScoreType.SPEND_CREDIT.getCode())) { //等级积分配置 try { - creditChangeNum = CreditUtil.calUserCredit(record,creditChangeNumOrigin, wxCUserBasicInfo, wxScoreRulesService,wxLevelConfigMapper); + creditChangeNum = CreditUtil.calUserCredit(creditChangeNumOrigin, wxCUserBasicInfo, wxScoreRulesService,wxLevelConfigMapper); if (Objects.nonNull(CreditUtil.getIsBirthDayScale())) { hasBirthDateCredit = true; } @@ -297,7 +297,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return 0; } // 2. user - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getFinalTenantId()); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getTenantId()); if (wxCUserBasicInfo != null) { WxCUserBasicInfo wxCUserBasicInfoNew = new WxCUserBasicInfo(); wxCUserBasicInfoNew.setId(wxCUserBasicInfo.getId()); @@ -314,22 +314,22 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { // } @Override - public Map findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, TenantEntity tenantEntity) { + public Map findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, String tenantId) { WxMerchant wxMerchant = wxMerchantMapper.selectById(merchantId); Map creditMap = Maps.newHashMap(); if (wxMerchant != null && wxMerchant.getBusinessId() != null) { WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setBusinessId(wxMerchant.getBusinessId()); //wxCreditHistory.updateTenantInfo(tenantEntity); - wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId()); + wxCreditHistory.setTenantId(tenantId); int credit; int creditNew = 0 ; if (StringUtils.isNotBlank(spendStr)) { wxCreditHistory.setSpend(new BigDecimal(spendStr).multiply(new BigDecimal(100)).intValue()); credit = payAddCredit(wxCreditHistory); if (Objects.nonNull(userId)) { - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(userId,tenantEntity.getFinalTenantId()); - creditNew = CreditUtil.calUserCredit(tenantEntity,credit, wxCUserBasicInfo, wxScoreRulesService,wxLevelConfigMapper); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(userId,tenantId); + creditNew = CreditUtil.calUserCredit(credit, wxCUserBasicInfo, wxScoreRulesService,wxLevelConfigMapper); } else { creditNew = credit; } @@ -391,45 +391,46 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return 0; } // 1. 获取当前租户下积分的增加规则 - WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record); + WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId()); // 2. 增长的积分 return wxScoreRules.getRule(EnumScoreType.LOGIN, WxScoreRules.SCORE); } private int bindCarAddCredit(WxCreditHistory record) { // 1. 获取score rules - WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record); + WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId()); // 2. 增长的积分 return wxScoreRules.getRule(EnumScoreType.BIND_CAR, WxScoreRules.SCORE); } private int personAddCredit(WxCreditHistory record) { // 1. 获取score rules - WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record); + WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId()); // 2. 增长的积分 return wxScoreRules.getRule(EnumScoreType.WECHAT_PERSION, WxScoreRules.SCORE); } private int phoneAddCredit(WxCreditHistory record) { // 1. 获取score rules - WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record); + WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId()); // 2. 获取成长值 return wxScoreRules.getRule(EnumScoreType.WECHAT_PHONE, WxScoreRules.SCORE); } - private int checkCompleteInfoScoreCount(TenantEntity tenantEntity,WxCUserBasicInfo cUser) { + private int checkCompleteInfoScoreCount(WxCUserBasicInfo cUser) { WxCreditHistory wxCreditHistory = new WxCreditHistory(); + wxCreditHistory.setTenantId(cUser.getFinalTenantId()); wxCreditHistory.setCUserId(cUser.getId()); wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode()); return wxCreditHistoryMapper.countList(wxCreditHistory); } private int infoAddCredit(WxCreditHistory record) { - WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getFinalTenantId()); - if (user == null || checkCompleteInfoScoreCount(record,user) > 0) + WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getTenantId()); + if (user == null || checkCompleteInfoScoreCount(user) > 0) return 0; // 1. 获取score rules - WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(record); + WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(record.getTenantId()); // 2. 获取成长值 return scoreRules.getRule(EnumScoreType.COMPLETE_INFO, WxScoreRules.SCORE); } @@ -443,7 +444,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); } //根据商户id和花费金额计算需要新增的积分 - Map map = findByMerchantIdAndSpend(record.getMerchantId(), record.getSpendStr(), null,record); + Map map = findByMerchantIdAndSpend(record.getMerchantId(), record.getSpendStr(), null,record.getTenantId()); return map.get("credit"); } @@ -458,7 +459,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { if (record.getCreditNum() != null && record.getCreditNum() == 0) return 0; // 1. 获取score rules - WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(record); + WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(record.getTenantId()); // 2. 获取成长值 by id JSONObject payRule = scoreRules.getRuleObj(EnumScoreType.CONSUMPTION); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 1cc7939e7..6b1ff597e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1541,7 +1541,8 @@ public class WxOrderServiceImpl implements WxOrderService { creditHistory.setOperatorId(user.getId()); creditHistory.setCUserId(user.getId()); creditHistory.setCreateDate(new Date()); - creditHistory.updateTenantInfo(wxMerchant); +// creditHistory.updateTenantInfo(wxMerchant); + creditHistory.setTenantId(wxMerchant.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); if (updateOrder.getCouponChannelId() != null) { WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(updateOrder.getCouponChannelId(),updateOrder.getTenantId()); @@ -2178,7 +2179,8 @@ public class WxOrderServiceImpl implements WxOrderService { } creditHistory.setCreditNum(coupon.getCreditPrice()); creditHistory.setCUserId(user.getId()); - creditHistory.updateTenantInfo(coupon); +// creditHistory.updateTenantInfo(coupon); + creditHistory.setTenantId(coupon.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode()); creditHistory.setCouponId(coupon.getId()); //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index d0a89dca3..2faef7d04 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -186,13 +186,13 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { } @Override - public WxScoreRules getCreditRules(TenantEntity tenantEntity) { - String tenantId = ""; - if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ - tenantId = tenantEntity.getParentTenantId(); - }else{ - tenantId = tenantEntity.getTenantId(); - } + public WxScoreRules getCreditRules(String tenantId) { +// String tenantId = ""; +// if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ +// tenantId = tenantEntity.getParentTenantId(); +// }else{ +// tenantId = tenantEntity.getTenantId(); +// } // get pushLime from cache String key = Constant.CREDIT_RULES_KEY_PREV + tenantId; diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java b/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java index 0f35013df..4de19ed39 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java @@ -80,7 +80,8 @@ public class ParkHelper { public void addCredit(WxPark park, Long cuUserId){ WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setCUserId(cuUserId); - wxCreditHistory.updateTenantInfo(park); +// wxCreditHistory.updateTenantInfo(park); + wxCreditHistory.setTenantId(park.getFinalTenantId()); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(EnumScoreType.BIND_CAR.getCode()); wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java b/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java index d8f114796..81f9cf8df 100644 --- a/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java @@ -24,7 +24,7 @@ public class CreditUtil { * @param wxLevelConfigMapper * @return */ - public static int calUserCredit(TenantEntity tenantEntity,int creditOrigin, WxCUserBasicInfo wxCUserBasicInfo, WxScoreRulesService wxScoreRulesService, WxLevelConfigMapper wxLevelConfigMapper) { + public static int calUserCredit(int creditOrigin, WxCUserBasicInfo wxCUserBasicInfo, WxScoreRulesService wxScoreRulesService, WxLevelConfigMapper wxLevelConfigMapper) { Long userId = wxCUserBasicInfo.getId(); Integer score = wxCUserBasicInfo.getPoins(); String tenantId = wxCUserBasicInfo.getFinalTenantId(); @@ -34,7 +34,7 @@ public class CreditUtil { int levelScale = getLevelScale(score, levelScaleConfig); // 获取生日积分倍率: - int birthdayScale = getBirthdayScale(tenantEntity,wxCUserBasicInfo, wxScoreRulesService); + int birthdayScale = getBirthdayScale(wxCUserBasicInfo, wxScoreRulesService); int creditNew = new BigDecimal(creditOrigin) .multiply(new BigDecimal(levelScale)) @@ -76,7 +76,7 @@ public class CreditUtil { * @param wxScoreRulesService * @return */ - private static int getBirthdayScale(TenantEntity tenantEntity,WxCUserBasicInfo wxCUserBasicInfo, WxScoreRulesService wxScoreRulesService) { + private static int getBirthdayScale(WxCUserBasicInfo wxCUserBasicInfo, WxScoreRulesService wxScoreRulesService) { int birthdayScale = WxScoreRules.DEFAULT_SCALE; if (Objects.isNull(wxCUserBasicInfo) || StringUtils.isBlank(wxCUserBasicInfo.getPhone())) { return 0; @@ -86,14 +86,14 @@ public class CreditUtil { if(Objects.isNull(wxCUserBasicInfo.getScoreDate())) { //设置过生日的用户 if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getBirthdate()) == 0) { - birthdayScale = getBirthdayScoreScale(tenantEntity,wxScoreRulesService); + birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo.getFinalTenantId(),wxScoreRulesService); } else { log.info("积分倍率计算:未设置生日或生日条件未匹配={}", wxCUserBasicInfo.getScoreDate()); } } else { //发过生日券的用户或者享受过生日积分倍率的用户 if (Objects.nonNull(wxCUserBasicInfo.getScoreDate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getScoreDate()) == 0) { - birthdayScale = getBirthdayScoreScale(tenantEntity, wxScoreRulesService); + birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo.getFinalTenantId(), wxScoreRulesService); } } @@ -107,13 +107,13 @@ public class CreditUtil { /** * 获取生日积分倍率 * - * @param tenantEntity + * @param * @param wxScoreRulesService * @return */ - public static int getBirthdayScoreScale(TenantEntity tenantEntity, WxScoreRulesService wxScoreRulesService) { + public static int getBirthdayScoreScale(String tenantId, WxScoreRulesService wxScoreRulesService) { int birthdayScale = WxScoreRules.DEFAULT_SCALE; - WxScoreRules rules = wxScoreRulesService.getCreditRules(tenantEntity); + WxScoreRules rules = wxScoreRulesService.getCreditRules(tenantId); if (Objects.nonNull(rules) && Objects.nonNull(rules.getScale())) { //规则存使用积分倍率 birthdayScale = rules.getScale(); diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index aef6d1d8c..7348ea578 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -1049,6 +1049,6 @@ --> - {call cuser_old_to_new(#{oldCuserId},#{newCuserId},#{tableIndex})} + {call cuser_old_to_new(#{oldCuserId},#{newCuserId},#{tableIndex},#{finalTableIndex})} \ No newline at end of file diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index 6831a11bd..0d1ac2a46 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -4,7 +4,6 @@ - @@ -23,7 +22,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`credit_amount`,`credit_num`,`credit_type`,`create_date`,`receipt_url`,`operator_type`,`operator_id`,`merchant_id`,`coupon_id`,`business_id`,`spend`,`change_purpose`,`ticket_number`,`buser_id` + `id`,`tenant_id`,`c_user_id`,`credit_amount`,`credit_num`,`credit_type`,`create_date`,`receipt_url`,`operator_type`,`operator_id`,`merchant_id`,`coupon_id`,`business_id`,`spend`,`change_purpose`,`ticket_number`,`buser_id` @@ -34,9 +33,6 @@ and `tenant_id` = #{tenantId} - - and `parent_tenant_id` = #{parentTenantId} - and `c_user_id` = #{cUserId} @@ -105,11 +101,8 @@ and credit.create_date < #{endTime} - and ( credit.`tenant_id` = #{tenantId} or credit.`parent_tenant_id` = #{tenantId} ) + and credit.`tenant_id` = #{tenantId} - - - and credit.operator_type = #{operatorType} @@ -154,7 +147,6 @@ basic.phone phone, basic.sex sex, credit.tenant_id tenantId, - credit.parent_tenant_id parentTenantId, credit.c_user_id cUserId, credit.credit_amount creditAmount, credit.credit_num creditNum, @@ -199,9 +191,6 @@ and `tenant_id` = #{tenantId} - - and `parent_tenant_id` = #{parentTenantId} - and `c_user_id` = #{cUserId} @@ -222,9 +211,6 @@ and `tenant_id` = #{tenantId} - - and `parent_tenant_id` = #{parentTenantId} - and `c_user_id` = #{cUserId} diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/datafix/DataInitController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/datafix/DataInitController.java index 6aa654268..f4510b1dd 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/datafix/DataInitController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/datafix/DataInitController.java @@ -203,7 +203,7 @@ public class DataInitController extends BaseController { creditHistory.setOperatorId(buUser.getId()); creditHistory.setCUserId(co.getcUserId()); creditHistory.setCreateDate(co.getUpdateDate()); - creditHistory.setTenantId(co.getTenantId()); + creditHistory.setTenantId(co.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCouponId(coupon.getId()); creditHistory.setBusinessId(coupon.getBusiness());