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

Merge branch 'Bulbasaur' of gitee.com:beijing_hongye_huicheng/lilishop into Bulbasaur

Browse Source
This commit is contained in:
Chopper 2021-06-21 11:55:41 +08:00
commit 1943f0ddea
7 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponActivityExecute.java
View File

@ -51,7 +51,6 @@ public class CouponActivityExecute implements EveryMinuteExecute {
//修改精准发券优惠券活动状态
couponActivityService.update(new LambdaUpdateWrapper<CouponActivity>()
.eq(CouponActivity::getCouponActivityType, CouponActivityTypeEnum.SPECIFY.name())
.eq(CouponActivity::getId,couponActivity.getId())
.set(CouponActivity::getPromotionStatus,PromotionStatusEnum.END.name()));
}
@ -67,7 +66,7 @@ public class CouponActivityExecute implements EveryMinuteExecute {
lambdaUpdateWrapper.eq(CouponActivity::getCouponActivityType, CouponActivityTypeEnum.REGISTERED.name())
.eq(CouponActivity::getPromotionStatus, PromotionStatusEnum.NEW.name())
.le(CouponActivity::getStartTime, DateUtil.date())
.set(CouponActivity::getActivityScope,PromotionStatusEnum.START.name());
.set(CouponActivity::getPromotionStatus,PromotionStatusEnum.START.name());
couponActivityService.update(lambdaUpdateWrapper);
//关闭注册赠券优惠券活动
@ -75,7 +74,7 @@ public class CouponActivityExecute implements EveryMinuteExecute {
endWrapper.eq(CouponActivity::getCouponActivityType, CouponActivityTypeEnum.REGISTERED.name())
.eq(CouponActivity::getPromotionStatus, PromotionStatusEnum.START.name())
.le(CouponActivity::getEndTime, DateUtil.date())
.set(CouponActivity::getActivityScope,PromotionStatusEnum.END.name());
.set(CouponActivity::getPromotionStatus,PromotionStatusEnum.END.name());
couponActivityService.update(endWrapper);
}
}

1
consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java
View File

@ -39,7 +39,6 @@ public class GoodsExecute implements EveryDayExecute {
new QueryWrapper<MemberEvaluation>()
.between("create_time", DateUtil.yesterday(), new DateTime()));
System.out.println("评论数量" + list.size());
for (Map<String, Object> map : list) {
goodsMapper.addGoodsCommentNum(Integer.parseInt(map.get("num").toString()), map.get("goods_id").toString());
}

1
consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java
View File

@ -186,7 +186,6 @@ class PageViewStatistics {
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0);
this.date = calendar.getTime();
System.out.println(DateUtil.toString(date,DateUtil.STANDARD_FORMAT));
}
}

2
framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java
View File

@ -202,8 +202,6 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
public void addSmsSign(SmsSign smsSign) throws Exception {
//设置参数添加短信签名
com.aliyun.dysmsapi20170525.Client client = this.createClient();
System.out.println(smsSign.getBusinessLicense().substring(smsSign.getBusinessLicense().lastIndexOf(".") + 1));
System.out.println(smsSign.getLicense().substring(smsSign.getLicense().lastIndexOf(".")));
//营业执照
AddSmsSignRequest.AddSmsSignRequestSignFileList signFileList0 = new AddSmsSignRequest.AddSmsSignRequestSignFileList()
.setFileContents(Base64Utils.encode(smsSign.getBusinessLicense()))

3
framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java
View File

@ -70,9 +70,6 @@ public class SystemLogServiceImpl implements SystemLogService {
}
//时间有效性判定
if (searchVo.getConvertStartDate() != null && searchVo.getConvertEndDate() != null) {
System.out.println(DateUtil.toString(searchVo.getConvertStartDate(), DateUtil.STANDARD_FORMAT));
System.out.println(DateUtil.toString(searchVo.getConvertEndDate(), DateUtil.STANDARD_FORMAT));
//大于方法
Criteria gt = Criteria.where("createTime").gt(searchVo.getConvertStartDate());
//小于方法

29
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
View File

@ -136,6 +136,10 @@ public class CouponActivityServiceImpl extends ServiceImpl<CouponActivityMapper,
/**
* 发送优惠券
* 1.循环优惠券列表
* 2.判断优惠券每个会员发送数量
* 3.循环会员列表，发送优惠券
* 4.记录优惠券发送数量
*
* @param memberList 用户列表
* @param couponActivityItems 优惠券列表
@ -148,15 +152,16 @@ public class CouponActivityServiceImpl extends ServiceImpl<CouponActivityMapper,
//判断优惠券是否存在
if (coupon != null) {
List<MemberCoupon> memberCouponList = new LinkedList<>();
//循环会员列表，添加优惠券
MemberCoupon memberCoupon = new MemberCoupon(coupon);
for (Map<String, Object> map : memberList) {
memberCoupon.setMemberId(map.get("id").toString());
memberCoupon.setMemberName(map.get("nick_name").toString());
memberCoupon.setMemberCouponStatus(MemberCouponStatusEnum.NEW.name());
memberCoupon.setIsPlatform(coupon.getStoreId().equals("platform"));
//循环优惠券的领取数量
for (int i = 1; i <= couponActivityItem.getNum(); i++) {
//循环优惠券的领取数量
int j=couponActivityItem.getNum();
for (int i = 1; i <= j; i++) {
//循环会员列表，添加优惠券
for (Map<String, Object> map : memberList) {
MemberCoupon memberCoupon = new MemberCoupon(coupon);
memberCoupon.setMemberId(map.get("id").toString());
memberCoupon.setMemberName(map.get("nick_name").toString());
memberCoupon.setMemberCouponStatus(MemberCouponStatusEnum.NEW.name());
memberCoupon.setIsPlatform(coupon.getStoreId().equals("platform"));
memberCouponList.add(memberCoupon);
}
}
@ -216,12 +221,10 @@ public class CouponActivityServiceImpl extends ServiceImpl<CouponActivityMapper,
//判断优惠券的发送范围，获取会员列表
if (couponActivity.getActivityScope().equals("ALL")) {
return memberService.listMaps(new QueryWrapper<Member>()
.select("id")
.select("nick_name"));
.select("id,nick_name"));
} else {
return memberService.listMaps(new QueryWrapper<Member>()
.select("id")
.select("nick_name")
.select("id,nick_name")
.in("id", couponActivity.getActivityScopeInfo()));
}
}

34
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
View File

@ -89,14 +89,18 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
this.updateScopePromotionGoods(coupon);
// 保存到MONGO中
this.mongoTemplate.save(coupon);
PromotionMessage promotionMessage = new PromotionMessage(coupon.getId(), PromotionTypeEnum.COUPON.name(), PromotionStatusEnum.START.name(), coupon.getStartTime(), coupon.getEndTime());
TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR,
coupon.getStartTime().getTime(),
promotionMessage,
DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
rocketmqCustomProperties.getPromotionTopic());
// 发送促销活动开始的延时任务
this.timeTrigger.addDelay(timeTriggerMsg);
//如果优惠券是固定时间则添加延时任务
if (coupon.getRangeDayType().equals(CouponRangeDayEnum.FIXEDTIME.name())) {
PromotionMessage promotionMessage = new PromotionMessage(coupon.getId(), PromotionTypeEnum.COUPON.name(), PromotionStatusEnum.START.name(), coupon.getStartTime(), coupon.getEndTime());
TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR,
coupon.getStartTime().getTime(),
promotionMessage,
DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
rocketmqCustomProperties.getPromotionTopic());
// 发送促销活动开始的延时任务
this.timeTrigger.addDelay(timeTriggerMsg);
}
return coupon;
}
@ -278,12 +282,14 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
throw new ServiceException("优惠券折扣必须小于10且大于0");
}
long nowTime = DateUtil.getDateline() * 1000;
if (coupon.getStartTime().getTime() < nowTime && coupon.getEndTime().getTime() > nowTime) {
throw new ServiceException("活动时间小于当前时间，不能进行编辑删除操作");
}
if (coupon.getRangeDayType().equals(CouponRangeDayEnum.FIXEDTIME.name())) {
long nowTime = DateUtil.getDateline() * 1000;
if (coupon.getStartTime().getTime() < nowTime && coupon.getEndTime().getTime() > nowTime) {
throw new ServiceException("活动时间小于当前时间，不能进行编辑删除操作");
}
PromotionTools.checkPromotionTime(coupon.getStartTime().getTime(), coupon.getEndTime().getTime());
PromotionTools.checkPromotionTime(coupon.getStartTime().getTime(), coupon.getEndTime().getTime());
}
this.checkCouponScope(coupon);
//对状态的处理.如果未传递状态则需要 根据当前时间来确认优惠券状态
@ -326,7 +332,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
* @param coupon 优惠券参数
*/
private void promotionStatusEmpty(CouponVO coupon) {
if (StringUtils.isEmpty(coupon.getPromotionStatus())) {
if (StringUtils.isEmpty(coupon.getPromotionStatus()) && coupon.getRangeDayType().equals(CouponRangeDayEnum.FIXEDTIME.name())) {
//格式时间
long startTme = coupon.getStartTime().getTime() / 1000;
long endTime = coupon.getEndTime().getTime() / 1000;