Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
d11a0c5a
Commit
d11a0c5a
authored
Aug 26, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
蜜雪->支付信息详情变动 新增2227商户用于测试
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
aae76cdc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+5
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java
+2
-2
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
d11a0c5a
...
@@ -3184,6 +3184,11 @@ public class OrderAdapter {
...
@@ -3184,6 +3184,11 @@ public class OrderAdapter {
UnifiedOrderRequest
orderPayDto
=
new
UnifiedOrderRequest
();
UnifiedOrderRequest
orderPayDto
=
new
UnifiedOrderRequest
();
orderPayDto
.
setPartnerId
(
orderBean
.
getCompanyId
());
orderPayDto
.
setPartnerId
(
orderBean
.
getCompanyId
());
orderPayDto
.
setBody
(
paymentRequest
.
getPrincipalName
());
orderPayDto
.
setBody
(
paymentRequest
.
getPrincipalName
());
// fisherman 2227 测试商户号, 下个版本需要删除
if
(
"2080"
.
equals
(
orderBean
.
getCompanyId
())
||
"2227"
.
equals
(
orderBean
.
getCompanyId
()))
{
//【ID1035981】【蜜雪冰城】订单C端,拼接order_body字段:蜜雪冰城+门店编号
paymentRequest
.
setPrincipalName
(
"蜜雪冰城"
+
orderBean
.
getShopId
()+
"店"
);
}
orderPayDto
.
setNotifyUrl
(
paymentRequest
.
getReverseNotifyiDcUrl
());
orderPayDto
.
setNotifyUrl
(
paymentRequest
.
getReverseNotifyiDcUrl
());
orderPayDto
.
setStoreId
(
orderBean
.
getShopId
());
orderPayDto
.
setStoreId
(
orderBean
.
getShopId
());
orderPayDto
.
setTransId
(
transId
);
orderPayDto
.
setTransId
(
transId
);
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java
View file @
d11a0c5a
...
@@ -121,8 +121,8 @@ public class OrderCommonService {
...
@@ -121,8 +121,8 @@ public class OrderCommonService {
paymentRequest
.
setWxAppId
(
wxAppId
);
paymentRequest
.
setWxAppId
(
wxAppId
);
AssortmentOpenPlatformWxapp
wxApp
=
openPlatformWxappManager
.
findByPartnerIdAndWxappId
(
partnerId
,
wxAppId
);
AssortmentOpenPlatformWxapp
wxApp
=
openPlatformWxappManager
.
findByPartnerIdAndWxappId
(
partnerId
,
wxAppId
);
paymentRequest
.
setPrincipalName
(
wxApp
.
getPrincipalName
());
paymentRequest
.
setPrincipalName
(
wxApp
.
getPrincipalName
());
// 2227 测试商户号, 下个版本需要删除
//
fisherman
2227 测试商户号, 下个版本需要删除
if
(
"2080"
.
equals
(
orderBean
.
getCompanyId
())
||
"2227"
.
equals
(
orderBean
.
getCompanyId
()
))
{
if
(
"2080"
.
equals
(
partnerId
)
||
"2227"
.
equals
(
partnerId
))
{
//【ID1035981】【蜜雪冰城】订单C端,拼接order_body字段:蜜雪冰城+门店编号
//【ID1035981】【蜜雪冰城】订单C端,拼接order_body字段:蜜雪冰城+门店编号
paymentRequest
.
setPrincipalName
(
"蜜雪冰城"
+
orderBean
.
getShopId
()+
"店"
);
paymentRequest
.
setPrincipalName
(
"蜜雪冰城"
+
orderBean
.
getShopId
()+
"店"
);
}
}
...
...
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