!123 修复微信支付配置报错

Merge pull request !123 from OceansDeep/feature/pg

consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java

@@ -59,7 +59,9 @@ public class PromotionEverydayExecute implements EveryDayExecute {
     private void addSeckill() {
         Setting setting = settingService.get(SettingEnum.SECKILL_SETTING.name());
         SeckillSetting seckillSetting = new Gson().fromJson(setting.getSettingValue(), SeckillSetting.class);
-        Seckill seckill = new Seckill(SeckillService.PRE_CREATION, seckillSetting.getHours(), seckillSetting.getSeckillRule());
+        for (int i = 1; i <= SeckillService.PRE_CREATION; i++) {
-        seckillService.savePromotions(seckill);
+            Seckill seckill = new Seckill(i, seckillSetting.getHours(), seckillSetting.getSeckillRule());
+            seckillService.savePromotions(seckill);
+        }
     }
 }

framework/src/main/java/cn/lili/modules/promotion/service/KanjiaActivityService.java

@@ -64,4 +64,11 @@ public interface KanjiaActivityService extends IService<KanjiaActivity> {
     IPage<KanjiaActivity> getForPage(KanjiaActivityQuery kanJiaActivityQuery, PageVO page);
 
 
+    /**
+     * 结束砍价活动
+     *
+     * @param kanjiaId 砍价活动id
+     * @return 是否更新成功
+     */
+    boolean endKanjiaActivity(String kanjiaId);
 }

framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java

@@ -30,11 +30,11 @@ import cn.lili.modules.promotion.service.KanjiaActivityService;
 import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -220,4 +220,16 @@ public class KanjiaActivityServiceImpl extends ServiceImpl<KanJiaActivityMapper,
         return this.page(PageUtil.initPage(page), queryWrapper);
     }
 
+    /**
+     * 结束砍价活动
+     *
+     * @param kanjiaId 砍价活动id
+     * @return 是否更新成功
+     */
+    @Override
+    public boolean endKanjiaActivity(String kanjiaId) {
+        return this.update(new LambdaUpdateWrapper<KanjiaActivity>()
+                .eq(KanjiaActivity::getId, kanjiaId)
+                .set(KanjiaActivity::getStatus, KanJiaStatusEnum.END.name()));
+    }
 }

framework/src/main/java/cn/lili/modules/system/entity/dto/payment/WechatPaymentSetting.java

@@ -1,8 +1,5 @@
 package cn.lili.modules.system.entity.dto.payment;
 
-import cn.lili.common.enums.ResultCode;
-import cn.lili.common.exception.ServiceException;
-import com.alibaba.druid.util.StringUtils;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -52,26 +49,4 @@ public class WechatPaymentSetting {
      * apiv3私钥
      */
     private String apiKey3;
-
-    public String getAppIdValue() {
-
-        if (StringUtils.isEmpty(appId)) {
-            throw new ServiceException(ResultCode.WECHAT_PAYMENT_NOT_SETTING);
-        }
-        return appId;
-    }
-
-    public String getMpAppIdValue() {
-        if (StringUtils.isEmpty(mpAppId)) {
-            throw new ServiceException(ResultCode.WECHAT_PAYMENT_NOT_SETTING);
-        }
-        return mpAppId;
-    }
-
-    public String getServiceAppIdValue() {
-        if (StringUtils.isEmpty(serviceAppId)) {
-            throw new ServiceException(ResultCode.WECHAT_PAYMENT_NOT_SETTING);
-        }
-        return serviceAppId;
-    }
 }

manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java

@@ -1,10 +1,16 @@
 package cn.lili.test.promotion;
 
 import cn.lili.modules.member.service.MemberService;
+import cn.lili.modules.promotion.entity.dos.Seckill;
 import cn.lili.modules.promotion.entity.enums.PromotionsApplyStatusEnum;
 import cn.lili.modules.promotion.entity.vos.SeckillApplyVO;
 import cn.lili.modules.promotion.service.SeckillApplyService;
 import cn.lili.modules.promotion.service.SeckillService;
+import cn.lili.modules.system.entity.dos.Setting;
+import cn.lili.modules.system.entity.dto.SeckillSetting;
+import cn.lili.modules.system.entity.enums.SettingEnum;
+import cn.lili.modules.system.service.SettingService;
+import com.google.gson.Gson;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -32,24 +38,23 @@ class SeckillTest {
     @Autowired
     private MemberService memberService;
 
+    /**
+     * 系统设置
+     */
+    @Autowired
+    private SettingService settingService;
+
     @Test
     void add() {
-//        SeckillVO seckillVO = new SeckillVO();
+        Setting setting = settingService.get(SettingEnum.SECKILL_SETTING.name());
-//        seckillVO.setId("10000");
+        System.out.println(setting);
-//        seckillVO.setStoreIds("132");
+        SeckillSetting seckillSetting = new Gson().fromJson(setting.getSettingValue(), SeckillSetting.class);
-//        seckillVO.setSeckillApplyStatus(SeckillApplyStatusEnum.NOT_APPLY.name());
+        System.out.println(seckillSetting);
-//        seckillVO.setPromotionStatus(PromotionStatusEnum.NEW.name());
+        Seckill seckill = new Seckill(SeckillService.PRE_CREATION, seckillSetting.getHours(), seckillSetting.getSeckillRule());
-//        seckillVO.setApplyEndTime(DateUtil.parse("2021-09-06 14:20:00"));
+        System.out.println(seckill);
-//        seckillVO.setStartTime(DateUtil.parse("2021-09-06 14:22:00"));
+        boolean result = seckillService.savePromotions(seckill);
-//        seckillVO.setEndTime(DateUtil.parse("2021-09-06 23:59:00"));
+        System.out.println(result);
-//        seckillVO.setHours("15,17,19");
+        Assertions.assertTrue(result);
-//        seckillVO.setPromotionName("Seckill" + seckillVO.getId());
-//        seckillVO.setSeckillRule("rule" + seckillVO.getId());
-//        seckillVO.setStoreId("1376433565247471616");
-//        seckillVO.setStoreName("platform");
-//
-//        Assertions.assertTrue(seckillService.saveSeckill(seckillVO));
-//        memberService.getUserInfo()
     }
 
     @Test