fix:会员权益券发放到用户时失效时间设置;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java

@@ -84,7 +84,8 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
         //initCoupon.setRedeemValidity();
         //initCoupon.setRedeemStart();
         //initCoupon.setRedeemStop();
-        //initCoupon.setEffectAt();
+        initCoupon.setEffectAt(nowTime);
+        // 会员权益券失效时间duedAt需要同步会员到期时间expiryAt
         //initCoupon.setExpireAt();
         initCoupon.setOperator(operator);
         initCoupon.setCreatedAt(nowTime);
@@ -151,6 +152,7 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
                     updateCoupon.setValMinus(parameter.getValMinus());
                     updateCoupon.setOverlay(parameter.getOverlay());
                     updateCoupon.setOperator(operator);
+                    updateCoupon.setEffectAt(nowTime);// 会员权益券失效时间duedAt需要同步会员到期时间expiryAt
                     updateCoupon.setUpdatedAt(nowTime);
 
 

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

@@ -7,6 +7,7 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.IDGenerator;
 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.*;
@@ -254,6 +255,8 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
         int eventAmt = mgtCoupon.getEventAmt(), pl = 0, limitSize = eventLimitArr.length;
         log.info("发放券处理中:目标指定手机号[总数:{},发放量:{}]", limitSize, eventAmt);
 
+        // 指定手机号发放券中，会员权益券失效时间duedAt需要同步会员到期时间expiryAt
+        boolean isMemberRightsCoupon = coupon.getExclusive() == 1;
         for (int i = 0; i < eventAmt; i++) {
             for (String r : eventLimitArr) {
                 String uid = (String) redisUtil.get(AdamRedisConst.IDENTITY_MOBILE.concat(r));
@@ -265,8 +268,14 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
                     userCoupon.setUid(uid);
                     userCoupon.setCouponId(coupon.getCouponId());
                     userCoupon.setState(1);
+
                     userCoupon.setBindAt(coupon.getEffectAt());
-                    userCoupon.setDuedAt(coupon.getExpireAt());
+                    if (isMemberRightsCoupon) {
+                        AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(AdamRedisConst.INFO_USER_MEMBER.concat(uid));
+                        userCoupon.setDuedAt(vo.getExpiryAt());
+                    } else {
+                        userCoupon.setDuedAt(coupon.getExpireAt());
+                    }
                     userCoupon.setCreatedAt(now);
 
                     initUserCouponList.add(userCoupon);