营销

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
         <where>
+            <if test="entity.chainStorId != null and entity.chainStorId != ''">
+                AND main.chain_stor_id = #{entity.chainStorId}
+            </if>
+            <if test="entity.storeId != null and entity.storeId != ''">
+                AND main.store_id = #{entity.storeId}
+            </if>
             <if test="entity.activeType != null and entity.activeType != ''">
                 AND main.active_type = #{entity.activeType}
             </if>

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
         <where>
+            <if test="entity.chainStorId != null and entity.chainStorId != ''">
+                AND main.chain_stor_id = #{entity.chainStorId}
+            </if>
+            <if test="entity.storeId != null and entity.storeId != ''">
+                AND main.store_id = #{entity.storeId}
+            </if>
             <if test="entity.activeType != null and entity.activeType != ''">
                 AND ap.active_type = #{entity.activeType}
             </if>

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<ActivePriceRuleMappe
      **/
     @Override
     public IPage<ActivePriceRuleRespVO> pageActivePriceRule(Page<ActivePriceRuleRespVO> page, ActivePriceRuleReqVO actPriceRuleReq) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        actPriceRuleReq.setStoreId(nowAccountInfo.getStoreId());
         /*1、列表数据查询，返回结构中带有会员等级集合和会员标签集合*/
         IPage<ActivePriceRuleRespVO> result = activePriceRuleMapper.pageActivePriceRule(page, actPriceRuleReq);
         /*2、数据处理*/
@@ -118,6 +122,10 @@ public class ActivePriceRuleServiceImpl extends ServiceImpl<ActivePriceRuleMappe
         String babelIds = String.join(",",saveVO.getLabelIdList());
         activePriceRule.setLevelId(levelId);
         activePriceRule.setBabelIds(babelIds);
+//        插入店铺信息id
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        activePriceRule.setChainStorId(nowAccountInfo.getChainStoreId());
+        activePriceRule.setStoreId(nowAccountInfo.getStoreId());
         /*3、保存数据库*/
         //保存活动规则
         saveOrUpdate(activePriceRule);

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/service/impl/ActivePriceServiceImpl.java

@@ -56,6 +56,8 @@ public class ActivePriceServiceImpl extends ServiceImpl<ActivePriceMapper, Activ
      **/
     @Override
     public IPage<ActivePriceRespVO> pageActivePrice(Page<ActivePriceRespVO> page, ActivePriceReqVO actPriceReq) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        actPriceReq.setStoreId(nowAccountInfo.getStoreId());
         return activePriceMapper.pageActivePrice(page, actPriceReq);
     }