From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类,添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑,增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑,移除冗余代码

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java |   42 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 41 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java
index b912e2d..409cc63 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java
@@ -1,6 +1,8 @@
 package cc.mrbird.febs.mall.service.impl;
 
 import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.enumerates.BannerDictionaryEnum;
+import cc.mrbird.febs.common.enumerates.CommonDictionaryEnum;
 import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
 import cc.mrbird.febs.mall.dto.NewsListDto;
 import cc.mrbird.febs.mall.entity.*;
@@ -60,8 +62,11 @@
     @Override
     public FebsResponse findAllBanner() {
         QueryWrapper<PlatformBanner> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type", 1);
+//        queryWrapper.orderByAsc("is_top");
+//        queryWrapper.orderByAsc("created_time");
+        queryWrapper.orderByAsc("sort");
         queryWrapper.orderByAsc("is_top");
-        queryWrapper.orderByAsc("created_time");
         List<PlatformBanner> paymentMethodList = platformBannerMapper.selectList(queryWrapper);
         if(CollUtil.isNotEmpty(paymentMethodList)){
             for(PlatformBanner platformBanner : paymentMethodList){
@@ -88,4 +93,39 @@
         );
         return new FebsResponse().success().data(dataDictionaryCustom.getValue());
     }
+
+    @Override
+    public FebsResponse bannerByType(int type) {
+
+        String timeStop = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                CommonDictionaryEnum.TIME_URL_INDEX.getType(),
+                CommonDictionaryEnum.TIME_URL_INDEX.getCode()
+        ).getValue();
+        if (timeStop == null) {
+            timeStop = "3";
+        }
+        QueryWrapper<PlatformBanner> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type",type);
+        queryWrapper.orderByAsc("sort");
+        queryWrapper.orderByAsc("is_top");
+        List<PlatformBanner> paymentMethodList = platformBannerMapper.selectList(queryWrapper);
+        if(CollUtil.isNotEmpty(paymentMethodList)){
+            if(BannerDictionaryEnum.OPEN_XCX.getType() == type)
+            for(PlatformBanner platformBanner : paymentMethodList){
+                platformBanner.setTimeStop(timeStop);
+
+                if("1".equals(platformBanner.getIsJump()) &&
+                        1 == platformBanner.getIsInside()){
+                    String jumpUrl = platformBanner.getJumpUrl();
+                    QueryWrapper<MallGoods> queryWrapperGoods = new QueryWrapper<>();
+                    queryWrapperGoods.eq("goods_no",jumpUrl);
+                    List<MallGoods> goodsList = mallGoodsMapper.selectList(queryWrapperGoods);
+                    if(CollUtil.isNotEmpty(goodsList)){
+                        platformBanner.setGoodsId(goodsList.get(0).getId());
+                    }
+                }
+            }
+        }
+        return new FebsResponse().success().data(paymentMethodList);
+    }
 }

--
Gitblit v1.9.1