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
1ddbb4b1
Commit
1ddbb4b1
authored
Nov 16, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
可能空指针的代码修复,查询小程序配送配置删除,蜜雪定制代码删除
parent
eb50901b
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+2
-2
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+0
-0
order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
+4
-4
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
1ddbb4b1
...
@@ -547,8 +547,8 @@ public class OrderAdapter {
...
@@ -547,8 +547,8 @@ public class OrderAdapter {
}
else
if
(
Objects
.
equals
(
createOrderVo
.
getOrderType
(),
OrderType
.
MALL
.
getCode
()))
{
}
else
if
(
Objects
.
equals
(
createOrderVo
.
getOrderType
(),
OrderType
.
MALL
.
getCode
()))
{
orderType
=
OrderType
.
MALL
.
getCode
();
orderType
=
OrderType
.
MALL
.
getCode
();
receiveAddress
=
(
userDeliveryInfoDto
!=
null
?
userDeliveryInfoDto
.
getReceiveProvince
()
+
userDeliveryInfoDto
.
getReceiveCity
()
+
userDeliveryInfoDto
.
getReceiveRegion
()
+
userDeliveryInfoDto
.
getReceiveAddress
()
:
""
);
receiveAddress
=
(
userDeliveryInfoDto
!=
null
?
userDeliveryInfoDto
.
getReceiveProvince
()
+
userDeliveryInfoDto
.
getReceiveCity
()
+
userDeliveryInfoDto
.
getReceiveRegion
()
+
userDeliveryInfoDto
.
getReceiveAddress
()
:
""
);
createOrderVo
.
setMobile
(
userDeliveryInfoDto
.
getReceiveMobile
()
);
createOrderVo
.
setMobile
(
userDeliveryInfoDto
!=
null
?
userDeliveryInfoDto
.
getReceiveMobile
()
:
""
);
createOrderVo
.
setContactsName
(
userDeliveryInfoDto
.
getReceiveUserName
()
);
createOrderVo
.
setContactsName
(
userDeliveryInfoDto
!=
null
?
userDeliveryInfoDto
.
getReceiveUserName
()
:
""
);
}
else
{
}
else
{
throw
new
ServiceException
(
ResponseResult
.
PARAMETER_MISSING
,
"非法的订单类型"
);
throw
new
ServiceException
(
ResponseResult
.
PARAMETER_MISSING
,
"非法的订单类型"
);
}
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
View file @
1ddbb4b1
This diff is collapsed.
Click to expand it.
order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
View file @
1ddbb4b1
...
@@ -250,10 +250,10 @@ public class PayServiceImpl {
...
@@ -250,10 +250,10 @@ public class PayServiceImpl {
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
))
{
//
if ("2080".equals(partnerId)) {
//【ID1035981】【蜜雪冰城】订单C端,拼接order_body字段:蜜雪冰城+门店编号
//
//【ID1035981】【蜜雪冰城】订单C端,拼接order_body字段:蜜雪冰城+门店编号
paymentRequest
.
setPrincipalName
(
"蜜雪冰城"
+
orderBean
.
getShopId
()
+
"店"
);
//
paymentRequest.setPrincipalName("蜜雪冰城" + orderBean.getShopId() + "店");
}
//
}
paymentRequest
.
setReverseNotifyiDcUrl
(
reverseNotifyiDcUrl
);
paymentRequest
.
setReverseNotifyiDcUrl
(
reverseNotifyiDcUrl
);
//修改订单信息
//修改订单信息
OrderExtInfoDto
orderExtInfoDto
=
JSONObject
.
parseObject
(
orderBean
.
getExtInfo
(),
OrderExtInfoDto
.
class
)
==
null
?
new
OrderExtInfoDto
()
:
JSONObject
.
parseObject
(
orderBean
.
getExtInfo
(),
OrderExtInfoDto
.
class
);
OrderExtInfoDto
orderExtInfoDto
=
JSONObject
.
parseObject
(
orderBean
.
getExtInfo
(),
OrderExtInfoDto
.
class
)
==
null
?
new
OrderExtInfoDto
()
:
JSONObject
.
parseObject
(
orderBean
.
getExtInfo
(),
OrderExtInfoDto
.
class
);
...
...
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