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

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

@@ -387,8 +387,10 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
             initCoupon.setRedeemStart(eventAt);
             initCoupon.setRedeemStop(initCoupon.getRedeemStart().plusDays(redeemValidity).withHour(23).withMinute(59).withSecond(59));
         }
+        if (parameter.getBindType() != 2 && parameter.getBindType() != 4) {// 券领取方式[2-积分商品｜4-会员专属]，实际发放至用户时计算有效期
             initCoupon.setEffectAt(eventAt);
             initCoupon.setExpireAt(initCoupon.getEffectAt().plusDays(parameter.getValidity()).withHour(23).withMinute(59).withSecond(59));
+        }
         initCoupon.setOperator(ShiroUtils.getLoginName());
         initCoupon.setCreatedAt(nowTime);
 

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

@@ -296,6 +296,11 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
 
         AbstractRedisUtil redisAdamUtil = redisDataSourceUtil.getRedisAdamUtil();
 
+        if (coupon.getBindType() == 2) {// 券领取方式[2-积分商品]，实际发放至用户时计算有效期
+            coupon.setEffectAt(now);
+            coupon.setExpireAt(coupon.getEffectAt().plusDays(coupon.getValidity()).withHour(23).withMinute(59).withSecond(59));
+        }
+
         // 指定手机号发放券中，会员权益券失效时间duedAt需要同步会员到期时间expiryAt
         Integer exclusively = mgtCoupon.getExclusively();
         boolean isMemberRightsCoupon = exclusively == 1;