add: 负责人查询mock

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

@@ -73,6 +73,7 @@ import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowDeliverReq;
 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.CommanderResponse;
 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;
@@ -147,10 +148,25 @@ public class ChangeFlowBiz {
         checkSubject(changeFlowCreateReq);
         Long parentChangeClassId = changeFlowCreateReq.getParentChangeClassId();
         Long sonChangeClassId = changeFlowCreateReq.getSonChangeClassId();
+        String changeItems = changeFlowCreateReq.getChangeItems();
+        List<Long> itemIds = null;
+        if (StringUtils.isNotBlank(changeItems)) {
+            List<ItemVO> itemVOS = JSON.parseArray(changeItems, ItemVO.class);
+            itemIds = itemVOS.stream().map(ItemVO::getItemId).collect(Collectors.toList());
+        }
         // 获取工单负责人
-        /*GoodsResponseRpc goodsResponseRpc = interiorChangeConfigService.queryCommanderInfo(ChangeCommanderPO.builder()
-            .parentChangeClassId(parentChangeClassId).sonChangeClassId(sonChangeClassId).build());
-        Assert.notNull(goodsResponseRpc, "未查询到负责人信息");*/
+        GoodsResponseRpc goodsResponseRpc = interiorChangeConfigService.queryCommanderInfo(
+            ChangeCommanderPO.builder().parentChangeClassId(parentChangeClassId).sonChangeClassId(sonChangeClassId)
+                .changeSupplierId(changeFlowCreateReq.getChangeSupplier()).goodsInfos(itemIds).build());
+        // 工单负责人
+        String changeCommander;
+        if (goodsResponseRpc == null) {
+            // todo:获取负责人信息
+            changeCommander = appConfig.getTestEmail();
+        } else {
+            changeCommander = goodsResponseRpc.getEmail();
+        }
+        // Assert.notNull(goodsResponseRpc, "未查询到负责人信息");
         // 检验是否需要资料
         ChangeConfig changeConfig = changeConfigService.getSonChange(sonChangeClassId);
         Assert.notNull(changeConfig, "二级变更类型不存在");
@@ -179,9 +195,6 @@ public class ChangeFlowBiz {
         // 查询工单详情
         FlowDataDTO flowDataDTO = flowService.flowDetail(flowId);
         String nodeId = flowDataDTO.getFlowMeta().getCurrNodeDataList().get(0).getNodeId();
-        // 获取负责人信息
-        // String changeCommander = goodsResponseRpc.getEmail();
-        String changeCommander = appConfig.getTestEmail();
         // 保存工单数据
         ChangeRecord changeRecord = buildChangeRecord(flowId, nodeId, changeFlowCreateReq, changeCommander, uid);
         changeFlowService.saveRecord(changeRecord);
@@ -248,7 +261,11 @@ public class ChangeFlowBiz {
             changeExecRecord.setChangeExecUserType(c.getChangeExecUserType());
             changeExecRecord.setChangeExecUser(c.getChangeExecUser());
             // 查询对应的负责人
-            interiorChangeConfigService.queryCommanderEmail(c.getChangeExecUserType(), c.getChangeExecUser(), changeFlowCreateReq, uid);
+            CommanderResponse commanderResponse = interiorChangeConfigService
+                .queryCommanderEmail(c.getChangeExecUserType(), c.getChangeExecUser(), changeFlowCreateReq, uid);
+            changeExecRecord.setChangeExecUserEmail(
+                StringUtils.isNotBlank(commanderResponse.getEmail()) ? commanderResponse.getEmail()
+                    : appConfig.getTestEmail());
             changeExecRecord.setChangeRiskDesc(c.getChangeRiskDesc());
             changeExecRecord.setChangeExecProject(c.getChangeExecProject());
             changeExecRecord.setChangeChecking(c.getChangeChecking());

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

 package com.netease.mail.yanxuan.change.biz.service;
 
+import java.util.List;
+import java.util.Map;
+
 import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeCommanderPO;
 import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeGoodsPrincipalPO;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCreateReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.rpc.CommanderResponse;
 import com.netease.mail.yanxuan.change.dal.meta.model.rpc.GoodsResponseRpc;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * @author WangJiaXiang
  * @date 2022/11/18/018$
@@ -26,6 +26,7 @@ public interface InteriorChangeConfigService {
      * @param changeExecUser
      * @return
      */
-    CommanderResponse queryCommanderEmail(Integer changeExecUserType, String changeExecUser, ChangeFlowCreateReq changeFlowCreateReq, String uid);
+    CommanderResponse queryCommanderEmail(Integer changeExecUserType, String changeExecUser,
+        ChangeFlowCreateReq changeFlowCreateReq, String uid);
 
 }

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/InteriorChangeConfigServiceImpl.java

@@ -297,7 +297,9 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
                 commanderResponse.setEmail(goodsResponseRpc.getEmail());
                 break;
             case SUPPLIERS_ASSOCIATED:
-
+                GoodsResponseRpc supplierResponseRpc = queryChangeSupplier(changeCommanderEnum,
+                    changeFlowCreateReq.getChangeSupplier(), changeExecUser);
+                commanderResponse.setEmail(supplierResponseRpc.getEmail());
                 break;
             default:
                 throw ExceptionFactory.createBiz(ResponseCode.COMMANDER_TYPE_NOT_EXIST, "变更负责人类型错误");