+根据新会员开售时间来发放权益;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamUserMemberVo.java

@@ -34,7 +34,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime updatedAt;
 
-    private static final LocalDateTime oldMemberSpotTime = LocalDateTime.parse("2021-12-31 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+    public static final LocalDateTime spotTime = LocalDateTime.parse("2021-12-31 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
     private static final AdamUserMemberVo obj = new AdamUserMemberVo();
 
     public static AdamUserMemberVo getNew() {
@@ -81,6 +81,6 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
         LocalDateTime createdAt = this.getCreatedAt();
         LocalDateTime updatedAt = this.getUpdatedAt();
         // 创建时间在`指定时间`之前，且（更新时间为空或更新时间在`指定时间`之前）
-        return createdAt.isBefore(oldMemberSpotTime) && (null == updatedAt || (updatedAt.isBefore(oldMemberSpotTime)));
+        return createdAt.isBefore(spotTime) && (null == updatedAt || (updatedAt.isBefore(spotTime)));
     }
 }
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -340,16 +340,23 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
             toMqSqls.add(SqlMapping.get("adam_user_info.update_by_member"));
             LinkedList<Object[]> updateUserInfoObjs = this.syncUserInfoProcessing(now, userInfoVo, handleMemberOrderVo);
 
-            // 权益券发放
-            toMqSqls.add(SqlMapping.get("candy_mgt_coupon.add_for_member"));
-            LinkedList<Object[]> initMemberRightsCouponObjs = this.issueMemberRightsCouponProcessing(now, userInfoVo.getMobile(), handleMemberOrderVo.getMemberId());
+            // 根据新会员开售时间发放新权益
+            if (now.isAfter(AdamUserMemberVo.spotTime)) {
+                // 权益券发放
+                toMqSqls.add(SqlMapping.get("candy_mgt_coupon.add_for_member"));
+                LinkedList<Object[]> initMemberRightsCouponObjs = this.issueMemberRightsCouponProcessing(now, userInfoVo.getMobile(), handleMemberOrderVo.getMemberId());
+
+                queueUtils.sendMsgByRedis(
+                        MQConst.AdamQueue.SQL_UMEMBER.getKey(),
+                        SqlMapping.gets(toMqSqls, operationObjs, initMemberOrderObjs, initMemberOrderExtObjs, updateUserInfoObjs, initMemberRightsCouponObjs)
+                );
+            } else {
+                queueUtils.sendMsgByRedis(
+                        MQConst.AdamQueue.SQL_UMEMBER.getKey(),
+                        SqlMapping.gets(toMqSqls, operationObjs, initMemberOrderObjs, initMemberOrderExtObjs, updateUserInfoObjs)
+                );
+            }
 
-            s = System.currentTimeMillis();
-            queueUtils.sendMsgByRedis(
-                    MQConst.AdamQueue.SQL_UMEMBER.getKey(),
-                    SqlMapping.gets(toMqSqls, operationObjs, initMemberOrderObjs, initMemberOrderExtObjs, updateUserInfoObjs, initMemberRightsCouponObjs)
-            );
-            log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
 //            } else {
 //                s = System.currentTimeMillis();
 //                queueUtils.sendMsgByRedis(