From 72b55aa1871650334542ad6a383b1686badcd520 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 3 Nov 2020 16:46:21 +0800 Subject: [PATCH] xingxingdiandeng --- .../iformall/controller/mem/WxCreditHistoryController.java | 1 + .../iformall/controller/mem/WxScoreHistoryController.java | 3 +++ .../java/com/iformall/controller/WxCUserController.java | 1 + .../com/iformall/controller/WxCreditHistoryController.java | 1 + .../com/iformall/controller/WxCreditHistoryController.java | 1 + .../com/iformall/controller/WxScoreHistoryController.java | 1 + .../java/com/iformall/controller/WxUserGrantController.java | 1 + .../main/java/com/iformall/service/impl/PosServiceImpl.java | 4 ++++ .../iformall/service/impl/WxActivityJoinServiceImpl.java | 1 + .../iformall/service/impl/WxCUserBasicInfoServiceImpl.java | 1 + .../java/com/iformall/service/impl/WxCUserServiceImpl.java | 1 + .../com/iformall/service/impl/WxCardSpendServiceImpl.java | 2 ++ .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 2 ++ .../iformall/service/impl/WxCreditHistoryServiceImpl.java | 2 ++ .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 2 ++ .../com/iformall/service/impl/WxScoreRulesServiceImpl.java | 6 ++++++ .../java/com/iformall/service/impl/WxShopServiceImpl.java | 1 + .../com/iformall/service/park/impl/util/ParkHelper.java | 1 + .../src/main/resources/mapper/WxRentContractMapper.xml | 3 +++ .../com/iformall/controller/datafix/DataInitController.java | 1 + 20 files changed, 36 insertions(+) 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 7e77312a8..177fcc784 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -81,6 +81,7 @@ public class WxCreditHistoryController extends BaseController { MallUserInfo user = getUser(); //wxCreditHistory.updateTenantInfo(user); wxCreditHistory.setTenantId(user.getFinalTenantId()); + wxCreditHistory.setFinalTenantId(user.getFinalTenantId()); wxCreditHistory.setOperatorId(user.getId()); try { wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),getTenantInfo()) ; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java index ee5670fb4..685dd1be9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java @@ -41,6 +41,7 @@ public class WxScoreHistoryController extends BaseController { logger.debug("[" + getIpAddr() + "] WxScoreHistoryController::list"); if (null == wxScoreHistory) wxScoreHistory = new WxScoreHistory(); wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId()); + wxScoreHistory.setFinalTenantId(getTenantInfo().getFinalTenantId()); final PageInfo page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); return new ResultData(page); } @@ -56,6 +57,7 @@ public class WxScoreHistoryController extends BaseController { return new ResultData(ErrorCode.MEMBER_IS_LOCKED); } wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId()); + wxScoreHistory.setFinalTenantId(getTenantInfo().getFinalTenantId()); wxScoreHistoryService.saveOrUpdate(wxScoreHistory); return new ResultData(); } @@ -69,6 +71,7 @@ public class WxScoreHistoryController extends BaseController { return new ResultData(ErrorCode.MEMBER_IS_LOCKED); } wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId()); + wxScoreHistory.setFinalTenantId(getTenantInfo().getFinalTenantId()); wxScoreHistoryService.saveOrUpdate(wxScoreHistory); return new ResultData(); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index af0d91da9..45c182949 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -194,6 +194,7 @@ public class WxCUserController extends BaseController { wxCreditHistory.setCUserId(wxCUserBasicInfo.getId()); // wxCreditHistory.updateTenantInfo(tenantEntity); wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId()); + wxCreditHistory.setFinalTenantId(getTenantInfo().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 06c89c9fd..1a0c935b0 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -102,6 +102,7 @@ public class WxCreditHistoryController extends BaseController { // wxCreditHistory.updateTenantInfo(getTenantInfo()); TenantEntity tenantInfo = getTenantInfo(); wxCreditHistory.setTenantId(tenantInfo.getFinalTenantId()); + wxCreditHistory.setFinalTenantId(getTenantInfo().getFinalTenantId()); wxCreditHistory.setOperatorId(getLoginBUser().getId()); WxMerchant wxMerchant = new WxMerchant(); wxMerchant.setId(getLoginBUser().getMerchantId()); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index f91803f32..48db39967 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -46,6 +46,7 @@ public class WxCreditHistoryController extends BaseController{ } catch (Exception e) { return new ResultData(Result.ERROR,e.getMessage()); } + wxCreditHistory.setFinalTenantId(getTenantInfo().getFinalTenantId()); wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); wxCreditHistory.setCUserId(memberId); wxCreditHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java index f011b9aee..4beb46dc0 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java @@ -33,6 +33,7 @@ public class WxScoreHistoryController extends BaseController { WxScoreHistory wxScoreHistory = new WxScoreHistory(); // wxScoreHistory.updateTenantInfo(getTenantInfo()); wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId()); + wxScoreHistory.setFinalTenantId(getTenantInfo().getFinalTenantId()); Long memberId; try { memberId = getMemberId(); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 10aab1351..e088daf2d 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -972,6 +972,7 @@ public class WxUserGrantController extends BaseController { wxCreditHistory.setCUserId(record.getId()); // wxCreditHistory.updateTenantInfo(tenantEntity); wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId()); + wxCreditHistory.setFinalTenantId(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 a26f954f8..3be7dad59 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -1365,6 +1365,7 @@ public class PosServiceImpl implements PosService { creditHistory.setCreateDate(new Date()); // creditHistory.updateTenantInfo(couponOrderCVo); creditHistory.setTenantId(couponOrderCVo.getFinalTenantId()); + creditHistory.setFinalTenantId(couponOrderCVo.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCouponId(couponOrderCVo.getCouponId()); creditHistory.setBusinessId(coupon.getBusiness()); @@ -1393,6 +1394,7 @@ public class PosServiceImpl implements PosService { creditHistory.setCreateDate(new Date()); // creditHistory.updateTenantInfo(merchant); creditHistory.setTenantId(merchant.getFinalTenantId()); + creditHistory.setFinalTenantId(merchant.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setBusinessId(merchant.getBusinessId()); creditHistory.setSpend(payment); @@ -1424,6 +1426,7 @@ public class PosServiceImpl implements PosService { creditHistory.setOperatorId(buUserId); creditHistory.setCUserId(couponOrderCVo.getcUserId()); // creditHistory.updateTenantInfo(couponOrderCVo); + creditHistory.setFinalTenantId(couponOrderCVo.getFinalTenantId()); creditHistory.setTenantId(couponOrderCVo.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCouponId(couponOrderCVo.getCouponId()); @@ -1441,6 +1444,7 @@ public class PosServiceImpl implements PosService { WxScoreHistory scoreHistory = new WxScoreHistory(); // scoreHistory.updateTenantInfo(couponOrderCVo); scoreHistory.setTenantId(couponOrderCVo.getFinalTenantId()); + scoreHistory.setFinalTenantId(couponOrderCVo.getFinalTenantId()); scoreHistory.setScoreType(EnumScoreType.CONSUMPTION.getCode()); scoreHistory.setCUserId(couponOrderCVo.getcUserId()); scoreHistory.setOrderId(couponOrderCVo.getOrderId()); 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 bad198c23..4d5458bbf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -183,6 +183,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { WxCreditHistory wxCreditHistory = new WxCreditHistory(); // wxCreditHistory.updateTenantInfo(wxActivity); wxCreditHistory.setTenantId(wxActivity.getFinalTenantId()); + wxCreditHistory.setFinalTenantId(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 2edb12906..ed3330deb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1073,6 +1073,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc WxCreditHistory wxCreditHistory = new WxCreditHistory(); // wxCreditHistory.updateTenantInfo(mallUserInfo); wxCreditHistory.setTenantId(mallUserInfo.getFinalTenantId()); + wxCreditHistory.setFinalTenantId(mallUserInfo.getFinalTenantId()); wxCreditHistory.setCreateDate(new Date()); if (mallUserInfo != null) { wxCreditHistory.setOperatorId(mallUserInfo.getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index 653b24bcb..c25af90d6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -338,6 +338,7 @@ public class WxCUserServiceImpl implements WxCUserService { WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setCUserId(user.getUserId()); wxCreditHistory.setTenantId(user.getFinalTenantId()); + wxCreditHistory.setFinalTenantId(user.getFinalTenantId()); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(enumScoreType.getCode()); wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); 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 15ff2234f..432b4b797 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -304,6 +304,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { creditHistory.setCreateDate(new Date()); // creditHistory.updateTenantInfo(record); creditHistory.setTenantId(record.getFinalTenantId()); + creditHistory.setFinalTenantId(record.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setBusinessId(coupon.getBusiness()); creditHistory.setSpend(real_payment); @@ -924,6 +925,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { creditHistory.setCreateDate(new Date()); // creditHistory.updateTenantInfo(record); creditHistory.setTenantId(record.getFinalTenantId()); + creditHistory.setFinalTenantId(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 44b122528..256d5b3d5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -447,6 +447,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { creditHistory.setCreateDate(new Date()); // creditHistory.updateTenantInfo(couponOrder); creditHistory.setTenantId(couponOrder.getFinalTenantId()); + creditHistory.setFinalTenantId(couponOrder.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCouponId(wxCoupon.getId()); creditHistory.setBusinessId(wxCoupon.getBusiness()); @@ -479,6 +480,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { creditHistory.setCreateDate(new Date()); // creditHistory.updateTenantInfo(couponOrder); creditHistory.setTenantId(couponOrder.getFinalTenantId()); + creditHistory.setFinalTenantId(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 bece48beb..9071b5de0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -322,6 +322,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { wxCreditHistory.setBusinessId(wxMerchant.getBusinessId()); //wxCreditHistory.updateTenantInfo(tenantEntity); wxCreditHistory.setTenantId(tenantId); + wxCreditHistory.setFinalTenantId(tenantId); int credit; int creditNew = 0 ; if (StringUtils.isNotBlank(spendStr)) { @@ -420,6 +421,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { private int checkCompleteInfoScoreCount(WxCUserBasicInfo cUser) { WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setTenantId(cUser.getFinalTenantId()); + wxCreditHistory.setFinalTenantId(cUser.getFinalTenantId()); wxCreditHistory.setCUserId(cUser.getId()); wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode()); return wxCreditHistoryMapper.countList(wxCreditHistory); 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 8e2591126..58256a9db 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1544,6 +1544,7 @@ public class WxOrderServiceImpl implements WxOrderService { creditHistory.setCreateDate(new Date()); // creditHistory.updateTenantInfo(wxMerchant); creditHistory.setTenantId(wxMerchant.getFinalTenantId()); + creditHistory.setFinalTenantId(wxMerchant.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); if (updateOrder.getCouponChannelId() != null) { WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(updateOrder.getCouponChannelId(),updateOrder.getTenantId()); @@ -2182,6 +2183,7 @@ public class WxOrderServiceImpl implements WxOrderService { creditHistory.setCUserId(user.getId()); // creditHistory.updateTenantInfo(coupon); creditHistory.setTenantId(coupon.getFinalTenantId()); + creditHistory.setFinalTenantId(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 4c4428621..acf9966c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -312,6 +312,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { scoreHistory.setCUserId(cUser.getId()); scoreHistory.setScoreType(EnumScoreType.LOGIN.getCode()); scoreHistory.setTenantId(tenantinfo.getFinalTenantId()); + scoreHistory.setFinalTenantId(tenantinfo.getFinalTenantId()); return wxScoreHistoryMapper.countTodayList(scoreHistory); } @@ -446,6 +447,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { scoreHistory.setCUserId(user.getId()); scoreHistory.setScoreType(EnumScoreType.COMPLETE_INFO.getCode()); scoreHistory.setTenantId(tenantinfo.getFinalTenantId()); + scoreHistory.setFinalTenantId(tenantinfo.getFinalTenantId()); return wxScoreHistoryMapper.countList(scoreHistory); } @@ -502,6 +504,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { WxScoreHistory history = new WxScoreHistory(); history.setId(idWorker.nextId()); history.setTenantId(tenantEntity.getFinalTenantId()); + history.setFinalTenantId(tenantEntity.getFinalTenantId()); history.setCUserId(userInfo.getId()); history.setCreateDate(new Date()); history.setScoreType(wechatPhone.getCode()); @@ -514,6 +517,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { WxScoreHistory history = new WxScoreHistory(); history.setId(idWorker.nextId()); history.setTenantId(tenantEntity.getFinalTenantId()); + history.setFinalTenantId(tenantEntity.getFinalTenantId()); history.setCUserId(id); history.setCreateDate(new Date()); history.setScoreType(wechatPhone.getCode()); @@ -526,6 +530,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { WxScoreHistory history = new WxScoreHistory(); history.setId(idWorker.nextId()); history.setTenantId(order.getFinalTenantId()); + history.setFinalTenantId(order.getFinalTenantId()); history.setCUserId(order.getCUserId()); history.setCreateDate(new Date()); history.setScoreType(EnumScoreType.CONSUMPTION.getCode()); @@ -543,6 +548,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { WxScoreHistory history = new WxScoreHistory(); history.setId(idWorker.nextId()); history.setTenantId(tenantEntity.getFinalTenantId()); + history.setFinalTenantId(tenantEntity.getFinalTenantId()); history.setCUserId(id); history.setCreateDate(new Date()); history.setScoreType(wechatPhone.getCode()); 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 c8ec382c4..f6a76eb36 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -137,6 +137,7 @@ public class WxShopServiceImpl implements WxShopService { } else { + wxRentContract.setShopNumber(wxShop.getShopNumber()); List list = wxRentContractMapper.selectList(new QueryWrapper(wxRentContract)); // count = list.stream().filter(r -> !r.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && // !r.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) && 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 ef11e4f57..39c6614d0 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 @@ -82,6 +82,7 @@ public class ParkHelper { wxCreditHistory.setCUserId(cuUserId); // wxCreditHistory.updateTenantInfo(park); wxCreditHistory.setTenantId(park.getFinalTenantId()); + wxCreditHistory.setFinalTenantId(park.getFinalTenantId()); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(EnumScoreType.BIND_CAR.getCode()); wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index b13f0f50b..8850737ac 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -132,6 +132,9 @@ and `rent_shop_type` = #{rentShopType} and `operation_type` = #{operationType} and json_contains(json_extract(rent_info,'$[*].id'),concat('"',#{queryShopId},'"')) + + and shop_name like concat('%',#{shopNumber},'%') + and status in 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 f4510b1dd..215e8e986 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/datafix/DataInitController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/datafix/DataInitController.java @@ -204,6 +204,7 @@ public class DataInitController extends BaseController { creditHistory.setCUserId(co.getcUserId()); creditHistory.setCreateDate(co.getUpdateDate()); creditHistory.setTenantId(co.getFinalTenantId()); + creditHistory.setFinalTenantId(co.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCouponId(coupon.getId()); creditHistory.setBusinessId(coupon.getBusiness());