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
c6e35a53
Commit
c6e35a53
authored
May 13, 2021
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
周四版本有售后单的不显示按钮
parent
3d6b0c74
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
5 deletions
+13
-5
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+1
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
+4
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-1
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
+5
-0
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
+2
-3
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
c6e35a53
...
...
@@ -249,7 +249,7 @@ public class OrderSdkAdapter {
deliveryContactInfoCreateReq
.
setRelateObjectType
(
1
);
//联系方式类型 1:取件 2:收件
deliveryContactInfoCreateReq
.
setInfoType
(
1
);
deliveryContactInfoCreateReq
.
setContactsName
(
requestVO
.
get
User
Name
());
deliveryContactInfoCreateReq
.
setContactsName
(
requestVO
.
get
Contacts
Name
());
deliveryContactInfoCreateReq
.
setMobile
(
requestVO
.
getPhone
());
deliveryContactInfoCreateReq
.
setLatitude
(
StringUtils
.
isBlank
(
requestVO
.
getLatitude
())
?
null
:
new
BigDecimal
(
requestVO
.
getLatitude
()));
deliveryContactInfoCreateReq
.
setLongitude
(
StringUtils
.
isBlank
(
requestVO
.
getLongitude
())
?
null
:
new
BigDecimal
(
requestVO
.
getLongitude
()));
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
View file @
c6e35a53
...
...
@@ -42,6 +42,10 @@ public class BaseCreateOrderRequest extends BaseConfig {
*/
private
String
userName
;
/**
* 收货名姓名
*/
private
String
contactsName
;
/**
* 三方单号
*/
private
String
thirdOrderCode
;
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
c6e35a53
...
...
@@ -675,7 +675,7 @@ public class OrderAdapter {
orderType
=
OrderType
.
MALL
.
getCode
();
receiveAddress
=
(
userDeliveryInfoDto
!=
null
?
userDeliveryInfoDto
.
getReceiveProvince
()+
userDeliveryInfoDto
.
getReceiveCity
()+
userDeliveryInfoDto
.
getReceiveRegion
()+
userDeliveryInfoDto
.
getReceiveAddress
()
:
""
);
createOrderVo
.
setMobile
(
userDeliveryInfoDto
.
getReceiveMobile
());
createOrderVo
.
set
User
Name
(
userDeliveryInfoDto
.
getReceiveUserName
());
createOrderVo
.
set
Contacts
Name
(
userDeliveryInfoDto
.
getReceiveUserName
());
}
else
{
throw
new
ServiceException
(
ResponseResult
.
PARAMETER_MISSING
,
"非法的订单类型"
);
}
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
View file @
c6e35a53
...
...
@@ -447,4 +447,9 @@ public class CreateOrderVo {
* 使用户省份code 100010 这是微信选择地址传过来的,用户查询配送费用的, 并不是北京市这种给是
*/
private
String
province
;
/**
* 收货名姓名
*/
private
String
contactsName
;
}
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
View file @
c6e35a53
...
...
@@ -117,8 +117,6 @@ public class MallOrderServiceImpl implements MallOrderService {
@Autowired
private
OrderAdapter
orderAdapter
;
@Autowired
private
OrderAdapter
mallOrderAdapter
;
@Autowired
private
ItemServiceImpl
itemService
;
@Autowired
private
ShoppingCartClient
shoppingCartClient
;
...
...
@@ -271,7 +269,7 @@ public class MallOrderServiceImpl implements MallOrderService {
OrderExtendedReq
orderExtendedReq
=
orderAdapter
.
saveStoreInfo
(
storeResponseDto
);
//创建普通订单
Function
<
Object
,
CreateOrderResponse
>
createOrder
=
(
var
->
{
BaseCreateOrderRequest
baseCreateOrderRequest
=
mallO
rderAdapter
.
convent2CreateOrderDto
(
createOrderVo
,
shoppingCartGoodsDto
,
storeResponseDto
);
BaseCreateOrderRequest
baseCreateOrderRequest
=
o
rderAdapter
.
convent2CreateOrderDto
(
createOrderVo
,
shoppingCartGoodsDto
,
storeResponseDto
);
//查询第三方商品编号
baseCreateOrderRequest
=
getProductCustomerCode
(
baseCreateOrderRequest
);
//保存门店渠道信息
...
...
@@ -284,6 +282,7 @@ public class MallOrderServiceImpl implements MallOrderService {
mqMessageRequest
.
setBackOrdersNotifyActivityExchange
(
backOrdersNotifyActivityExchange
);
mqMessageRequest
.
setBackOrdersNotifyActivityQueue
(
backOrdersChangeOrderStatusConsumerQueue
);
createOrderRequest
.
setMqMessageRequest
(
mqMessageRequest
);
createOrderRequest
.
getBaseCreateOrderRequest
().
setUserName
(
userLoginInfoDto
.
getNickName
());
createOrderRequest
.
setTrackingNo
(
LogThreadLocal
.
getTrackingNo
());
return
orderCenterSdkService
.
createOrderFlow
(
createOrderRequest
);
});
...
...
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