Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yanxuan-qc-change-system
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
胡园园
yanxuan-qc-change-system
Commits
74cd2911
Commit
74cd2911
authored
Nov 24, 2022
by
jx-art
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
获取商品执行人测试调用~~~
parent
e291887a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
40 additions
and
25 deletions
+40
-25
InteriorChangeConfigServiceImpl.java
...nge/biz/service/impl/InteriorChangeConfigServiceImpl.java
+5
-5
ChangeCommanderPO.java
...l/yanxuan/change/dal/meta/model/po/ChangeCommanderPO.java
+1
-1
ItemcenterApiRpcService.java
...hange/integration/flow/goods/ItemcenterApiRpcService.java
+10
-0
FlowRpcSupplierSendService.java
...integration/flow/supplier/FlowRpcSupplierSendService.java
+15
-1
ChangeConfigController.java
...yanxuan/change/web/controller/ChangeConfigController.java
+9
-18
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/InteriorChangeConfigServiceImpl.java
View file @
74cd2911
...
...
@@ -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
.
getChangeSupplier
Id
(),
changeConfig
.
getChangeCommander
());
}
//其他变更 备注 其他变更之后固定人 和发起人在上面判断会被排除掉
return
changeConfig
.
getChangeCommander
();
...
...
@@ -118,12 +118,12 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
/**
* 供应商角色最终查询
* @param commanderEnum 查询方向 枚举
* @param changeSupplier 供应商信息
* @param changeSupplier
Id
供应商信息
* @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
changeSupplier
Id
,
String
commander
){
if
(
commanderEnum
.
getId
()
!=
4
||
changeSupplier
Id
==
null
||
commander
==
null
){
return
"返回空值 或者指示值"
;
}
//changeSupplier 根据提供的信息去查询 最终返回
...
...
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/po/ChangeCommanderPO.java
View file @
74cd2911
...
...
@@ -20,7 +20,7 @@ public class ChangeCommanderPO {
/**
* 供应商信息
*/
private
String
changeSupplier
;
private
String
changeSupplier
Id
;
/**
* 商品信息
...
...
yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/goods/ItemcenterApiRpcService.java
View file @
74cd2911
...
...
@@ -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);
*/
...
...
yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/supplier/FlowRpcSupplierSend
Email
Service.java
→
yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/supplier/FlowRpcSupplierSendService.java
View file @
74cd2911
...
...
@@ -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
FlowRpcSupplierSend
Email
Service
{
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
);
}
yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeConfigController.java
View file @
74cd2911
...
...
@@ -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
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment