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

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

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

+package com.netease.mail.yanxuan.change.integration.flow.supplier;
+
+import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierInfoRsp;
+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.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
+
+/**
+ * @author WangJiaXiang
+ * @date 2022/12/7/007$
+ */
+@Service
+@MissaClient(serviceCode = "yanxuan-supplier-api")
+public interface FlowRpcSupplierService {
+
+    /**
+     * 邮件通知接口
+     * @return
+     */
+    @GetMapping("/api/supplier/getSupplierInfo.json")
+    AjaxResponse<List<SupplierInfoRsp>> getSupplierInfo(@RequestParam(name = "name") String name,
+                                                        @RequestParam(name = "uid") String uid,
+                                                        @RequestParam(name = "fuzzySearchText") String fuzzySearchText);
+}

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

+package com.netease.mail.yanxuan.change.integration.flow.supplier.rsp;
+
+import lombok.Data;
+
+/**
+ * @author WangJiaXiang
+ * @date 2022/12/7/007$
+ */
+@Data
+public class SupplierInfoRsp {
+
+    private String supplierId;
+
+    private String supplierName;
+
+    private String email;
+
+    private String smsPhone;
+
+    private Integer isSupportCustomsClearance;
+
+
+}

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

@@ -8,26 +8,33 @@ package com.netease.mail.yanxuan.change.web.controller;
 
 import java.util.List;
 
-import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory;
-import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
-import com.netease.mail.yanxuan.change.biz.task.AutoSubmit;
-import com.netease.mail.yanxuan.change.common.bean.ResponseCode;
-import com.netease.mail.yanxuan.change.common.enums.ChangeFlowEnum;
-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.rsp.SupplierGoodsInfoRsp;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierUserRsp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
+import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory;
+import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.TodoService;
+import com.netease.mail.yanxuan.change.biz.task.AutoSubmit;
 import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
+import com.netease.mail.yanxuan.change.common.bean.ResponseCode;
+import com.netease.mail.yanxuan.change.common.enums.ChangeFlowEnum;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
 import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierSendService;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierService;
+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.rsp.SupplierGoodsInfoRsp;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierInfoRsp;
 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 lombok.extern.slf4j.Slf4j;
@@ -71,10 +78,14 @@ public class TestController {
     public String test1(@RequestBody List<Long> itemIds) {
         return supplierSendService.queryGoodsPurchase(itemIds);
     }
+    private FlowRpcSupplierService rpcSupplierService;
 
     @PostMapping("/test2")
     public AjaxResponse<List<SupplierUserRsp>> test2(@RequestBody SupplierRelatedUserReq req) {
         return supplierSendService.querySupplierRelatedUser(req);
+    @GetMapping("/test1")
+    public AjaxResponse<List<SupplierInfoRsp>>  test1(@RequestParam(name = "fuzzySearchText") String fuzzySearchText){
+        return rpcSupplierService.getSupplierInfo("aa","wb.mulongfei@mesg.corp.netease.com",fuzzySearchText);
     }
 
     @PostMapping("/test3")