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

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/email/service/impl/EmailServiceImpl.java

@@ -31,6 +31,7 @@ public class EmailServiceImpl implements IEmailService {
         //固定
         emailFactor.setType(EmailTypeEnum.TEXT.getType());
         emailFactor.setEmailTemplateEnum(emailTemplateEnum);
+        emailFactor.setData(map);
         if (map != null) {
             String content = this.content(emailFactor);
             if (!CollectionUtils.isEmpty(toList)) {

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

@@ -9,12 +9,13 @@ package com.netease.mail.yanxuan.change.web.controller;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.netease.mail.yanxuan.change.biz.service.impl.InteriorChangeConfigServiceImpl;
+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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-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.service.rpc.TodoService;
@@ -54,30 +55,26 @@ public class TestController {
     }
 
     @Autowired
-    private FlowRpcSupplierSendService service;
+    private FlowRpcSupplierSendService supplierSendService;
 
-    @PostMapping("/test")
-    public AjaxResponse<List<SupplierSimpleRsp>> test1(@RequestParam String name){
-        SupplierSearchRemoteReq req = new SupplierSearchRemoteReq();
-        req.setSearchText(name);
-        return service.queryByConditionForQc(req);
+    @PostMapping("/test1")
+    public String test1(@RequestBody List<Long> itemIds){
+        return supplierSendService.queryGoodsPurchase(itemIds);
     }
 
-    @GetMapping("/query/supplier/infos")
-    public AjaxResponse<List<SupplierSimpleRsp>> queryByConditionForQc(@RequestParam(name = "searchText") String searchText){
-        SupplierSearchRemoteReq req = new SupplierSearchRemoteReq();
-        req.setSearchText(searchText);
-        //暂时使用模拟数据
-        //AjaxResponse<List<SupplierSimpleRsp>> listAjaxResponse = service.queryByConditionForQc(req);
-        AjaxResponse<List<SupplierSimpleRsp>> listAjaxResponse = new AjaxResponse<List<SupplierSimpleRsp>>();
-        List<SupplierSimpleRsp> suppliers = new ArrayList<>();
-        SupplierSimpleRsp supplierSimpleRsp1 = new SupplierSimpleRsp("YX0778","gyhtest1009");
-        SupplierSimpleRsp supplierSimpleRsp2 = new SupplierSimpleRsp("YX0528","gyhtest1010");
-        suppliers.add(supplierSimpleRsp1);
-        suppliers.add(supplierSimpleRsp2);
-        listAjaxResponse.setData(suppliers);
-        listAjaxResponse.setCode(200);
-        //return supplierSendService.queryByConditionForQc(req);  暂用模拟数据
-        return listAjaxResponse;
+    @PostMapping("/test2")
+    public AjaxResponse<List<SupplierUserRsp>> test2(@RequestBody SupplierRelatedUserReq req){
+        return supplierSendService.querySupplierRelatedUser(req);
     }
+
+    @PostMapping("/test3")
+    public AjaxResponse<List<SupplierSimpleRsp>> test3(@RequestBody SupplierSearchRemoteReq req){
+        return supplierSendService.queryByConditionForQc(req);
+    }
+
+    @PostMapping("/test4")
+    public AjaxResponse<List<SupplierGoodsInfoRsp>> test4(@RequestBody SupplierGoodsInfoReq req){
+        return supplierSendService.SupplierGoodsInfoBySupplier(req);
+    }
+
 }
\ No newline at end of file