Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Y
yifu-mvp
Project
Project
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
fangxinjiang
yifu-mvp
Commits
ce90551c
You need to sign in or sign up before continuing.
Commit
ce90551c
authored
Sep 05, 2022
by
李灿灿
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-licancan' into 'develop'
订单对接问题调试 See merge request fangxinjiang/yifu!229
parents
8ddba466
bd0dab17
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
EkpOrderReplyParam.java
...om/yifu/cloud/plus/v1/yifu/ekp/vo/EkpOrderReplyParam.java
+2
-1
TOrderServiceImpl.java
...ud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
+4
-4
No files found.
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpOrderReplyParam.java
View file @
ce90551c
...
...
@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.ekp.vo;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.Map
;
/**
* @author licancan
...
...
@@ -19,7 +20,7 @@ public class EkpOrderReplyParam implements Serializable {
/**
* 回复人 (人员账号)
**/
private
String
fd_3ac904badcaa06
;
private
Map
<
String
,
Object
>
fd_3ac904badcaa06
;
/**
* 回复时间
**/
...
...
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
View file @
ce90551c
...
...
@@ -39,9 +39,7 @@ import javax.annotation.Resource;
import
java.io.IOException
;
import
java.net.URL
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Optional
;
import
java.util.*
;
/**
* @author licancan
...
...
@@ -272,7 +270,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
//同步推送ekp
EkpOrderReplyParam
param
=
new
EkpOrderReplyParam
();
param
.
setFd_3ac904bbaf972a
(
orderNo
);
param
.
setFd_3ac904badcaa06
(
user
.
getUsername
());
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"LoginName"
,
user
.
getUsername
());
param
.
setFd_3ac904badcaa06
(
map
);
param
.
setFd_3ac904b8590598
(
reply
.
getCreateTime
().
toString
());
param
.
setFd_3ac904c7798e5c
(
replyContent
);
ekpOrderUtil
.
sendReplyToEKP
(
param
,
file
);
...
...
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