Skip to content

Y
yanxuan-qc-change-system
Commit 33d0f64b by jx-art
Options

预对接供应商接口。。。。

parent 3345026b
Showing with 163 additions and 31 deletions
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/InteriorChangeConfigServiceImpl.java
......@@ -16,6 +16,9 @@ import com.netease.mail.yanxuan.change.integration.flow.goods.ItemcenterApiRpcSe
import com.netease.mail.yanxuan.change.integration.flow.goods.PfuApiRpcService;
import com.netease.mail.yanxuan.change.integration.flow.goods.QcApiRpcService;
import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierSendService;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -49,6 +52,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
@Override
public GoodsResponseRpc queryCommanderInfo(ChangeCommanderPO changeCommander) {
GoodsResponseRpc rpc = new GoodsResponseRpc();
//获取模板名称 通过一级变更类型 二级变更类型ID 定位模板
ChangeConfig changeConfig = changeConfigService.queryChangeType(changeCommander.getParentChangeClassId(), changeCommander.getSonChangeClassId());
if (changeConfig == null){
......@@ -58,8 +62,9 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
ChangeCommanderEnum changeCommanderEnum = ChangeCommanderEnum.getChangeCommanderEnum(changeConfig.getChangeCommanderType());
//直接排除 选项为固定人 或者发起人
if (changeCommanderEnum.getId() == 1 || changeCommanderEnum.getId() == 2){
//固定人或者发起人 changeConfig.getChangeCommander();
return null;
//固定人或者发起人;
rpc.setChangeCommander(changeConfig.getChangeCommander());
return rpc;
}
ChangeSubjectEnum changeSubjectEnum = ChangeSubjectEnum.getChangeSubjectEnum(changeConfig.getChangeSubject());
if (changeSubjectEnum.getType() == 1){
......@@ -159,16 +164,28 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
* @return
*/
private GoodsResponseRpc queryChangeSupplier(ChangeCommanderEnum commanderEnum,String changeSupplierId,String commander){
GoodsResponseRpc rpc = new GoodsResponseRpc();
if (commanderEnum.getId() != 4 || changeSupplierId == null || commander == null){
return null;
}
SupplierRelatedUserReq req = new SupplierRelatedUserReq();
List<String> supplierIdList = new ArrayList<>();
supplierIdList.add(changeSupplierId);
//changeSupplier 根据提供的信息去查询 最终返回
if (commander.equals("采购")){
req.setSearchType(1);
}else if (commander.equals("计划")){
req.setSearchType(2);
}else if (commander.equals("SQE")){
req.setSearchType(3);
}
req.setSupplierIdList(supplierIdList);
//进行参数解析
AjaxResponse<List<SupplierUserRsp>> listAjaxResponse = supplierSendService.querySupplierRelatedUser(req);
List<SupplierUserRsp> data = listAjaxResponse.getData();
if (data != null){
// 返回结果有问题暂时不动
//rpc.setSupplierId();
}
return null;
}
......
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/rpc/GoodsResponseRpc.java
......@@ -10,10 +10,35 @@ import lombok.Data;
@Data
public class GoodsResponseRpc {
/**
* 商品负责人名称
*/
private String name;
/**
* 商品负责人邮箱
*/
private String email;
/**
* 固定人 || 发起人返回结果
*/
private String changeCommander;
/**
* 计数器
*/
private Integer occurrenceNumber;
/**
* 供应商返回结果
*/
private String supplierId;
/**
* 供应商名称
*/
private String supplierName;
}
yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/ius/IusRpcService.java
package com.netease.mail.yanxuan.change.integration.flow.ius;
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.OrgPosLeaderChainRsp;
import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.SecondaryDepartments;
import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
import com.netease.yanxuan.missa.client.annotation.MissaClient;
import org.springframework.stereotype.Service;
......
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.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.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.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
......@@ -30,7 +37,23 @@ public interface FlowRpcSupplierSendService {
@PostMapping("/api/initiateProject/source/getBatchRelatedSupplier.json")
String queryGoodsPurchase(@RequestBody List<Long> itemIds);
/**
* 查询供应商关联角色
*/
@PostMapping("/api/supplier/batchGetSupplierRelatedUser.json")
String querySupplierRelatedUser(@RequestBody SupplierRelatedUserReq req);
AjaxResponse<List<SupplierUserRsp>> querySupplierRelatedUser(@RequestBody SupplierRelatedUserReq req);
/**
* 供应商模糊查询
*/
@PostMapping("/api/supplier/queryByConditionForQc.json")
AjaxResponse<List<SupplierSimpleRsp>> queryByConditionForQc(@RequestBody SupplierSearchRemoteReq req);
/**
* 查询供应商+商品对应的跟进采购 ?有存疑参数不对
*/
@PostMapping("/api/initiateProject/source/batchGetRelatedSupplier.json")
String batchGetRelatedSupplier(@RequestBody List<Integer> req);
}
yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/supplier/SupplierRelatedUserReq.java → yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/supplier/req/SupplierRelatedUserReq.java
package com.netease.mail.yanxuan.change.integration.flow.supplier;
package com.netease.mail.yanxuan.change.integration.flow.supplier.req;
import lombok.Data;
......@@ -11,8 +11,14 @@ import java.util.List;
@Data
public class SupplierRelatedUserReq {
/**
* 搜索类型(1-采购 2-计划 3-SQE 4-商品开发)
*/
private Integer searchType;
/**
* 供应商ID列表
*/
private List<String> supplierIdList;
}
yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/supplier/req/SupplierSearchRemoteReq.java 0 → 100644
package com.netease.mail.yanxuan.change.integration.flow.supplier.req;
import lombok.Data;
import java.util.List;
/**
* @author WangJiaXiang
* @date 2022/12/1/001$
*/
@Data
public class SupplierSearchRemoteReq {
private List<Integer> coopStateList;
private List<String> limitSupplierIdList;
private List<String> orInPhyCategoryIds;
/**
* 模糊查询文本
*/
private String searchText;
}
yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/supplier/rsp/SupplierSimpleRsp.java 0 → 100644
package com.netease.mail.yanxuan.change.integration.flow.supplier.rsp;
import lombok.Data;
/**
* @author WangJiaXiang
* @date 2022/12/1/001$
*/
@Data
public class SupplierSimpleRsp {
/**
* 供应商ID
*/
private String supplierId;
/**
* 供应商名称
*/
private String supplierName;
}
yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/supplier/rsp/SupplierUserRsp.java 0 → 100644
package com.netease.mail.yanxuan.change.integration.flow.supplier.rsp;
import lombok.Data;
import java.util.Map;
/**
* @author WangJiaXiang
* @date 2022/12/1/001$
*/
@Data
public class SupplierUserRsp {
/**
* 供应商ID
*/
private Integer supplierId;
/**
* 角色ID(1-采购 2-计划 3-SQE 4-商品开发) 以及名称
*/
private Map<String,String> uid2NameMap;
}
yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeConfigController.java
......@@ -10,7 +10,7 @@ import com.netease.mail.yanxuan.change.integration.email.enums.EmailTemplateEnum
import com.netease.mail.yanxuan.change.integration.email.enums.EmailTypeEnum;
import com.netease.mail.yanxuan.change.integration.email.service.IEmailService;
import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierSendService;
import com.netease.mail.yanxuan.change.integration.flow.supplier.SupplierRelatedUserReq;
import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierRelatedUserReq;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -140,18 +140,4 @@ public class ChangeConfigController {
iEmailService.sendEmail(strings,null,emailFactor,list);
}
@Autowired
private FlowRpcSupplierSendService sendService;
@GetMapping("/test2")
public String queryCommanderInfo(
@RequestParam(name = "type")Integer type,
@RequestParam(name = "id")String id){
SupplierRelatedUserReq req = new SupplierRelatedUserReq();
List<String> strings = new ArrayList<>();
strings.add(id);
req.setSearchType(type);
return sendService.querySupplierRelatedUser(req);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment