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
e44d7cbe
Commit
e44d7cbe
authored
Sep 07, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除2227测试商户支付信息展示 蜜雪冰城的需求
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
c2181603
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java
View file @
e44d7cbe
...
@@ -122,7 +122,7 @@ public class OrderCommonService {
...
@@ -122,7 +122,7 @@ public class OrderCommonService {
AssortmentOpenPlatformWxapp
wxApp
=
openPlatformWxappManager
.
findByPartnerIdAndWxappId
(
partnerId
,
wxAppId
);
AssortmentOpenPlatformWxapp
wxApp
=
openPlatformWxappManager
.
findByPartnerIdAndWxappId
(
partnerId
,
wxAppId
);
paymentRequest
.
setPrincipalName
(
wxApp
.
getPrincipalName
());
paymentRequest
.
setPrincipalName
(
wxApp
.
getPrincipalName
());
// fisherman 2227 测试商户号, 下个版本需要删除
// fisherman 2227 测试商户号, 下个版本需要删除
if
(
"2080"
.
equals
(
partnerId
)
||
"2227"
.
equals
(
partnerId
)
)
{
if
(
"2080"
.
equals
(
partnerId
))
{
//【ID1035981】【蜜雪冰城】订单C端,拼接order_body字段:蜜雪冰城+门店编号
//【ID1035981】【蜜雪冰城】订单C端,拼接order_body字段:蜜雪冰城+门店编号
paymentRequest
.
setPrincipalName
(
"蜜雪冰城"
+
orderBean
.
getShopId
()+
"店"
);
paymentRequest
.
setPrincipalName
(
"蜜雪冰城"
+
orderBean
.
getShopId
()+
"店"
);
}
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
e44d7cbe
...
@@ -2950,7 +2950,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2950,7 +2950,7 @@ public class OrderServiceImpl implements Orderservice {
private
PaymentRequest
orderBodyConvertToPaymentBody
(
String
openId
,
String
partnerId
,
String
appId
,
String
payCode
,
String
storeId
)
{
private
PaymentRequest
orderBodyConvertToPaymentBody
(
String
openId
,
String
partnerId
,
String
appId
,
String
payCode
,
String
storeId
)
{
PaymentRequest
paymentRequest
=
this
.
orderBodyConvertToPaymentBody
(
openId
,
partnerId
,
appId
,
payCode
);
PaymentRequest
paymentRequest
=
this
.
orderBodyConvertToPaymentBody
(
openId
,
partnerId
,
appId
,
payCode
);
// fisherman 2227 测试商户号, 下个版本需要删除
// fisherman 2227 测试商户号, 下个版本需要删除
boolean
isTrue
=
"2080"
.
equals
(
partnerId
)
||
"2227"
.
equals
(
partnerId
)
;
boolean
isTrue
=
"2080"
.
equals
(
partnerId
);
if
(
isTrue
)
{
if
(
isTrue
)
{
//【ID1035981】【蜜雪冰城】订单C端,拼接order_body字段:蜜雪冰城+门店编号
//【ID1035981】【蜜雪冰城】订单C端,拼接order_body字段:蜜雪冰城+门店编号
paymentRequest
.
setPrincipalName
(
"蜜雪冰城"
+
storeId
+
"店"
);
paymentRequest
.
setPrincipalName
(
"蜜雪冰城"
+
storeId
+
"店"
);
...
...
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