Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev_member_voucher_refund

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/candy/task/CandyMgtCouponTaskController.java

@@ -46,14 +46,15 @@ public class CandyMgtCouponTaskController {
         int taskSize = CollectionUtils.isEmpty(list) ? -1 : list.size();
         log.info("发放券任务总数:{} >>> BEGIN BEGIN BEGIN", taskSize);
 
-        LambdaQueryWrapper<CandyCoupon> couponQueryWrapper = Wrappers.lambdaQuery(CandyCoupon.class).eq(CandyCoupon::getState, 1);
         for (int i = 0; i < taskSize; i++) {
             CandyMgtCoupon mgtCoupon = list.get(i);
             mgtCoupon.setState(9);
 
             try {
                 if (platformCandyMgtCouponService.updateById(mgtCoupon)) {
-                    CandyCoupon coupon = platformCandyCouponService.getOne(couponQueryWrapper.eq(CandyCoupon::getCouponId, mgtCoupon.getCouponId()));
+                    LambdaQueryWrapper<CandyCoupon> couponLambdaQueryWrapper = Wrappers.lambdaQuery(CandyCoupon.class)
+                            .eq(CandyCoupon::getState, 1).eq(CandyCoupon::getCouponId, mgtCoupon.getCouponId());
+                    CandyCoupon coupon = platformCandyCouponService.getOne(couponLambdaQueryWrapper);
 
                     log.info("发放券任务总数:{},任务{}开始处理[mcouponId:{},couType:{},bindType:{},eventAmt:{},eventType:{}]", taskSize, i,
                             mgtCoupon.getMcouponId(), coupon.getCouType(), coupon.getBindType(), mgtCoupon.getEventAmt(), mgtCoupon.getEventType());