小程序端活动02

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.Serializable;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -225,10 +226,15 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
     @Override
     public List<ActiveConsumptionAppletVO> selectAllApplet(ActiveConsumption activeConsumption) {
         //获取本油站消费有礼活动列表
-        IPage page = select(new Page(1, 9999), activeConsumption);
+        IPage page = select(new Page(1, 20), activeConsumption);
         List<ActiveConsumptionVO> activeConsumptionVOList = page.getRecords();
         List<ActiveConsumptionAppletVO> appletVOList = activeConsumptionVOList.stream().map(s -> {
             ActiveConsumptionAppletVO activeConsumptionAppletVO = new ActiveConsumptionAppletVO();
+            //活动时间
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd");
+            String formatSt = dateFormat.format(s.getActiveStartTime());
+            String formatEd = dateFormat.format(s.getActiveEndTime());
+            activeConsumptionAppletVO.setTime(formatSt+"-" + formatEd+"");
             //适用用户名
             String adaptUserType = "";
             if (s.getAdaptUserType().equals("0")){

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/vo/ActiveConsumptionAppletVO.java

@@ -8,4 +8,6 @@ import java.io.Serializable;
 public class ActiveConsumptionAppletVO implements Serializable {
     //活动描述
     private String activeDescribe;
+    //活动时间
+    private String time;
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/service/impl/ActiveDiscountServiceImpl.java

@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.Serializable;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -218,6 +219,11 @@ public class ActiveDiscountServiceImpl extends ServiceImpl<ActiveDiscountMapper,
         List<ActiveDiscountVO> activeDiscountVOList = page.getRecords();
         List<ActiveDiscountAppletVO> activeDiscountAppletVOS = activeDiscountVOList.stream().map(s -> {
             ActiveDiscountAppletVO activeDiscountAppletVO = new ActiveDiscountAppletVO();
+            //活动时间
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd");
+            String formatSt = dateFormat.format(s.getActiveStartTime());
+            String formatEd = dateFormat.format(s.getActiveEndTime());
+            activeDiscountAppletVO.setTime(formatSt+"-" + formatEd+"");
             //油号名字
             String oilName = "";
             for (Integer id : s.getAdaptOil()) {

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/vo/ActiveDiscountAppletVO.java

@@ -5,5 +5,8 @@ import lombok.Data;
 import java.io.Serializable;
 @Data
 public class ActiveDiscountAppletVO implements Serializable {
+    //活动描述
     private String discountActiveDescribe;
+    //活动时间
+    private String time;
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/controller/ActiveExchangeController.java

@@ -1,5 +1,6 @@
 package com.fuint.business.marketingActivity.activeExchange.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.marketingActivity.activeExchange.dto.ActiveExchangeRecordDTO;
 import com.fuint.business.marketingActivity.activeExchange.dto.TransferDTO;
 import com.fuint.business.marketingActivity.activeExchange.service.ActiveExchangeService;
@@ -80,4 +81,14 @@ public class ActiveExchangeController extends BaseController {
         return getSuccessResult(this.activeExchangeService.selectCardFavorableList(pageNo,pageSize, transferDTO));
     }
 
+    /**
+     * 分页查询所有数据
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("applet")
+    public ResponseObject selectAll() {
+        return getSuccessResult(this.activeExchangeService.select());
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/ActiveExchangeService.java

@@ -1,7 +1,9 @@
 package com.fuint.business.marketingActivity.activeExchange.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.marketingActivity.activeExchange.dto.ActiveExchangeRecordDTO;
 import com.fuint.business.marketingActivity.activeExchange.dto.TransferDTO;
+import com.fuint.business.marketingActivity.activeExchange.vo.ActiveAppletVO;
 import com.fuint.business.marketingActivity.activeExchange.vo.ActiveExchangeRecordVO;
 import com.fuint.business.marketingActivity.activeExchange.vo.ExchangeFavorableVO;
 import com.fuint.business.marketingActivity.activeExchange.vo.MaxoutVO;
@@ -42,4 +44,10 @@ public interface ActiveExchangeService {
      * @return
      */
     List<ExchangeFavorableVO> selectCardFavorableList(Integer pageNo, Integer pageSize, TransferDTO transferDTO);
+
+    /**
+     * 小程序活动列表
+     * @return
+     */
+    List<ActiveAppletVO> select();
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java

@@ -1,19 +1,30 @@
 package com.fuint.business.marketingActivity.activeExchange.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumption;
+import com.fuint.business.marketingActivity.activeConsumption.service.ActiveConsumptionService;
+import com.fuint.business.marketingActivity.activeConsumption.vo.ActiveConsumptionAppletVO;
 import com.fuint.business.marketingActivity.activeDiscount.entity.ActiveDiscount;
 import com.fuint.business.marketingActivity.activeDiscount.entity.ActiveDiscountChild;
 import com.fuint.business.marketingActivity.activeDiscount.service.ActiveDiscountChildService;
 import com.fuint.business.marketingActivity.activeDiscount.service.ActiveDiscountService;
+import com.fuint.business.marketingActivity.activeDiscount.vo.ActiveDiscountAppletVO;
 import com.fuint.business.marketingActivity.activeExchange.dto.ActiveExchangeRecordDTO;
 import com.fuint.business.marketingActivity.activeExchange.dto.TransferDTO;
 import com.fuint.business.marketingActivity.activeExchange.service.ActiveExchangeService;
+import com.fuint.business.marketingActivity.activeExchange.vo.ActiveAppletVO;
 import com.fuint.business.marketingActivity.activeExchange.vo.ActiveExchangeRecordVO;
 import com.fuint.business.marketingActivity.activeExchange.vo.ExchangeFavorableVO;
 import com.fuint.business.marketingActivity.activeExchange.vo.MaxoutVO;
 import com.fuint.business.marketingActivity.activeFullminus.entity.ActiveFullminus;
 import com.fuint.business.marketingActivity.activeFullminus.service.ActiveFullminusService;
+import com.fuint.business.marketingActivity.activeFullminus.vo.ActiveFullminusAppletVO;
+import com.fuint.business.marketingActivity.activeNewlyweds.controller.vo.ActiveNewlywedsAppletVO;
+import com.fuint.business.marketingActivity.activeNewlyweds.service.ActiveNewlywedsService;
+import com.fuint.business.marketingActivity.activeRecommend.service.ActiveRecommendService;
+import com.fuint.business.marketingActivity.activeRecommend.vo.ActiveRecommendAppletVO;
 import com.fuint.business.marketingActivity.cardExchange.entity.CardExchangeRecord;
 import com.fuint.business.marketingActivity.cardExchange.service.CardExchangeRecordService;
 import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorable;
@@ -50,6 +61,12 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
     private LJUserGradeService userGradeService;
     @Resource
     private CardFavorableService cardFavorableService;
+    @Resource
+    private ActiveConsumptionService activeConsumptionService;
+    @Resource
+    private ActiveNewlywedsService activeNewlywedsService;
+    @Resource
+    private ActiveRecommendService activeRecommendService;
     /**
      * 分页查询所有
      * @param
@@ -245,4 +262,84 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
         }
         return exchangeFavorableVOArrayList;
     }
+    /**
+     * 分页查询所有数据
+     * @param page
+     * @return
+     */
+    @Override
+    public List<ActiveAppletVO> select() {
+        ArrayList<ActiveAppletVO> activeAppletVOS = new ArrayList<>();
+        //消费有礼活动
+        List<ActiveConsumptionAppletVO> activeConsumptionAppletVOS = activeConsumptionService.selectAllApplet(new ActiveConsumption());
+        if (CollectionUtils.isNotEmpty(activeConsumptionAppletVOS)){
+            ActiveAppletVO activeAppletVO = new ActiveAppletVO();
+            activeAppletVO.setName("消费有礼活动");
+            activeAppletVO.setDes(activeConsumptionAppletVOS.get(0).getActiveDescribe());
+            activeAppletVO.setTime(activeConsumptionAppletVOS.get(0).getTime());
+            activeAppletVOS.add(activeAppletVO);
+        }else {
+            ActiveAppletVO activeAppletVO = new ActiveAppletVO();
+            activeAppletVO.setName("消费有礼活动");
+            activeAppletVO.setDes("活动准备中，敬请期待！");
+            activeAppletVOS.add(activeAppletVO);
+        }
+        //折扣营销
+        List<ActiveDiscountAppletVO> activeDiscountAppletVOS = activeDiscountService.selectAllApplet(new ActiveDiscount());
+        if (CollectionUtils.isNotEmpty(activeDiscountAppletVOS)){
+            ActiveAppletVO activeAppletVO = new ActiveAppletVO();
+            activeAppletVO.setName("折扣营销活动");
+            activeAppletVO.setDes(activeDiscountAppletVOS.get(0).getDiscountActiveDescribe());
+            activeAppletVO.setTime(activeDiscountAppletVOS.get(0).getTime());
+            activeAppletVOS.add(activeAppletVO);
+        }else {
+            ActiveAppletVO activeAppletVO = new ActiveAppletVO();
+            activeAppletVO.setName("折扣营销活动");
+            activeAppletVO.setDes("活动准备中，敬请期待！");
+            activeAppletVOS.add(activeAppletVO);
+        }
+        //满减营销
+        List<ActiveFullminusAppletVO> activeFullminusAppletVOS = activeFullminusService.selectAllApplet(new ActiveFullminus());
+        if (CollectionUtils.isNotEmpty(activeFullminusAppletVOS)){
+            ActiveAppletVO activeAppletVO = new ActiveAppletVO();
+            activeAppletVO.setName("满减营销活动");
+            activeAppletVO.setDes(activeFullminusAppletVOS.get(0).getFullminusActiveDescribe());
+            activeAppletVO.setTime(activeFullminusAppletVOS.get(0).getTime());
+            activeAppletVOS.add(activeAppletVO);
+        }else {
+            ActiveAppletVO activeAppletVO = new ActiveAppletVO();
+            activeAppletVO.setName("满减营销活动");
+            activeAppletVO.setDes("活动准备中，敬请期待！");
+            activeAppletVOS.add(activeAppletVO);
+        }
+        //新人有礼
+        ActiveNewlywedsAppletVO activeNewlywedsAppletVO = activeNewlywedsService.selectApplet();
+        if (ObjectUtils.isNotEmpty(activeNewlywedsAppletVO)){
+            ActiveAppletVO activeAppletVO = new ActiveAppletVO();
+            activeAppletVO.setName("新人有礼活动");
+            activeAppletVO.setDes(activeNewlywedsAppletVO.getNewlywedsActiveDescribe());
+            activeAppletVO.setTime(activeNewlywedsAppletVO.getTime());
+            activeAppletVOS.add(activeAppletVO);
+        }else {
+            ActiveAppletVO activeAppletVO = new ActiveAppletVO();
+            activeAppletVO.setName("新人有礼活动");
+            activeAppletVO.setDes("活动准备中，敬请期待！");
+            activeAppletVOS.add(activeAppletVO);
+        }
+        //推荐有礼
+        ActiveRecommendAppletVO activeRecommendAppletVO = activeRecommendService.selectApplet();
+        if (ObjectUtils.isNotEmpty(activeRecommendAppletVO)){
+            ActiveAppletVO activeAppletVO = new ActiveAppletVO();
+            activeAppletVO.setName("推荐有礼活动");
+            activeAppletVO.setDes(activeRecommendAppletVO.getRecommendActiveDescribeIn());
+            activeAppletVO.setTime("永久有效");
+            activeAppletVOS.add(activeAppletVO);
+        }else {
+            ActiveAppletVO activeAppletVO = new ActiveAppletVO();
+            activeAppletVO.setName("推荐有礼活动");
+            activeAppletVO.setDes("活动准备中，敬请期待！");
+            activeAppletVOS.add(activeAppletVO);
+        }
+        return activeAppletVOS;
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/vo/ActiveAppletVO.java

@@ -0,0 +1,15 @@
+package com.fuint.business.marketingActivity.activeExchange.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ActiveAppletVO implements Serializable {
+    //活动名称
+    private String name;
+    //活动描述
+    private String des;
+    //活动时间
+    private String time;
+}

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.io.Serializable;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -218,6 +219,11 @@ public class ActiveFullminusServiceImpl extends ServiceImpl<ActiveFullminusMappe
         List<ActiveFullminusVO> activeFullminusVOList = page.getRecords();
         List<ActiveFullminusAppletVO> activeFullminusAppletVOList = activeFullminusVOList.stream().map(s -> {
             ActiveFullminusAppletVO activeFullminusAppletVO = new ActiveFullminusAppletVO();
+            //活动时间
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd");
+            String formatSt = dateFormat.format(s.getActiveStartTime());
+            String formatEd = dateFormat.format(s.getActiveEndTime());
+            activeFullminusAppletVO.setTime(formatSt+"-" + formatEd+"");
             //油号名字
             String oilName = "";
             for (Integer id : s.getAdaptOil()) {

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/vo/ActiveFullminusAppletVO.java

@@ -7,4 +7,6 @@ import java.io.Serializable;
 public class ActiveFullminusAppletVO implements Serializable {
     //活动描述
     private String fullminusActiveDescribe;
+    //活动时间
+    private String time;
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/vo/ActiveNewlywedsAppletVO.java

@@ -11,5 +11,7 @@ public class ActiveNewlywedsAppletVO implements Serializable {
     private String point;
     //成长值
     private String growValue;
+    //活动时间
+    private String time;
 
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.io.Serializable;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -220,6 +221,11 @@ public class ActiveNewlywedsServiceImpl extends ServiceImpl<ActiveNewlywedsMappe
         ActiveNewlywedsAppletVO activeNewlywedsAppletVO = new ActiveNewlywedsAppletVO();
         //获取本店铺的推荐有礼活动
         ActiveNewlywedsVO activeNewlywedsVO = getOneById(1);
+        //活动时间
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd");
+        String formatSt = dateFormat.format(activeNewlywedsVO.getActiveStartTime());
+        String formatEd = dateFormat.format(activeNewlywedsVO.getActiveEndTime());
+        activeNewlywedsAppletVO.setTime(formatSt+"-" + formatEd+"");
         //邀请人获得
         if (ObjectUtils.isNotEmpty(activeNewlywedsVO) && ObjectUtils.isNotEmpty(activeNewlywedsVO.getPoints())){
             //积分

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.Serializable;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/vo/ActiveRecommendAppletVO.java

@@ -13,4 +13,6 @@ public class ActiveRecommendAppletVO implements Serializable {
     private String point;
     //成长值
     private String growValue;
+    //活动时间
+    private String time;
 }