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

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyCouponService.java

@@ -11,14 +11,16 @@ import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.adam.entity.AdamUserMember;
 import com.liquidnet.service.candy.constant.CandyRedisConst;
-import com.liquidnet.service.candy.dto.*;
+import com.liquidnet.service.candy.dto.CandyCommonCouponBasicDto;
+import com.liquidnet.service.candy.dto.CandyCouponCodeDto;
+import com.liquidnet.service.candy.dto.CandyCouponRuleDto;
+import com.liquidnet.service.candy.dto.CandyUserCouponBasicDto;
 import com.liquidnet.service.candy.entity.*;
 import com.liquidnet.service.candy.mapper.CandyCouponMapper;
 import com.liquidnet.service.platform.service.impl.adam.PlatformAdamUserMemberService;
 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.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -56,7 +58,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
 //        String couponInfoDtoKey = CandyRedisConst.BASIC_COUPON_INFO.concat(couponInfoDto.getCouponId());
 //        redisDataSourceUtil.getRedisCandyUtil().set(couponInfoDtoKey, couponInfoDto);
 
-        switch (coupon.getBindType()) {// 领取方式[0-用户输入兑换｜1-发放至用户｜2-积分兑换｜3-发放需领取｜4-会员专属]
+        switch (coupon.getBindType()) {// 领取方式[0-用户输入兑换｜1-发放至用户｜2-积分商品｜3-发放需领取｜4-会员专属]
             case 0:
                 this.processingCouponCode(mgtCoupon, coupon);
                 break;
@@ -166,7 +168,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
             commonCoupon.setExclusive(mgtCoupon.getExclusively());
             commonCoupon.setState(1);
             commonCoupon.setRanged(mgtCoupon.getEventType());
-            commonCoupon.setOperator("system");
+            commonCoupon.setOperator(mgtCoupon.getOperator());
             commonCoupon.setCreatedAt(now);
 
             initCommonCouponList.add(commonCoupon);
@@ -205,7 +207,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
     private void processForAllMember(CandyMgtCoupon mgtCoupon, CandyCoupon coupon, List<CandyCouponRuleDto> couponRuleDtoList) {
         List<CandyUserCoupon> initUserCouponList = new ArrayList<>();
         LocalDateTime now = LocalDateTime.now();
-        LocalDateTime nowEndTime = now.withHour(23).withMinute(59).withSecond(59);
+        LocalDateTime nowEndTime = now.withHour(23).withMinute(59).withSecond(58);
 
         LambdaQueryWrapper<AdamUserMember> queryWrapper = Wrappers.lambdaQuery(AdamUserMember.class).eq(AdamUserMember::getState, 1)
                 .gt(AdamUserMember::getExpiryAt, nowEndTime);
@@ -214,6 +216,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
         log.info("发放券处理中:目标全体会员[总数:{},发放量:{}]", userMemberCount, eventAmt);
 
         String mcouponId = mgtCoupon.getMcouponId();
+        String operator = mgtCoupon.getOperator();
         String couponId = coupon.getCouponId();
         LocalDateTime couponEffectAt = coupon.getEffectAt();
         LocalDateTime couponExpireAt = coupon.getExpireAt();
@@ -247,9 +250,13 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
                     userCoupon.setBindAt(null == couponEffectAt ? now : couponEffectAt);
                     if (isMemberRightsCoupon) {
                         userCoupon.setDuedAt(userMember.getExpiryAt());
-                    } else {
+                    } else if (null != couponExpireAt && couponExpireAt.isAfter(now)) {
                         userCoupon.setDuedAt(couponExpireAt);
+                    } else {
+                        log.warn("发放券处理中:目标全体会员，该券生效日期或失效日期无效[mcouponId:{},couponId:{},effectAt:{},expireAt:{}]", mcouponId, couponId, couponEffectAt, couponExpireAt);
+                        continue;
                     }
+                    userCoupon.setOperator(operator);
                     userCoupon.setCreatedAt(now);
 
                     initUserCouponList.add(userCoupon);
@@ -330,17 +337,16 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
                     userCoupon.setState(1);
 
 //                    userCoupon.setBindAt(couponEffectAt);
+                    userCoupon.setBindAt(null == couponEffectAt ? now : couponEffectAt);
                     if (isMemberRightsCoupon) {
                         AdamUserMemberVo vo = (AdamUserMemberVo) redisAdamUtil.get(AdamRedisConst.INFO_USER_MEMBER.concat(uid));
                         if (null != vo && vo.isActive()) {
-                            userCoupon.setBindAt(now);
                             userCoupon.setDuedAt(vo.getExpiryAt());
                         } else {// 非会员（或无效会员）跳过
                             log.warn("发放券处理中:目标指定手机号，该用户非会员或会员已过期[mcouponId:{},couponId:{},uid:{}]", mcouponId, couponId, uid);
                             continue;
                         }
                     } else if (null != couponExpireAt && couponExpireAt.isAfter(now)) {
-                        userCoupon.setBindAt(null == couponEffectAt ? now : couponEffectAt);
                         userCoupon.setDuedAt(couponExpireAt);
                     } else {
                         log.warn("发放券处理中:目标指定手机号，该券生效日期或失效日期无效[mcouponId:{},couponId:{},effectAt:{},expireAt:{}]", mcouponId, couponId, couponEffectAt, couponExpireAt);