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
6147e28c
Commit
6147e28c
authored
Mar 11, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
围餐门店英文名称保存
parent
a1b77361
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
24 additions
and
0 deletions
+24
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+6
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentGroupCreateOrderRequest.java
+5
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
+1
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+3
-0
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
+2
-0
order-application-service/src/main/java/cn/freemud/entities/vo/encircle/PreviewOrderInfoVo.java
+2
-0
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+1
-0
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
+1
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupCreateOrderRequest.java
+3
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
6147e28c
...
...
@@ -1067,6 +1067,11 @@ public class OrderSdkAdapter {
//【订单开放平台】订单详情查询接口增加配送类型字段
data
.
setExpressType
(
orderInfoReqs
.
getExpressType
());
//围餐门店英文名称
if
(
orderInfoReqs
.
getOrderExtended
()
!=
null
)
{
data
.
setShopNameEn
(
orderInfoReqs
.
getOrderExtended
().
getStoreNameEn
());
}
if
(
orderInfoReqs
.
getAfterSalesOrderList
()
!=
null
&&
orderInfoReqs
.
getAfterSalesOrderList
().
size
()
>=
1
)
{
data
.
setAfterSalesOrderResp
(
orderInfoReqs
.
getAfterSalesOrderList
().
get
(
0
));
}
...
...
@@ -2481,6 +2486,7 @@ public class OrderSdkAdapter {
request
.
setOrderClient
(
requestVO
.
getOrderClient
());
request
.
setCompanySelfCode
(
requestVO
.
getThirdOrderCode
());
request
.
setStoreName
(
requestVO
.
getShopName
());
request
.
setStoreNameEn
(
requestVO
.
getShopNameEn
());
request
.
setPartnerName
(
requestVO
.
getCompanyName
());
request
.
setStoreUnifyId
(
requestVO
.
getShopCode
());
request
.
setUserId
(
requestVO
.
getUserId
());
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentGroupCreateOrderRequest.java
View file @
6147e28c
...
...
@@ -42,6 +42,11 @@ public class AssortmentGroupCreateOrderRequest extends BaseConfig {
* 门店名称
*/
private
String
shopName
;
/**
* 门店名称英文
*/
private
String
shopNameEn
;
/**
* 用户ID
*/
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
View file @
6147e28c
...
...
@@ -210,6 +210,7 @@ public class QueryOrdersResponse {
*/
private
String
thirdShopId
;
private
String
shopName
;
private
String
shopNameEn
;
private
String
source
;
private
String
sourceName
;
/**
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
6147e28c
...
...
@@ -1098,6 +1098,7 @@ public class OrderAdapter {
responseVo
.
setOid
(
ordersBean
.
getOid
());
responseVo
.
setShopId
(
ordersBean
.
getShopId
());
responseVo
.
setShopName
(
ordersBean
.
getShopName
());
responseVo
.
setShopNameEn
(
ordersBean
.
getShopNameEn
());
responseVo
.
setShopAddress
(
ordersBean
.
getShopAddress
());
responseVo
.
setShopPhone
(
ordersBean
.
getShopPhone
());
responseVo
.
setReceiveAddress
(
ordersBean
.
getAddress
());
...
...
@@ -3143,6 +3144,8 @@ public class OrderAdapter {
previewOrderInfoVo
.
setPayStatus
(
queryOrderResponseVo
.
getPayStatus
());
previewOrderInfoVo
.
setPayStatusDesc
(
queryOrderResponseVo
.
getPayStatusDesc
());
previewOrderInfoVo
.
setShopName
(
queryOrderResponseVo
.
getShopName
());
previewOrderInfoVo
.
setShopNameEn
(
queryOrderResponseVo
.
getShopNameEn
());
previewOrderInfoVo
.
setFullDiscount
(
queryOrderResponseVo
.
getFullDiscountAmount
());
previewOrderInfoVo
.
setCustomerScoreAmount
(
queryOrderResponseVo
.
getCustomerScoreAmount
());
if
(
queryOrderResponseVo
.
getCouponInfo
()
!=
null
)
{
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
View file @
6147e28c
...
...
@@ -37,6 +37,8 @@ public class QueryOrderResponseVo {
private
String
shopName
;
private
String
shopNameEn
;
private
String
shopAddress
;
private
String
shopPhone
;
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/encircle/PreviewOrderInfoVo.java
View file @
6147e28c
...
...
@@ -86,6 +86,8 @@ public class PreviewOrderInfoVo {
*/
private
String
shopName
;
private
String
shopNameEn
;
private
List
<
PromotionMessageDto
>
promotionMessages
;
/**
...
...
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
View file @
6147e28c
...
...
@@ -206,6 +206,7 @@ public class CheckOrder {
createOrderVo
.
setStoreName
(
storeResponseDto
.
getStoreName
());
createOrderVo
.
setStoreAddress
(
storeResponseDto
.
getAddress
());
createOrderVo
.
setThirdShopId
(
storeResponseDto
.
getThirdPartCode
());
createOrderVo
.
setStoreNameEn
(
storeResponseDto
.
getStoreNameEn
());
return
storeResponseDto
;
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
View file @
6147e28c
...
...
@@ -228,6 +228,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
groupCreateOrderRequest
.
setCompanyId
(
assortmentCustomerInfoVo
.
getPartnerId
());
groupCreateOrderRequest
.
setShopId
(
assortmentCustomerInfoVo
.
getStoreId
());
groupCreateOrderRequest
.
setShopName
(
storeResponseDto
.
getStoreName
());
groupCreateOrderRequest
.
setShopNameEn
(
storeResponseDto
.
getStoreNameEn
());
groupCreateOrderRequest
.
setBarCounter
(
assortmentCustomerInfoVo
.
getTableNumber
());
groupCreateOrderRequest
.
setOrderClient
(
OrderClientType
.
WAI_MEAL
.
getIndex
());
//默认围餐
//开台不存用户信息
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupCreateOrderRequest.java
View file @
6147e28c
...
...
@@ -40,6 +40,9 @@ public class GroupCreateOrderRequest {
//门店名
private
String
storeName
;
//英文门店名
private
String
storeNameEn
;
//商户名
private
String
partnerName
;
...
...
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