fix: 搭赠微调对接参数

cms-modules/cms-order/cms-order-api/src/main/java/com/qs/serve/modules/oms/entity/OmsPromotionGift.java

@@ -72,6 +72,11 @@ public class OmsPromotionGift implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime submitTime;
 
+    /** 申请人 */
+    private String userId;
+    private String userCode;
+    private String userName;
+
     /** 致远表单ID */
     @Length(max = 32,message = "致远表单ID长度不能超过32字")
     private String syFormId;

cms-modules/cms-order/cms-order-api/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsPromotionGiftBo.java

@@ -31,11 +31,6 @@ public class OmsPromotionGiftBo {
     @Length(max = 255,message = "通案标题长度不能超过255字")
     private String giftTitle;
 
-    /** 通案编码 */
-    @NotBlank(message = "通案编码不能为空")
-    @Length(max = 64,message = "通案编码长度不能超过64字")
-    private String giftCode;
-
     /** 生效开始时间 */
     @NotNull(message = "生效开始时间不能为空")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -57,7 +52,6 @@ public class OmsPromotionGiftBo {
     private String explainText;
 
     /** 附件ID */
-    @Length(max = 1024,message = "附件ID长度不能超过1024字")
     @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
     private String[] attachIds;
 

cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsPromotionGiftOptionsServiceImpl.java

@@ -39,6 +39,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author YenHex
@@ -131,7 +132,9 @@ public class OmsPromotionGiftOptionsServiceImpl implements OmsPromotionGiftOptio
 
         LocalDateTime now = LocalDateTime.now();
         String nowString = DateUtils.format(now, DateFormatString.DATE_TIME);
-        String title = gift.getGiftTitle();
+
+        Map<String,List<OmsPromotionGiftScope>> scopeMap = scopeList.stream()
+                .collect(Collectors.groupingBy(OmsPromotionGiftScope::getRegionType));
 
         String cmsUrl = "https://shop.gdjsl.com/pcOrder/#/";
         String saleRegion = "";
@@ -139,6 +142,25 @@ public class OmsPromotionGiftOptionsServiceImpl implements OmsPromotionGiftOptio
         String supplierName = "";
         String supplierCode = "";
 
+        for (String regionType : scopeMap.keySet()) {
+            if ("saleRegion".equals(regionType)){
+                saleRegion = scopeMap.get(regionType).stream()
+                        .map(OmsPromotionGiftScope::getRegionName)
+                        .collect(Collectors.joining(","));
+            }else if ("bizRegion".equals(regionType)){
+                bizRegion = scopeMap.get(regionType).stream()
+                        .map(OmsPromotionGiftScope::getRegionName)
+                        .collect(Collectors.joining(","));
+            }else if ("customer".equals(regionType)){
+                supplierName = scopeMap.get(regionType).stream()
+                        .map(OmsPromotionGiftScope::getRegionName)
+                        .collect(Collectors.joining(","));
+                supplierCode = scopeMap.get(regionType).stream()
+                        .map(OmsPromotionGiftScope::getRegionCode)
+                        .collect(Collectors.joining(","));
+            }
+        }
+
         Map<String, Object> data = new HashMap<>();
         data.put("rowState","00");
         data.put("rowDate", nowString);

cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsPromotionGiftServiceImpl.java

@@ -2,6 +2,7 @@ package com.qs.serve.modules.oms.service.impl;
 import java.time.LocalDateTime;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.consts.CommonValue;
@@ -22,7 +23,10 @@ import com.qs.serve.modules.oms.entity.vo.OmsPromotionGiftSubjectVo;
 import com.qs.serve.modules.oms.entity.vo.OmsPromotionGiftVo;
 import com.qs.serve.modules.oms.mapper.*;
 import com.qs.serve.modules.oms.service.OmsPromotionGiftService;
+import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.entity.SysAttach;
+import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.mapper.SysUserMapper;
 import com.qs.serve.modules.sys.service.SysAttachService;
 import com.qs.serve.modules.tbs.service.TbsCenterDtoService;
 import com.qs.serve.modules.tzc.entity.bo.TzcRebateGoodsParam;
@@ -53,6 +57,7 @@ public class OmsPromotionGiftServiceImpl extends ServiceImpl<OmsPromotionGiftMap
     private final GoodsApplicationService goodsApplicationService;
     private SysAttachService attachService;
     private final BmsSupplierService bmsSupplierService;
+    private final SysUserMapper sysUserMapper;
 
     private OmsPromotionGiftCenterMapper  omsPromotionGiftCenterMapper;
     private OmsPromotionGiftSubjectMapper omsPromotionGiftSubjectMapper;
@@ -141,6 +146,7 @@ public class OmsPromotionGiftServiceImpl extends ServiceImpl<OmsPromotionGiftMap
             Assert.throwEx(entity == null, "数据不存在");
             Assert.throwEx(entity.getGiftStatus() != 0,"搭赠案的状态已更新，请刷新后再试!");
         }
+        SysUser sysUser = sysUserMapper.selectById(AuthContextUtils.getSysUserId());
         List<OmsPromotionGiftSubjectBo> subjectBoList = giftBo.getSubjectList();
         List<OmsPromotionGiftScopeBo> scopeBoList = giftBo.getScopeList();
         List<OmsPromotionGiftItemBo> itemBoList = giftBo.getItemList();
@@ -158,6 +164,12 @@ public class OmsPromotionGiftServiceImpl extends ServiceImpl<OmsPromotionGiftMap
         }
 
         OmsPromotionGift gift = CopierUtil.copy(giftBo,new OmsPromotionGift());
+        if (!isUpdate){
+            gift.setGiftCode("DEV"+IdUtil.getSnowflake().nextIdStr());
+            gift.setUserId(sysUser.getId());
+            gift.setUserCode(sysUser.getCode());
+            gift.setUserName(sysUser.getName());
+        }
         gift.setId(giftBo.getId());
         gift.setGiftStatus(null);
         gift.setSubmitTime(null);