caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge pull request !123 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2022-01-27 03:27:43 +00:00 committed by Gitee
commit 15a8800b15
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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++) {
Seckill seckill = new Seckill(i, seckillSetting.getHours(), seckillSetting.getSeckillRule());
seckillService.savePromotions(seckill);
}
}
}

2
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
View File

File diff suppressed because one or more lines are too long

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

@ -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);
}

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

@ -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()));
}
}

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

@ -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;
}
}

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

@ -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();
// seckillVO.setId("10000");
// seckillVO.setStoreIds("132");
// seckillVO.setSeckillApplyStatus(SeckillApplyStatusEnum.NOT_APPLY.name());
// seckillVO.setPromotionStatus(PromotionStatusEnum.NEW.name());
// seckillVO.setApplyEndTime(DateUtil.parse("2021-09-06 14:20:00"));
// seckillVO.setStartTime(DateUtil.parse("2021-09-06 14:22:00"));
// seckillVO.setEndTime(DateUtil.parse("2021-09-06 23:59:00"));
// seckillVO.setHours("15,17,19");
// seckillVO.setPromotionName("Seckill" + seckillVO.getId());
// seckillVO.setSeckillRule("rule" + seckillVO.getId());
// seckillVO.setStoreId("1376433565247471616");
// seckillVO.setStoreName("platform");
//
// Assertions.assertTrue(seckillService.saveSeckill(seckillVO));
// memberService.getUserInfo()
Setting setting = settingService.get(SettingEnum.SECKILL_SETTING.name());
System.out.println(setting);
SeckillSetting seckillSetting = new Gson().fromJson(setting.getSettingValue(), SeckillSetting.class);
System.out.println(seckillSetting);
Seckill seckill = new Seckill(SeckillService.PRE_CREATION, seckillSetting.getHours(), seckillSetting.getSeckillRule());
System.out.println(seckill);
boolean result = seckillService.savePromotions(seckill);
System.out.println(result);
Assertions.assertTrue(result);
}
@Test