~api:券商品业务-完善订单关联人信息展示脱敏；

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsSkuInfoVo.java

@@ -138,7 +138,7 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     private String declareAt;
 
     /**
-     * ---------------------------- 券类商品-代金券属性 ----------------------------
+     * ---------------------------- 以下为券类商品-代金券属性 ----------------------------
      */
     @ApiModelProperty(position = 33, value = "是否实名[0-否｜1-是，表示该商品需要实名关联]")
     private Integer isTrueName;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinOrderSkuVo.java

 package com.liquidnet.service.goblin.dto.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.goblin.entity.GoblinOrderSku;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,11 +9,8 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
-import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
-
 /**
  * <p>
  * 订单单品表
@@ -78,6 +72,10 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "erp-仓库号")
     private String erpWarehouseNo;
 
+    /**
+     * ---------------------------- 以下为券类商品-代金券属性 ----------------------------
+     */
+
     @ApiModelProperty(value = "商品类型[0-常规｜1-数字藏品｜2-券类商品]")
     private int skuType;
     @ApiModelProperty(value = "是否实名[0-否｜1-是，表示该商品需要实名关联]，这里默认0")
@@ -89,6 +87,10 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "关联人证件号码")
     private String idNo;
 
+    /**
+     * ---------------------------- 以上为券类商品-代金券属性 ----------------------------
+     */
+
     public String getPushTime() {
         return pushTime == null ? "" : pushTime;
     }
@@ -133,4 +135,14 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
             return new GoblinOrderSkuVo();
         }
     }
+
+    /**
+     * 脱敏处理-关联人信息
+     *
+     * @return AdamUserIdentityVo
+     */
+    public void desensitize() {
+        this.setIdNo(SensitizeUtil.custom(this.getIdNo(), 3, 4));
+        this.setIdName(SensitizeUtil.custom(this.getIdName(), 0, 1));
+    }
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreOrderListSkuVo.java

@@ -32,6 +32,24 @@ public class GoblinStoreOrderListSkuVo implements Cloneable {
     @ApiModelProperty(value = "优惠价")
     private BigDecimal priceVoucher;
 
+    /**
+     * ---------------------------- 以下为券类商品-代金券属性 ----------------------------
+     */
+
+    @ApiModelProperty(value = "商品类型[0-常规｜1-数字藏品｜2-券类商品]")
+    private int skuType;
+    @ApiModelProperty(value = "是否实名[0-否｜1-是，表示该商品需要实名关联]，这里默认0")
+    private int isTrueName;
+    @ApiModelProperty(value = "关联人证件类型：1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证")
+    private Integer idType;
+    @ApiModelProperty(value = "关联人姓名")
+    private String idName;
+    @ApiModelProperty(value = "关联人证件号码")
+    private String idNo;
+
+    /**
+     * ---------------------------- 以上为券类商品-代金券属性 ----------------------------
+     */
     private static final GoblinStoreOrderListSkuVo obj = new GoblinStoreOrderListSkuVo();
 
     public static GoblinStoreOrderListSkuVo getNew() {

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderAppServiceImpl.java

@@ -119,6 +119,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
         List<GoblinOrderSkuVo> skuVos = ObjectUtil.getGoblinOrderSkuVoArrayList();
         for (String orderSkuId : orderVo.getOrderSkuVoIds()) {
             GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuId);
+            orderSkuVo.desensitize();// 商品订单页面展示-关联人信息脱敏
             skuVos.add(orderSkuVo);
         }
         LocalDateTime canRefundTime = getCanRefundTime(orderVo);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreBackOrderServiceImpl.java

@@ -105,6 +105,7 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
         for (String orderSkuVoId : orderVo.getOrderSkuVoIds()) {
             GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuVoId);
             orderSkuVo.setStatus(vo.getStatus());
+            orderSkuVo.desensitize();// 商品订单页面展示-关联人信息脱敏
             orderSkuVoList.add(orderSkuVo);
         }
         vo.setOrderSkuVoList(orderSkuVoList);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreOrderServiceImpl.java

@@ -203,6 +203,13 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             itemSkuVo.setStatus(orderSkuVo.getStatus());
             itemSkuVo.setPrice(orderSkuVo.getSkuPrice());
             itemSkuVo.setPriceVoucher(orderSkuVo.getPriceVoucher());
+
+            orderSkuVo.desensitize();// 商品订单页面展示-关联人信息脱敏
+            itemSkuVo.setSkuType(orderSkuVo.getSkuType());
+            itemSkuVo.setIsTrueName(orderSkuVo.getIsTrueName());
+            itemSkuVo.setIdType(orderSkuVo.getIdType());
+            itemSkuVo.setIdName(orderSkuVo.getIdName());
+            itemSkuVo.setIdNo(orderSkuVo.getIdNo());
             orderListSkuVos.add(itemSkuVo);
         }
         vo.setStoreOrderListSkuVoList(orderListSkuVos);