From 514893ecbd423fd8c0731d361311462d1db3d21e Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Tue, 3 Sep 2024 17:03:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activePrice/mapper/xml/ActivePriceMapper.xml | 6 ++++++ .../activePrice/mapper/xml/ActivePriceRuleMapper.xml | 6 ++++++ .../service/impl/ActivePriceRuleServiceImpl.java | 8 ++++++++ .../activePrice/service/impl/ActivePriceServiceImpl.java | 2 ++ 4 files changed, 22 insertions(+) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/mapper/xml/ActivePriceMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/mapper/xml/ActivePriceMapper.xml index 9c801288b..37b299bd0 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/mapper/xml/ActivePriceMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/mapper/xml/ActivePriceMapper.xml @@ -14,6 +14,12 @@ active_price main LEFT JOIN active_price_oil apo ON main.id = apo.active_id + + AND main.chain_stor_id = #{entity.chainStorId} + + + AND main.store_id = #{entity.storeId} + AND main.active_type = #{entity.activeType} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/mapper/xml/ActivePriceRuleMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/mapper/xml/ActivePriceRuleMapper.xml index bc73b82f8..edf6c1396 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/mapper/xml/ActivePriceRuleMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/mapper/xml/ActivePriceRuleMapper.xml @@ -22,6 +22,12 @@ active_price_rule main LEFT JOIN active_price ap ON main.active_id = ap.id + + AND main.chain_stor_id = #{entity.chainStorId} + + + AND main.store_id = #{entity.storeId} + AND ap.active_type = #{entity.activeType} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/service/impl/ActivePriceRuleServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/service/impl/ActivePriceRuleServiceImpl.java index bf1cc36a5..3369b9459 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/service/impl/ActivePriceRuleServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/service/impl/ActivePriceRuleServiceImpl.java @@ -12,7 +12,9 @@ import com.fuint.business.marketingActivity.activePrice.vo.ActivePriceRuleReqVO; import com.fuint.business.marketingActivity.activePrice.vo.ActivePriceRuleRespVO; import com.fuint.business.marketingActivity.activePrice.vo.ActivePriceRuleSaveVO; import com.fuint.business.userManager.entity.UserLabel; +import com.fuint.common.dto.AccountInfo; import com.fuint.common.util.StringUtils; +import com.fuint.common.util.TokenUtil; import com.fuint.framework.exception.BusinessCheckException; import com.fuint.quartz.util.BeanUtils; import com.fuint.repository.model.MtUserGrade; @@ -53,6 +55,8 @@ public class ActivePriceRuleServiceImpl extends ServiceImpl pageActivePriceRule(Page page, ActivePriceRuleReqVO actPriceRuleReq) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + actPriceRuleReq.setStoreId(nowAccountInfo.getStoreId()); /*1、列表数据查询,返回结构中带有会员等级集合和会员标签集合*/ IPage result = activePriceRuleMapper.pageActivePriceRule(page, actPriceRuleReq); /*2、数据处理*/ @@ -118,6 +122,10 @@ public class ActivePriceRuleServiceImpl extends ServiceImpl pageActivePrice(Page page, ActivePriceReqVO actPriceReq) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + actPriceReq.setStoreId(nowAccountInfo.getStoreId()); return activePriceMapper.pageActivePrice(page, actPriceReq); }