add: 负责人查询mock

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

@@ -148,9 +148,9 @@ public class ChangeFlowBiz {
         Long parentChangeClassId = changeFlowCreateReq.getParentChangeClassId();
         Long sonChangeClassId = changeFlowCreateReq.getSonChangeClassId();
         // 获取工单负责人
-        GoodsResponseRpc goodsResponseRpc = interiorChangeConfigService.queryCommanderInfo(ChangeCommanderPO.builder()
+        /*GoodsResponseRpc goodsResponseRpc = interiorChangeConfigService.queryCommanderInfo(ChangeCommanderPO.builder()
             .parentChangeClassId(parentChangeClassId).sonChangeClassId(sonChangeClassId).build());
-        Assert.notNull(goodsResponseRpc, "未查询到负责人信息");
+        Assert.notNull(goodsResponseRpc, "未查询到负责人信息");*/
         // 检验是否需要资料
         ChangeConfig changeConfig = changeConfigService.getSonChange(sonChangeClassId);
         Assert.notNull(changeConfig, "二级变更类型不存在");
@@ -180,12 +180,14 @@ public class ChangeFlowBiz {
         FlowDataDTO flowDataDTO = flowService.flowDetail(flowId);
         String nodeId = flowDataDTO.getFlowMeta().getCurrNodeDataList().get(0).getNodeId();
         // 获取负责人信息
-        String changeCommander = goodsResponseRpc.getEmail();
+        // String changeCommander = goodsResponseRpc.getEmail();
+        String changeCommander = appConfig.getTestEmail();
         // 保存工单数据
         ChangeRecord changeRecord = buildChangeRecord(flowId, nodeId, changeFlowCreateReq, changeCommander, uid);
         changeFlowService.saveRecord(changeRecord);
         // 保存变更行动方案记录
-        List<ChangeExecRecord> changeExecRecords = buildChangeExecRecord(changeRecord.getId(), changeExecProject, uid);
+        List<ChangeExecRecord> changeExecRecords = buildChangeExecRecord(changeRecord.getId(), changeExecProject,
+            changeFlowCreateReq, uid);
         changeExecRecords.forEach(exec->changeFlowExecService.saveRecord(exec));
         List<ChangeFile> allFiles = new ArrayList<>();
         // 变更前后图片/视频，非必填
@@ -238,7 +240,7 @@ public class ChangeFlowBiz {
     }
 
     private List<ChangeExecRecord> buildChangeExecRecord(Long changeRecordId,
-        List<ChangeExecConfigReq> changeExecProject, String uid) {
+        List<ChangeExecConfigReq> changeExecProject, ChangeFlowCreateReq changeFlowCreateReq, String uid) {
         return changeExecProject.stream().map(c -> {
             ChangeExecRecord changeExecRecord = new ChangeExecRecord();
             changeExecRecord.setChangeRecordId(changeRecordId);
@@ -246,7 +248,7 @@ public class ChangeFlowBiz {
             changeExecRecord.setChangeExecUserType(c.getChangeExecUserType());
             changeExecRecord.setChangeExecUser(c.getChangeExecUser());
             // 查询对应的负责人
-            interiorChangeConfigService.queryCommanderEmail(c.getChangeExecUserType(), c.getChangeExecUser(), uid);
+            interiorChangeConfigService.queryCommanderEmail(c.getChangeExecUserType(), c.getChangeExecUser(), changeFlowCreateReq, uid);
             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

@@ -2,6 +2,7 @@ package com.netease.mail.yanxuan.change.biz.service;
 
 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;
 
@@ -25,6 +26,6 @@ public interface InteriorChangeConfigService {
      * @param changeExecUser
      * @return
      */
-    CommanderResponse queryCommanderEmail(Integer changeExecUserType, String changeExecUser, 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

@@ -5,14 +5,17 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory;
 import com.netease.mail.yanxuan.change.biz.service.InteriorChangeConfigService;
@@ -24,10 +27,12 @@ import com.netease.mail.yanxuan.change.common.enums.ChangeSubjectEnum;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeConfig;
 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.GoodsPurchaseRpc;
 import com.netease.mail.yanxuan.change.dal.meta.model.rpc.GoodsResponseRpc;
 import com.netease.mail.yanxuan.change.dal.meta.model.rpc.GoodsResponseSqeRpc;
+import com.netease.mail.yanxuan.change.dal.meta.model.vo.ItemVO;
 import com.netease.mail.yanxuan.change.integration.flow.goods.ItemcenterApiRpcService;
 import com.netease.mail.yanxuan.change.integration.flow.goods.PfuApiRpcService;
 import com.netease.mail.yanxuan.change.integration.flow.goods.QcApiRpcService;
@@ -36,10 +41,13 @@ import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierRel
 import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierUserRsp;
 import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * @author WangJiaXiang
  * @date 2022/11/18/018$
  */
+@Slf4j
 @Service
 public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigService {
 
@@ -266,10 +274,13 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
     }
 
     @Override
-    public CommanderResponse queryCommanderEmail(Integer changeExecUserType, String changeExecUser, String uid) {
+    public CommanderResponse queryCommanderEmail(Integer changeExecUserType, String changeExecUser,
+        ChangeFlowCreateReq changeFlowCreateReq, String uid) {
+        log.debug("[queryCommanderEmail] changeExecUserType:{}, changeExecUser:{}, changeFlowCreateReq:{}, uid:{}",
+            changeExecUserType, changeExecUser, changeFlowCreateReq, uid);
         ChangeCommanderEnum changeCommanderEnum = ChangeCommanderEnum.getChangeCommanderEnum(changeExecUserType);
         Assert.notNull(changeCommanderEnum, "变更负责人类型错误");
-        CommanderResponse commanderResponse= new CommanderResponse();
+        CommanderResponse commanderResponse = new CommanderResponse();
         switch (changeCommanderEnum) {
             case COMMANDER_ORIGINATOR:
                 commanderResponse.setEmail(uid);
@@ -278,7 +289,18 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
                 commanderResponse.setEmail(changeExecUser);
                 break;
             case GOODS_ASSOCIATED:
-                // queryGoodsCommander()
+                String changeItems = changeFlowCreateReq.getChangeItems();
+                Assert.isTrue(StringUtils.isNotBlank(changeItems), "变更负责人为商品时，商品列表不可为空");
+                List<ItemVO> itemVOS = JSON.parseArray(changeItems, ItemVO.class);
+                List<Long> itemIdList = itemVOS.stream().map(ItemVO::getItemId).collect(Collectors.toList());
+                GoodsResponseRpc goodsResponseRpc = queryGoodsCommander(changeCommanderEnum, itemIdList, changeExecUser);
+                commanderResponse.setEmail(goodsResponseRpc.getEmail());
+                break;
+            case SUPPLIERS_ASSOCIATED:
+
+                break;
+            default:
+                throw ExceptionFactory.createBiz(ResponseCode.COMMANDER_TYPE_NOT_EXIST, "变更负责人类型错误");
         }
         return null;
     }

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/bean/ResponseCode.java

@@ -55,7 +55,7 @@ public enum ResponseCode {
 
     SEND_RED_PACKED_FAIL(225, "发红包失败"),
 
-    NO_SELECT_GOOD_POWER(226,"没有选商品的资格"),
+    NO_SELECT_GOOD_POWER(226, "没有选商品的资格"),
 
     SEND_GIFT_CARD_FAIL(227, "发福利卡失败"),
 
@@ -98,12 +98,12 @@ public enum ResponseCode {
     LIMIT(407, "LIMIT"),
 
     //该crmId在数据库已存在
-    SAME_CRM_ID(408,"该crmId在数据库已存在"),
+    SAME_CRM_ID(408, "该crmId在数据库已存在"),
 
     // 风控异常, UGC检查失败等
     RISK(411, "RISK"),
 
-    UNIQUE_KEY(412,"唯一索引异常"),
+    UNIQUE_KEY(412, "唯一索引异常"),
 
     //----------5xx-----------
     // 服务器错误: db异常等
@@ -130,47 +130,61 @@ public enum ResponseCode {
     CHANGE_SUBJECT_ERROR(1006, "变更主体类型错误"),
     CHANGE_TYPE_NOT_EXIST(1007, "变更类型不存在"),
     OPERATOR_NOT_EXIST(1008, "操作人不存在"),
-
     CREATE_TODO_ERROR(1009, "传单待办错误"),
+    COMMANDER_TYPE_NOT_EXIST(1010,"变更负责人类型错误"),
 
     /**
      * 无权限
      */
-    NO_PERMISSION(2001, "无权限"),
+    NO_PERMISSION(2001,"无权限") {
+    },
 
-    CAN_NOT_DEL(2002, "不可删除"),
+    CAN_NOT_DEL(2002,"不可删除") {
+    },
 
-    UPDATE_FAIL(2003, "更改失败"),
+    UPDATE_FAIL(2003,"更改失败") {
+    },
 
-    CANT_FOUND(2004, "查询不到"),
+    CANT_FOUND(2004,"查询不到") {
+    },
 
-    SEND_FAIL(2005, "发送失败"),
+    SEND_FAIL(2005,"发送失败") {
+    },
 
-    ACT_END(2006, "活动结束"),
+    ACT_END(2006,"活动结束") {
+    },
 
 
     /**
      * 操作记录不存在
      */
-    OP_RECORD_NOT_EXIST(3000,"opRecord id not existed"),
+    OP_RECORD_NOT_EXIST(3000,"opRecord id not existed") {
+    },
 
     /**
      * 只有操作成功才允许进行验证
      */
-    ONLY_OP_SUCCESS_ALLOWED(3001,"verify only allowed when op success"),
+    ONLY_OP_SUCCESS_ALLOWED(3001,"verify only allowed when op success") {
+    },
 
-    PARAMETER_LENGTH(413, "请检查参数长度"),
+    PARAMETER_LENGTH(413,"请检查参数长度") {
+    },
 
-    EXEC_CONFIG_LENGTH(414, "请检查行动方案配置数量"),
+    EXEC_CONFIG_LENGTH(414,"请检查行动方案配置数量") {
+    },
 
-    PARAMETER_DEFICIENCY(415,"参数缺失请检查参数"),
+    PARAMETER_DEFICIENCY(415,"参数缺失请检查参数") {
+    },
 
-    CHANGE_TYPE_NAME_ONE(4001,"一级变更类型重复,请检查后添加~"),
+    CHANGE_TYPE_NAME_ONE(4001,"一级变更类型重复,请检查后添加~") {
+    },
 
-    CHANGE_TYPE_NAME_TOW(4002,"二级变更类型重复,请检查后添加~");
+    CHANGE_TYPE_NAME_TOW(4002,"二级变更类型重复,请检查后添加~") {
+    };
 
     private int code;
     private String msg;
+
     ResponseCode(int code, String msg) {
         this.code = code;
         this.msg = msg;
@@ -183,4 +197,4 @@ public enum ResponseCode {
     public String getMsg() {
         return msg;
     }
-    }
+}