From 683363fd21a77a17518f4585a710472b77d47404 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 27 Oct 2020 17:23:41 +0800 Subject: [PATCH] bug --- .../mem/WxCreditHistoryController.java | 33 +++++++++---------- .../controller/WxCreditHistoryController.java | 1 + .../controller/WxCreditHistoryController.java | 1 + .../controller/WxScoreHistoryController.java | 1 + .../iformall/service/impl/PosServiceImpl.java | 3 +- .../iformall/domain/po/WxScoreHistory.java | 3 +- .../service/impl/WxScoreRulesServiceImpl.java | 2 +- .../resources/mapper/WxScoreHistoryMapper.xml | 9 +---- 8 files changed, 24 insertions(+), 29 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 ead58575c..8212e798f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -43,12 +43,7 @@ public class WxCreditHistoryController extends BaseController { public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); - TenantEntity tenantEntity = ifParentUpdateTenantInfo(); - if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ - wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); - }else{ - wxCreditHistory.setTenantId(tenantEntity.getTenantId()); - } + wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); final PageInfo page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize); return new ResultData(page); } @@ -119,12 +114,13 @@ public class WxCreditHistoryController extends BaseController { @SystemControllerLog(description = "积分历史-导出数据") public void exportData(@ModelAttribute WxCreditHistory wxCreditHistory, HttpServletRequest request, HttpServletResponse response) { // wxCreditHistory.updateTenantInfo(getTenantInfo()); - TenantEntity tenantEntity = ifParentUpdateTenantInfo(); - if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ - wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); - }else{ - wxCreditHistory.setTenantId(tenantEntity.getTenantId()); - } +// TenantEntity tenantEntity = ifParentUpdateTenantInfo(); +// if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ +// wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); +// }else{ +// wxCreditHistory.setTenantId(tenantEntity.getTenantId()); +// } + wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); wxCreditHistoryService.exportData(request, response, wxCreditHistory); } @@ -134,12 +130,13 @@ public class WxCreditHistoryController extends BaseController { public ResultData getCreditSummary(@ModelAttribute WxCreditHistory wxCreditHistory) { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::getCreditSummary"); // wxCreditHistory.updateTenantInfo(getTenantInfo()); - TenantEntity tenantEntity = ifParentUpdateTenantInfo(); - if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ - wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); - }else{ - wxCreditHistory.setTenantId(tenantEntity.getTenantId()); - } +// TenantEntity tenantEntity = ifParentUpdateTenantInfo(); +// if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ +// wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); +// }else{ +// wxCreditHistory.setTenantId(tenantEntity.getTenantId()); +// } + wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); return wxCreditHistoryService.getCreditSummary(wxCreditHistory); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 5dc70eef2..021d6f3b2 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -147,6 +147,7 @@ public class WxCreditHistoryController extends BaseController { public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); + wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); WxMerchantBUser bUser = getLoginBUser(); WxMerchant merchant = wxMerchantService.getById(wxCreditHistory.getMerchantId()); if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index e51c46c3f..f91803f32 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.setTenantId(getTenantInfo().getFinalTenantId()); wxCreditHistory.setCUserId(memberId); wxCreditHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxCreditHistoryService.listAsPage(wxCreditHistory, pageNum, pageSize); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java index 37e5720ac..f011b9aee 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java @@ -32,6 +32,7 @@ public class WxScoreHistoryController extends BaseController { public ResultData list(Integer pageNum, Integer pageSize) { WxScoreHistory wxScoreHistory = new WxScoreHistory(); // wxScoreHistory.updateTenantInfo(getTenantInfo()); + wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId()); Long memberId; try { memberId = getMemberId(); 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 69804f86d..a26f954f8 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -1439,7 +1439,8 @@ public class PosServiceImpl implements PosService { // 2. 成长值历史回退 try { WxScoreHistory scoreHistory = new WxScoreHistory(); - scoreHistory.updateTenantInfo(couponOrderCVo); +// scoreHistory.updateTenantInfo(couponOrderCVo); + scoreHistory.setTenantId(couponOrderCVo.getFinalTenantId()); scoreHistory.setScoreType(EnumScoreType.CONSUMPTION.getCode()); scoreHistory.setCUserId(couponOrderCVo.getcUserId()); scoreHistory.setOrderId(couponOrderCVo.getOrderId()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java index 2025b010b..1115cbc23 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.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; @@ -11,7 +12,7 @@ import java.util.*; @TableName(value = "wx_score_history") @Data @EqualsAndHashCode(callSuper = true) -public class WxScoreHistory extends TenantEntity { +public class WxScoreHistory extends BaseTenantEntity { protected Long id; 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 2faef7d04..4c4428621 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -283,7 +283,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { return 0; } // 2. user score back - 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()); diff --git a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml index 44c465642..9699f10d3 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml @@ -4,7 +4,6 @@ - @@ -17,7 +16,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`create_date`,`score_type`,`valid_date`,`order_id`,`pay_type`,`pay_amount`,`score_amount`,`reason` + `id`,`tenant_id`,`c_user_id`,`create_date`,`score_type`,`valid_date`,`order_id`,`pay_type`,`pay_amount`,`score_amount`,`reason` @@ -30,9 +29,6 @@ and `tenant_id` = #{tenantId} - - and `parent_tenant_id` = #{parentTenantId} - and `c_user_id` = #{cUserId} @@ -111,9 +107,6 @@ and `tenant_id` = #{tenantId} - - and `parent_tenant_id` = #{parentTenantId} - and `c_user_id` = #{cUserId}