Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

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

@@ -213,12 +213,12 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
         }
         req.setSupplierIdList(supplierIdList);
         //进行参数解析
-        AjaxResponse<List<SupplierUserRsp>> listAjaxResponse = supplierSendService.querySupplierRelatedUser(req);
-        List<SupplierUserRsp> data = listAjaxResponse.getData();
-        if (data != null){
+        //AjaxResponse<List<SupplierUserRsp>> listAjaxResponse = supplierSendService.querySupplierRelatedUser(req);
+        //List<SupplierUserRsp> data = listAjaxResponse.getData();
+       // if (data != null){
             // 返回结果有问题暂时不动
             //rpc.setSupplierId();
-        }
+       // }
         return null;
     }
 

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

+package com.netease.mail.yanxuan.change.integration.flow.supplier;
+
+import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierRelatedUserReq;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierUserRsp;
+import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
+import com.netease.yanxuan.missa.client.annotation.MissaClient;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author WangJiaXiang
+ * @date 2022/12/8/008$
+ */
+@Service
+@MissaClient(serviceCode = "yanxuan-supplier-ms1")
+public interface FlowRpcSupplierInfoService {
+
+    /**
+     * 查询供应商关联角色
+     */
+    @PostMapping("/api/supplier/batchGetSupplierRelatedUser.json")
+    AjaxResponse<List<SupplierUserRsp>> querySupplierRelatedUser(@RequestBody SupplierRelatedUserReq req);
+
+
+
+
+}

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.integration.flow.supplier.req.SupplierGoodsInfoReq;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierRelatedUserReq;
 import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierSearchRemoteReq;
 import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierSendEmailReq;
 import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierGoodsInfoRsp;
 import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierSimpleRsp;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierUserRsp;
 import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
 import com.netease.yanxuan.missa.client.annotation.MissaClient;
 import org.springframework.stereotype.Service;
@@ -38,12 +36,6 @@ public interface FlowRpcSupplierSendService {
     @PostMapping("/api/initiateProject/source/getBatchRelatedSupplier.json")
     String queryGoodsPurchase(@RequestBody List<Long> itemIds);
 
-    /**
-     * 查询供应商关联角色
-     */
-    @PostMapping("/api/supplier/batchGetSupplierRelatedUser.json")
-    AjaxResponse<List<SupplierUserRsp>> querySupplierRelatedUser(@RequestBody SupplierRelatedUserReq req);
-
 
     /**
      * 供应商模糊查询

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/TestController.java

@@ -6,12 +6,13 @@
  */
 package com.netease.mail.yanxuan.change.web.controller;
 
+import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierInfoService;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierRelatedUserReq;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierUserRsp;
+import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.alibaba.fastjson.JSON;
 import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory;
@@ -26,6 +27,8 @@ import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
 
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.List;
+
 /**
  * @Author zcwang
  * @Date 2022/11/28
@@ -75,4 +78,11 @@ public class TestController {
         return AjaxResult.success(RequestLocalBean.getUid());
     }
 
+    @Autowired
+    private FlowRpcSupplierInfoService supplierInfoService;
+
+    @PostMapping("/test")
+    public AjaxResponse<List<SupplierUserRsp>> test(@RequestBody SupplierRelatedUserReq req) {
+        return supplierInfoService.querySupplierRelatedUser(req);
+    }
 }
\ No newline at end of file