Merge branch 'feature-changeFlow-221110' of…

Merge branch 'feature-changeFlow-221110' of https://yxwbgit.mail.netease.com/yx-qc-change-flow/yanxuan-qc-change-system into feature-changeFlow-221110

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

@@ -47,6 +47,7 @@ import com.netease.mail.yanxuan.change.biz.service.rpc.FlowService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.ItemService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.IusService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.SupplierSendService;
+import com.netease.mail.yanxuan.change.biz.service.rpc.SupplierService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.TodoService;
 import com.netease.mail.yanxuan.change.common.bean.CommonConstants;
 import com.netease.mail.yanxuan.change.common.bean.RequestLocalBean;
@@ -95,6 +96,7 @@ import com.netease.mail.yanxuan.change.integration.flow.ius.IusRpcService;
 import com.netease.mail.yanxuan.change.integration.flow.ius.req.IusDepartmentReq;
 import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.IusUserInfoRsp;
 import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.SecondaryDepartments;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierSimpleRsp;
 import com.netease.mail.yanxuan.change.integration.item.SimplePhyCateGoryResultCo;
 import com.netease.mail.yanxuan.change.integration.item.meta.SpuTO;
 import com.netease.mail.yanxuan.change.integration.item.param.BatchQuerySpuInfoParam;
@@ -166,6 +168,9 @@ public class ChangeFlowBiz {
     @Autowired
     private SupplierSendService sendSupplierEmail;
 
+    @Autowired
+    private SupplierService supplierService;
+
     public String createAndSubmit(ChangeFlowCreateReq changeFlowCreateReq) {
         String uid = RequestLocalBean.getUid();
         String name = RequestLocalBean.getName();
@@ -905,7 +910,15 @@ public class ChangeFlowBiz {
         changeFlowVO.setChangeLevel(changeRecord.getChangeLevel());
         changeFlowVO.setChangeDepartment(changeRecord.getChangeDepartment());
         changeFlowVO.setChangeCommander(changeRecord.getChangeCommander());
-        changeFlowVO.setChangeSupplier(changeRecord.getChangeSupplier());
+        String changeSupplier = changeRecord.getChangeSupplier();
+        if (StringUtils.isNotBlank(changeSupplier)) {
+            List<SupplierSimpleRsp> supplierSimple = supplierService.getSupplierName(changeSupplier);
+            if (CollectionUtils.isNotEmpty(supplierSimple)) {
+                SupplierSimpleRsp supplier = supplierSimple.get(0);
+                changeSupplier = supplier.getSupplierId() + supplier.getSupplierName();
+            }
+        }
+        changeFlowVO.setChangeSupplier(changeSupplier);
         changeFlowVO.setChangeReason(changeRecord.getChangeReason());
         changeFlowVO.setChangeContent(changeRecord.getChangeContent());
         changeFlowVO.setChangeRiskDesc(changeRecord.getChangeRiskDesc());

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

+/**
+ * @(#)SupplierService.java, 2022/12/15.
+ * <p/>
+ * Copyright 2022 Netease, Inc. All rights reserved.
+ * NETEASE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ */
+package com.netease.mail.yanxuan.change.biz.service.rpc;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.alibaba.fastjson.JSON;
+import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierSendService;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierSearchRemoteReq;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierSimpleRsp;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Author zcwang
+ * @Date 2022/12/15
+ */
+@Component
+@Slf4j
+public class SupplierService {
+
+    @Autowired
+    private FlowRpcSupplierSendService supplierSendService;
+
+    public List<SupplierSimpleRsp> getSupplierName(String supplierUid) {
+        log.info("[getSupplierName] request of query={}", supplierUid);
+        AjaxResult<List<SupplierSimpleRsp>> response = supplierSendService.queryByConditionForQc(
+                SupplierSearchRemoteReq.builder().limitSupplierIdList(Collections.singletonList(supplierUid)).build());
+        log.info("[getSupplierName] response of query={}", JSON.toJSONString(response));
+        if (Boolean.TRUE.equals(response.isSuccess())) {
+            return response.getData();
+        }
+        log.error("[op:getSupplierName] getSupplierName failed, query={}, errMsg={}", supplierUid,
+                response.getMsg());
+        return Collections.emptyList();
+    }
+}
\ No newline at end of file

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/supplier/FlowRpcSupplierSendService.java

 package com.netease.mail.yanxuan.change.integration.flow.supplier;
 
+import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
 import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierGoodsInfoReq;
 import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierSearchRemoteReq;
 import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierSendEmailReq;
@@ -41,7 +42,7 @@ public interface FlowRpcSupplierSendService {
      * 供应商模糊查询
      */
     @PostMapping("/api/supplier/queryByConditionForQc.json")
-    AjaxResponse<List<SupplierSimpleRsp>> queryByConditionForQc(@RequestBody SupplierSearchRemoteReq req);
+    AjaxResult<List<SupplierSimpleRsp>> queryByConditionForQc(@RequestBody SupplierSearchRemoteReq req);
 
     /**
      * 查询供应商+商品对应的跟进采购  ?有存疑参数不对

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/supplier/req/SupplierSearchRemoteReq.java

 package com.netease.mail.yanxuan.change.integration.flow.supplier.req;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
@@ -9,6 +12,9 @@ import java.util.List;
  * @date 2022/12/1/001$
  */
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class SupplierSearchRemoteReq {
 
     private List<Integer> coopStateList;