记得上下班打卡 | git大法好,push需谨慎

Commit 624f533e authored by 张国柄's avatar 张国柄

fix;

parent ad95a2e3
package com.liquidnet.service.platform.controller.candy.task; package com.liquidnet.service.platform.controller.candy.task;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.service.candy.entity.CandyCoupon;
import com.liquidnet.service.candy.constant.CandyRedisConst; import com.liquidnet.service.candy.entity.CandyMgtCoupon;
import com.liquidnet.service.candy.dto.CandyCouponCodeDto; import com.liquidnet.service.platform.service.impl.candy.PlatformCandyCouponService;
import com.liquidnet.service.candy.dto.CandyCouponInfoDto; import com.liquidnet.service.platform.service.impl.candy.PlatformCandyMgtCouponService;
import com.liquidnet.service.candy.dto.CandyCouponRuleDto;
import com.liquidnet.service.candy.dto.CandyUserCouponBasicDto;
import com.liquidnet.service.candy.entity.*;
import com.liquidnet.service.platform.service.impl.adam.dm.DMRdmService;
import com.liquidnet.service.platform.service.impl.candy.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Slf4j @Slf4j
...@@ -36,14 +25,14 @@ public class CandyMgtCouponTaskController { ...@@ -36,14 +25,14 @@ public class CandyMgtCouponTaskController {
@Autowired @Autowired
private PlatformCandyCouponService platformCandyCouponService; private PlatformCandyCouponService platformCandyCouponService;
@PostMapping("issue/coupons") @PutMapping("issue/coupons")
public void issueCoupons() { public ResponseDto<String> issueCoupons() {
LambdaQueryWrapper<CandyMgtCoupon> queryWrapper = Wrappers.lambdaQuery(CandyMgtCoupon.class) LambdaQueryWrapper<CandyMgtCoupon> queryWrapper = Wrappers.lambdaQuery(CandyMgtCoupon.class)
.eq(CandyMgtCoupon::getState, 0) .eq(CandyMgtCoupon::getState, 0)
// TODO: 2021/8/26 时间判断 // TODO: 2021/8/26 时间判断
.orderByAsc(CandyMgtCoupon::getEventAt); .orderByAsc(CandyMgtCoupon::getEventAt);
List<CandyMgtCoupon> list = platformCandyMgtCouponService.list(queryWrapper); List<CandyMgtCoupon> list = platformCandyMgtCouponService.list(queryWrapper);
int taskSize = CollectionUtils.isEmpty(list) ? -1 : list.size(); int taskSize = CollectionUtils.isEmpty(list) ? -1 : list.size(), pl = 0;
log.info("发放券任务总数:{} >>> BEGIN BEGIN BEGIN", taskSize); log.info("发放券任务总数:{} >>> BEGIN BEGIN BEGIN", taskSize);
for (int i = 0; i < taskSize; i++) { for (int i = 0; i < taskSize; i++) {
...@@ -82,11 +71,15 @@ public class CandyMgtCouponTaskController { ...@@ -82,11 +71,15 @@ public class CandyMgtCouponTaskController {
log.info("发放券任务总数:{},任务{}处理{}[mcouponId:{},couType:{},bindType:{},eventAmt:{},eventType:{}]", taskSize, i, (update ? "成功" : "失败"), log.info("发放券任务总数:{},任务{}处理{}[mcouponId:{},couType:{},bindType:{},eventAmt:{},eventType:{}]", taskSize, i, (update ? "成功" : "失败"),
mgtCoupon.getMcouponId(), coupon.getCouType(), coupon.getBindType(), mgtCoupon.getEventAmt(), mgtCoupon.getEventType()); mgtCoupon.getMcouponId(), coupon.getCouType(), coupon.getBindType(), mgtCoupon.getEventAmt(), mgtCoupon.getEventType());
pl++;
} }
} catch (Exception e) { } catch (Exception e) {
log.error("发放券任务总数:{},任务{}处理异常[mcouponId:{}]", taskSize, i, mgtCoupon.getMcouponId(), e); log.error("发放券任务总数:{},任务{}处理异常[mcouponId:{}]", taskSize, i, mgtCoupon.getMcouponId(), e);
} }
} }
log.info("发放券任务总数:{} >>> END END END", taskSize); log.info("发放券任务总数:{},成功处理任务数:{} >>> END END END", taskSize, pl);
return ResponseDto.success(String.format("发放券任务总数:%s,成功处理任务数:%s", taskSize, pl));
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment