Commit 74cd2911 by jx-art

获取商品执行人测试调用~~~

parent e291887a
......@@ -41,7 +41,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
@Override
public String queryCommanderInfo(ChangeCommanderPO changeCommander) {
//获取模板名称
//获取模板名称 通过一级变更类型 二级变更类型ID 定位模板
ChangeConfig changeConfig = changeConfigService.queryChangeConfig(changeCommander.getId());
//查询出当前模板配置中选择的 角色
ChangeCommanderEnum changeCommanderEnum = ChangeCommanderEnum.getChangeCommanderEnum(changeConfig.getChangeCommanderType());
......@@ -55,7 +55,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
return queryGoodsCommander(changeCommanderEnum,changeCommander.getGoodsInfos(),changeConfig.getChangeCommander());
}else if (changeSubjectEnum.getType() == 2){
//供应商 采购 计划 SQE
return queryChangeSupplier(changeCommanderEnum,changeCommander.getChangeSupplier(),changeConfig.getChangeCommander());
return queryChangeSupplier(changeCommanderEnum,changeCommander.getChangeSupplierId(),changeConfig.getChangeCommander());
}
//其他变更 备注 其他变更之后固定人 和发起人在上面判断会被排除掉
return changeConfig.getChangeCommander();
......@@ -118,12 +118,12 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
/**
* 供应商角色最终查询
* @param commanderEnum 查询方向 枚举
* @param changeSupplier 供应商信息
* @param changeSupplierId 供应商信息
* @param commander 供应商关联角色
* @return
*/
private String queryChangeSupplier(ChangeCommanderEnum commanderEnum,String changeSupplier,String commander){
if (commanderEnum.getId() != 4 || changeSupplier == null || commander == null){
private String queryChangeSupplier(ChangeCommanderEnum commanderEnum,String changeSupplierId,String commander){
if (commanderEnum.getId() != 4 || changeSupplierId == null || commander == null){
return "返回空值 或者指示值";
}
//changeSupplier 根据提供的信息去查询 最终返回
......
......@@ -20,7 +20,7 @@ public class ChangeCommanderPO {
/**
* 供应商信息
*/
private String changeSupplier;
private String changeSupplierId;
/**
* 商品信息
......
......@@ -24,6 +24,16 @@ public interface ItemcenterApiRpcService {
@PostMapping(value = "/yxicadmin/api/xhr/item/group/itemIds.json")
String getDetail(@RequestBody List<Long> goodsId);
/*
* 调用案例
SupplierSendEmailReq req = new SupplierSendEmailReq();
req.setSupplierId("YX0001");
req.setMailSubject("测试发送主题");
req.setMailContent("测试发送内容");
req.setIsAllAccountResolved(1);
String s = sendEmailService.sendEmail(req);
*/
......
......@@ -4,6 +4,7 @@ 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
......@@ -11,10 +12,23 @@ import org.springframework.web.bind.annotation.RequestBody;
*/
@Service
@MissaClient(serviceCode = "yanxuan-supplier-ms")
public interface FlowRpcSupplierSendEmailService {
public interface FlowRpcSupplierSendService {
/**
* 邮件通知接口
* @param req
* @return
*/
@PostMapping("/api/supplier/msg/sendMail.json")
String sendEmail(@RequestBody SupplierSendEmailReq req);
/**
* 获取商品采购人信息
* @param itemIds
* @return
*/
@PostMapping("/api/initiateProject/source/getBatchRelatedSupplier.json")
String queryGoodsPurchase(@RequestBody List<Long> itemIds);
}
......@@ -5,13 +5,12 @@ import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
import com.netease.mail.yanxuan.change.biz.service.change.AdminChangeConfigService;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigQueryReq;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigReq;
import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierSendEmailService;
import com.netease.mail.yanxuan.change.integration.flow.supplier.SupplierSendEmailReq;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierSendService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author WangJiaXiang
......@@ -106,20 +105,12 @@ public class ChangeConfigController {
}
@Autowired
private FlowRpcSupplierSendEmailService sendEmailService;
Logger logger = LoggerFactory.getLogger(ChangeConfigController.class);
@GetMapping("/test")
public String queryExecuteUserByItemId(){
SupplierSendEmailReq req = new SupplierSendEmailReq();
req.setSupplierId("YX0001");
req.setMailSubject("测试发送主题");
req.setMailContent("测试发送内容");
req.setIsAllAccountResolved(1);
String s = sendEmailService.sendEmail(req);
logger.info("请求三方发送邮件接口返回值\t"+s);
return s;
private FlowRpcSupplierSendService sendEmailService;
@PostMapping("/test")
public String queryGoods(@RequestBody List<Long> longList){
return sendEmailService.queryGoodsPurchase(longList);
}
}
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