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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyMgtCouponAdminController.java

@@ -312,6 +312,11 @@ public class CandyMgtCouponAdminController extends BaseController {
                 logger.warn("Invalid operation[buildParam.bindType={}]", buildParam.getBindType());
                 return this.error(AjaxResult.Type.WARN, "券领取方式无效");
         }
+
+        if (buildParam.getValidity() < 0 || (buildParam.getExclusively() == 0 && buildParam.getValidity() <= 0)) {
+            return AjaxResult.warn("有效期无效");
+        }
+
         return AjaxResult.success();
     }
 

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

@@ -236,8 +236,9 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
                     userCoupon.setCouponId(coupon.getCouponId());
                     userCoupon.setExclusive(exclusively);
                     userCoupon.setState(1);
-                    userCoupon.setBindAt(coupon.getEffectAt());
+//                    userCoupon.setBindAt(coupon.getEffectAt());
 //                    userCoupon.setDuedAt(coupon.getExpireAt());
+                    userCoupon.setBindAt(now);
                     if (isMemberRightsCoupon) {
                         userCoupon.setDuedAt(userMember.getExpiryAt());
                     } else {
@@ -311,10 +312,11 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
                     userCoupon.setExclusive(exclusively);
                     userCoupon.setState(1);
 
-                    userCoupon.setBindAt(coupon.getEffectAt());
+//                    userCoupon.setBindAt(coupon.getEffectAt());
+                    userCoupon.setBindAt(now);
                     if (isMemberRightsCoupon) {
                         AdamUserMemberVo vo = (AdamUserMemberVo) redisAdamUtil.get(AdamRedisConst.INFO_USER_MEMBER.concat(uid));
-                        userCoupon.setDuedAt(vo.getExpiryAt());
+                        userCoupon.setDuedAt(null != vo && vo.isActive() ? vo.getExpiryAt() : coupon.getExpireAt());
                     } else {
                         userCoupon.setDuedAt(coupon.getExpireAt());
                     }