modify:增加字段返回

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -25,6 +25,7 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import com.netease.mail.yanxuan.change.dal.meta.model.vo.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -80,14 +81,6 @@ import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowFile;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowListQueryReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowSubmitReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.rpc.GoodsResponseRpc;
-import com.netease.mail.yanxuan.change.dal.meta.model.vo.BasicChangeFlowVO;
-import com.netease.mail.yanxuan.change.dal.meta.model.vo.CategoryInfoVO;
-import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowExecVO;
-import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowListVO;
-import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowVO;
-import com.netease.mail.yanxuan.change.dal.meta.model.vo.ItemBasicInfoVO;
-import com.netease.mail.yanxuan.change.dal.meta.model.vo.ItemVO;
-import com.netease.mail.yanxuan.change.dal.meta.model.vo.PageVO;
 import com.netease.mail.yanxuan.change.integration.email.enums.EmailTemplateEnum;
 import com.netease.mail.yanxuan.change.integration.email.service.IEmailService;
 import com.netease.mail.yanxuan.change.integration.excel.ChangeFlowExcelDTO;
@@ -918,8 +911,19 @@ public class ChangeFlowBiz {
         changeFlowVO.setChangeProfit(changeRecord.getChangeProfit());
         changeFlowVO.setChangeProfitDesc(changeRecord.getChangeProfitDesc());
         String itemJsonStr = changeRecord.getChangeItem();
+        String changeSkuJson = changeRecord.getChangeSku();
         if (StringUtils.isNotBlank(itemJsonStr)) {
             List<ItemVO> itemList = JSON.parseArray(itemJsonStr, ItemVO.class);
+            List<ItemSkuVO> itemSkuVOS = new ArrayList<>();
+            if (StringUtils.isNotBlank(changeSkuJson)) {
+                itemSkuVOS.addAll(JSON.parseArray(changeSkuJson, ItemSkuVO.class));
+            }
+            itemList.forEach(i -> {
+                Optional<ItemSkuVO> anySkuInfo = itemSkuVOS.stream().filter(s -> s.getItemId().equals(i.getItemId())).findAny();
+                if (anySkuInfo.isPresent()) {
+                    i.setSkuIds(anySkuInfo.get().getSkuId());
+                }
+            });
             changeFlowVO.setChangeItems(itemList);
             // 变更执行/结果确认/完结节点，展示变更商品基础信息
             String flowNode = changeRecord.getFlowNode();
@@ -1080,7 +1084,19 @@ public class ChangeFlowBiz {
                 changeFlowVO.setChangeCommander(c.getChangeCommander());
                 String itemJsonStr = c.getChangeItem();
                 if (StringUtils.isNotBlank(itemJsonStr)) {
-                    changeFlowVO.setChangeItems(JSON.parseArray(itemJsonStr, ItemVO.class));
+                    List<ItemVO> itemVOS = JSON.parseArray(itemJsonStr, ItemVO.class);
+                    String changeSkuStr = c.getChangeSku();
+                    if (StringUtils.isNotBlank(changeSkuStr)) {
+                        List<ItemSkuVO> itemSkuVOS = JSON.parseArray(changeSkuStr, ItemSkuVO.class);
+                        itemVOS.forEach(i -> {
+                            Optional<ItemSkuVO> anySkuInfo = itemSkuVOS.stream()
+                                    .filter(s -> s.getItemId().equals(i.getItemId())).findAny();
+                            if (anySkuInfo.isPresent()) {
+                                i.setSkuIds(anySkuInfo.get().getSkuId());
+                            }
+                        });
+                    }
+                    changeFlowVO.setChangeItems(itemVOS);
                 }
                 changeFlowVO.setChangeSupplier(c.getChangeSupplier());
                 changeFlowVO.setChangeState(c.getState() == 3 ? ChangeStatusEnum.IN.getStatus() : c.getState());

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/vo/ItemSkuVO.java

+package com.netease.mail.yanxuan.change.dal.meta.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ItemSkuVO {
+
+    private Long itemId;
+
+    private List<String> skuId;
+}

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/vo/ItemVO.java

@@ -8,6 +8,8 @@ package com.netease.mail.yanxuan.change.dal.meta.model.vo;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author zcwang
  * @Date 2022/11/21
@@ -24,4 +26,9 @@ public class ItemVO {
      * 商品名
      */
     private String itemName;
+
+    /**
+     * 商品sku
+     */
+    private List<String> skuIds;
 }
\ No newline at end of file