1、优化抽奖地区返回格式

citu-module-mall/citu-module-promotion-biz/src/main/java/com/citu/module/promotion/controller/admin/luck/vo/prize/LuckPrizeDetailRespVO.java

@@ -24,7 +24,5 @@ public class LuckPrizeDetailRespVO extends LuckPrizeRespVO {
     @Schema(description = "概率")
     private double probability;
 
-    @Schema(description = "子奖品")
-    private Map<String, List<LuckPrizeDetailRespVO>> children;
 
 }

citu-module-mall/citu-module-promotion-biz/src/main/java/com/citu/module/promotion/dal/dataobject/luck/LuckLotteryRecordDO.java

@@ -88,6 +88,9 @@ public class LuckLotteryRecordDO extends BaseDO {
      * sku id
      */
     private Long skuId;
-
+    /**
+     * 意向id
+     */
+    private Long targetId;
 
 }

citu-module-mall/citu-module-promotion-biz/src/main/java/com/citu/module/promotion/service/luck/LuckLotteryRecordServiceImpl.java

@@ -209,6 +209,7 @@ public class LuckLotteryRecordServiceImpl implements LuckLotteryRecordService {
                 .skuId(raffleReqDTO.getSkuId())
                 .lotteryId(luckLottery.getId())
                 .prizeId(selectedPrize.getId())
+                .targetId(luckUserTargetDO.getId())
                 .type(selectedPrize.getType())
                 .extend(selectedPrize.getExtend())
                 .isReceive(false)

citu-module-mall/citu-module-promotion-biz/src/main/java/com/citu/module/promotion/service/luck/LuckPrizeServiceImpl.java

@@ -20,7 +20,6 @@ import com.citu.module.promotion.dal.dataobject.luck.LuckPrizeExtend;
 import com.citu.module.promotion.dal.dataobject.luck.LuckPrizeExtendDO;
 import com.citu.module.promotion.dal.mysql.luck.LuckPrizeExtendMapper;
 import com.citu.module.promotion.dal.mysql.luck.LuckPrizeMapper;
-import com.citu.module.promotion.dal.mysql.luck.LuckUserTargetMapper;
 import com.citu.module.promotion.enums.luck.LuckPrizeTypeEnum;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -339,7 +338,7 @@ public class LuckPrizeServiceImpl implements LuckPrizeService {
             map.putAll(list.stream()
                     .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend() != null)
                     .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend().getProvinceName() != null)
-                    .collect(Collectors.groupingBy(k -> k.getExtend().getProvinceId() + "," + k.getExtend().getProvinceName())));
+                    .collect(Collectors.groupingBy(k -> k.getExtend().getProvinceName())));
         }
 
         if ("city".equals(type)) {
@@ -347,13 +346,13 @@ public class LuckPrizeServiceImpl implements LuckPrizeService {
                 map.putAll(list.stream()
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend() != null)
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend().getCityName() != null)
-                        .collect(Collectors.groupingBy(k -> k.getExtend().getCityId() + "," + k.getExtend().getCityName())));
+                        .collect(Collectors.groupingBy(k -> k.getExtend().getCityName())));
             } else {
                 map.putAll(list.stream()
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend() != null)
                         .filter(luckPrizeDetailRespVO -> parentAreaId.equals(luckPrizeDetailRespVO.getExtend().getProvinceId()))
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend().getCityName() != null)
-                        .collect(Collectors.groupingBy(k -> k.getExtend().getCityId() + "," + k.getExtend().getCityName())));
+                        .collect(Collectors.groupingBy(k -> k.getExtend().getCityName())));
             }
         }
 
@@ -362,13 +361,13 @@ public class LuckPrizeServiceImpl implements LuckPrizeService {
                 map.putAll(list.stream()
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend() != null)
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend().getDistrictName() != null)
-                        .collect(Collectors.groupingBy(k -> k.getExtend().getDistrictId() + "," + k.getExtend().getDistrictName())));
+                        .collect(Collectors.groupingBy(k -> k.getExtend().getDistrictName())));
             } else {
                 map.putAll(list.stream()
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend() != null)
                         .filter(luckPrizeDetailRespVO -> parentAreaId.equals(luckPrizeDetailRespVO.getExtend().getCityId()))
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend().getDistrictName() != null)
-                        .collect(Collectors.groupingBy(k -> k.getExtend().getDistrictId() + "," + k.getExtend().getDistrictName())));
+                        .collect(Collectors.groupingBy(k -> k.getExtend().getDistrictName())));
             }
         }
 
@@ -420,8 +419,8 @@ public class LuckPrizeServiceImpl implements LuckPrizeService {
         List<LuckPrizeDO> customTypeAndCity = list.stream()
                 .filter(prize ->
                         prize.getType().equals(LuckPrizeTypeEnum.CUSTOM.getType())
-                                && prize.getExtend()!= null
-                                && prize.getExtend().getCityName()!= null
+                                && prize.getExtend() != null
+                                && prize.getExtend().getCityName() != null
                                 && cityNames.stream().anyMatch(cityName -> StrUtil.equals(prize.getExtend().getCityName(), cityName))
                                 && prize.getTotal() > 0
                 ).collect(Collectors.toList());

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/user/UserAuthServiceImpl.java

@@ -99,9 +99,9 @@ public class UserAuthServiceImpl implements UserAuthService {
             auth.setFrontUrl(reqVO.getFrontUrl());
             auth.setBackUrl(reqVO.getBackUrl());
             auth.setStatus(EnterpriseAuthStatusEnum.AUDITING.getStatus());
-            IDCardInfo cardInfo =  aipOcrClient.idcard(reqVO.getFrontUrl(), reqVO.getBackUrl());
-            if(null != cardInfo) {
-                fill(cardInfo,auth);
+            IDCardInfo cardInfo = aipOcrClient.idcard(reqVO.getFrontUrl(), reqVO.getBackUrl());
+            if (null != cardInfo) {
+                fill(cardInfo, auth);
             }
 
             mapper.insert(auth);
@@ -110,29 +110,37 @@ public class UserAuthServiceImpl implements UserAuthService {
             entity.setFrontUrl(reqVO.getFrontUrl());
             entity.setBackUrl(reqVO.getBackUrl());
             entity.setStatus(EnterpriseAuthStatusEnum.AUDITING.getStatus());
-            IDCardInfo cardInfo =  aipOcrClient.idcard(reqVO.getFrontUrl(), reqVO.getBackUrl());
-            if(null != cardInfo) {
-                fill(cardInfo,entity);
+            IDCardInfo cardInfo = aipOcrClient.idcard(reqVO.getFrontUrl(), reqVO.getBackUrl());
+            if (null != cardInfo) {
+                fill(cardInfo, entity);
             }
             mapper.updateById(entity);
         }
     }
 
-    /** 填充身份证信息 **/
+    /**
+     * 填充身份证信息
+     **/
     public void fill(IDCardInfo cardInfo, UserAuthDO auth) {
-        if(null != cardInfo) {
+        if (null != cardInfo) {
             auth.setName(cardInfo.getName());
             auth.setGender(cardInfo.getGender());
             auth.setEthnicity(cardInfo.getEthnicity());
-            auth.setBirthDate(cardInfo.getBirthDate().atStartOfDay());
+            if (null != cardInfo.getBirthDate()) {
+                auth.setBirthDate(cardInfo.getBirthDate().atStartOfDay());
+            }
             auth.setAddress(cardInfo.getAddress());
             auth.setIdNumber(cardInfo.getIdNumber());
             auth.setIssuingAuthority(cardInfo.getIssuingAuthority());
-            auth.setIssueDate(cardInfo.getIssueDate().atStartOfDay());
-            auth.setExpiryDate(cardInfo.getExpiryDate().atStartOfDay());
+            if (null != cardInfo.getIssueDate()) {
+                auth.setIssueDate(cardInfo.getIssueDate().atStartOfDay());
+            }
+            if (null != cardInfo.getExpiryDate()) {
+                auth.setExpiryDate(cardInfo.getExpiryDate().atStartOfDay());
+            }
             auth.setStatus(EnterpriseAuthStatusEnum.APPROVED.getStatus());
             auth.setReason(EnterpriseAuthStatusEnum.APPROVED.getName());
-        }else {
+        } else {
             auth.setName(null);
             auth.setGender(null);
             auth.setEthnicity(null);