~api:券商品业务-发放券标记关联人信息；

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/constant/CandyRedisConst.java

@@ -38,6 +38,15 @@ public class CandyRedisConst {
      * </value>
      */
     public static final String BASIC_COMMON_COUPON = PREFIX.concat("basic:common_coupon");
+    /**
+     * <key>
+     *     candy:basic:user_coupon_assoc:${ucouponId}
+     * </key>
+     * <value>
+     *     com.liquidnet.service.candy.dto.CandyUserCouponAssocDto
+     * </value>
+     */
+    public static final String BASIC_USER_COUPON_ASSOC = PREFIX.concat("basic:user_coupon_assoc:");
     /**
      * 发放券操作人-券类商品下单
      */

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/CandyUserCouponAssocDto.java

+package com.liquidnet.service.candy.dto;
+
+import com.liquidnet.service.candy.entity.CandyUserCouponAssoc;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CandyUserCouponAssocDto implements Serializable, Cloneable {
+    private static final long serialVersionUID = -5500626839150118876L;
+
+    /**
+     * 关联人证件类型：1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证
+     */
+    private Integer idType;
+
+    /**
+     * 关联人姓名
+     */
+    private String idName;
+
+    /**
+     * 关联人证件号码
+     */
+    private String idNo;
+
+    private static final CandyUserCouponAssocDto obj = new CandyUserCouponAssocDto();
+    public static CandyUserCouponAssocDto getNew() {
+        try {
+            return (CandyUserCouponAssocDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new CandyUserCouponAssocDto();
+        }
+    }
+
+    public CandyUserCouponAssocDto copy(CandyUserCouponAssoc userCouponAssoc) {
+        if (null == userCouponAssoc) return this;
+        this.setIdType(userCouponAssoc.getIdType());
+        this.setIdName(userCouponAssoc.getIdName());
+        this.setIdName(userCouponAssoc.getIdNo());
+        return this;
+    }
+}

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/CandyUserCouponBasicDto.java

@@ -61,10 +61,6 @@ public class CandyUserCouponBasicDto implements Serializable, Cloneable {
     /* com.liquidnet.service.candy.entity.CandyCommonCoupon */
     private String ccouponId;
 
-    private Integer idType;
-    private String idName;
-    private String idNo;
-
     private static final CandyUserCouponBasicDto obj = new CandyUserCouponBasicDto();
 
     public static CandyUserCouponBasicDto getNew() {

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

@@ -11,10 +11,7 @@ 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.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.dto.*;
 import com.liquidnet.service.candy.entity.*;
 import com.liquidnet.service.candy.mapper.CandyCouponMapper;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
@@ -389,12 +386,13 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
         AbstractRedisUtil redisCandyUtil = redisDataSourceUtil.getRedisCandyUtil();
         if (!initUserCouponList.isEmpty()) {
             if (platformCandyUserCouponService.saveBatch(initUserCouponList)) {
-                Map<String, CandyUserCouponAssoc> userCouponAssocMap;
                 if (!initUserCouponAssocList.isEmpty()) {
-                    platformCandyUserCouponAssocService.saveBatch(initUserCouponAssocList);
-                    userCouponAssocMap = initUserCouponAssocList.stream().collect(Collectors.toMap(CandyUserCouponAssoc::getUcouponId, t -> t));
-                } else {
-                    userCouponAssocMap = null;
+                    boolean assocSaveFlg = platformCandyUserCouponAssocService.saveBatch(initUserCouponAssocList);
+                    initUserCouponAssocList.forEach(c -> {
+                        CandyUserCouponAssocDto assocDto = CandyUserCouponAssocDto.getNew().copy(c);
+                        boolean assocRdsSetFlg = redisCandyUtil.set(CandyRedisConst.BASIC_USER_COUPON_ASSOC.concat(c.getUcouponId()), assocDto);
+                        log.info("发放券-券类商品-记录关联人信息:[mcouponId={}, ucouponId={},assocSaveFlg={},assocRdsSetFlg={}]", mcouponId, c.getUcouponId(), assocSaveFlg, assocRdsSetFlg);
+                    });
                 }
                 initUserCouponList.forEach(r -> {
                     String uckey = CandyRedisConst.BASIC_USER_COUPON.concat(r.getUid());
@@ -404,17 +402,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
                     if (CollectionUtils.isEmpty(vos)) {
                         vos = new ArrayList<>();
                     }
-                    CandyUserCouponBasicDto userCouponBasicDto = CandyUserCouponBasicDto.getNew().copy(r, coupon, couponRuleDtoList);
-
-                    if (Objects.equals(userCouponBasicDto.getIsTrueName(), 1) && !Objects.isNull(userCouponAssocMap)) {
-                        CandyUserCouponAssoc userCouponAssoc = userCouponAssocMap.get(r.getUcouponId());
-                        if (!Objects.isNull(userCouponAssoc)) {
-                            userCouponBasicDto.setIdType(userCouponAssoc.getIdType());
-                            userCouponBasicDto.setIdName(userCouponAssoc.getIdName());
-                            userCouponBasicDto.setIdNo(userCouponAssoc.getIdNo());
-                        }
-                    }
-                    vos.add(userCouponBasicDto);
+                    vos.add(CandyUserCouponBasicDto.getNew().copy(r, coupon, couponRuleDtoList));
 
                     redisCandyUtil.set(uckey, vos);
                 });