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
33bb2ed9
Commit
33bb2ed9
authored
Dec 09, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
微商城业务类型赋值
parent
8bf8e95e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletions
+5
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+3
-1
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
+2
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
33bb2ed9
...
@@ -240,7 +240,9 @@ public class OrderSdkAdapter {
...
@@ -240,7 +240,9 @@ public class OrderSdkAdapter {
// 双重判断,防止前端乱传参搞事情
// 双重判断,防止前端乱传参搞事情
if
(
Objects
.
nonNull
(
bizType
)
&&
BizTypeEnum
.
ADVANCE_ORDER
.
getBizType
().
compareTo
(
bizType
)
==
0
)
{
if
(
Objects
.
nonNull
(
bizType
)
&&
BizTypeEnum
.
ADVANCE_ORDER
.
getBizType
().
compareTo
(
bizType
)
==
0
)
{
request
.
setBizType
(
BizTypeEnum
.
ADVANCE_ORDER
.
getBizType
());
request
.
setBizType
(
BizTypeEnum
.
ADVANCE_ORDER
.
getBizType
());
}
else
{
}
else
if
(
Objects
.
nonNull
(
bizType
)
&&
BizTypeEnum
.
MALL
.
getBizType
().
compareTo
(
bizType
)
==
0
)
{
request
.
setBizType
(
BizTypeEnum
.
MALL
.
getBizType
());
}
else
{
// 20210730之前 默认设置为1
// 20210730之前 默认设置为1
request
.
setBizType
(
CommonConstant
.
INTEGER_ONE
);
request
.
setBizType
(
CommonConstant
.
INTEGER_ONE
);
}
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
View file @
33bb2ed9
...
@@ -282,6 +282,8 @@ public class MallOrderServiceImpl implements MallOrderService {
...
@@ -282,6 +282,8 @@ public class MallOrderServiceImpl implements MallOrderService {
baseCreateOrderRequest
=
getProductCustomerCode
(
baseCreateOrderRequest
);
baseCreateOrderRequest
=
getProductCustomerCode
(
baseCreateOrderRequest
);
//保存门店渠道信息
//保存门店渠道信息
baseCreateOrderRequest
.
setOrderExtended
(
orderExtendedReq
);
baseCreateOrderRequest
.
setOrderExtended
(
orderExtendedReq
);
baseCreateOrderRequest
.
setMarketingType
(
MarketTypeEnum
.
ORDER
.
getIndex
().
byteValue
());
baseCreateOrderRequest
.
setBizType
(
BizTypeEnum
.
MALL
.
getBizType
());
OrderClientType
orderClient
=
OrderClientType
.
SAAS
;
OrderClientType
orderClient
=
OrderClientType
.
SAAS
;
if
(
ChannelEnum
.
TYPE_2
.
getCode
().
equals
(
userLoginInfoDto
.
getChannel
()))
{
if
(
ChannelEnum
.
TYPE_2
.
getCode
().
equals
(
userLoginInfoDto
.
getChannel
()))
{
orderClient
=
OrderClientType
.
ALIPAY
;
orderClient
=
OrderClientType
.
ALIPAY
;
...
...
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