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
aaafffb4
Commit
aaafffb4
authored
Nov 08, 2021
by
查志伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix problem
parent
b846b325
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+4
-1
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+4
-5
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
aaafffb4
...
@@ -659,25 +659,28 @@ public class OrderSdkAdapter {
...
@@ -659,25 +659,28 @@ public class OrderSdkAdapter {
for
(
int
i
=
0
;
i
<
queryOrdersRequest
.
getSource
().
length
;
i
++)
{
for
(
int
i
=
0
;
i
<
queryOrdersRequest
.
getSource
().
length
;
i
++)
{
if
(
"saas"
.
equals
(
queryOrdersRequest
.
getSource
()[
i
]))
{
if
(
"saas"
.
equals
(
queryOrdersRequest
.
getSource
()[
i
]))
{
orderClients
.
add
(
OrderClientType
.
SAAS
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
SAAS
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
ALIPAY
.
getIndex
());
}
}
else
if
(
"meals"
.
equals
(
queryOrdersRequest
.
getSource
()[
i
]))
{
else
if
(
"meals"
.
equals
(
queryOrdersRequest
.
getSource
()[
i
]))
{
orderClients
.
add
(
OrderClientType
.
WAI_MEAL
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
WAI_MEAL
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
ALIPAY
.
getIndex
());
}
}
else
if
(
"saasmall"
.
equals
(
queryOrdersRequest
.
getSource
()[
i
]))
{
else
if
(
"saasmall"
.
equals
(
queryOrdersRequest
.
getSource
()[
i
]))
{
orderClients
.
add
(
OrderClientType
.
SAASMALL
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
SAASMALL
.
getIndex
());
}
}
else
if
(
"app"
.
equals
(
queryOrdersRequest
.
getSource
()[
i
]))
{
else
if
(
"app"
.
equals
(
queryOrdersRequest
.
getSource
()[
i
]))
{
orderClients
.
add
(
OrderClientType
.
APP
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
APP
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
ALIPAY
.
getIndex
());
}
}
else
if
(
"beautiful"
.
equals
(
queryOrdersRequest
.
getSource
()[
i
]))
{
else
if
(
"beautiful"
.
equals
(
queryOrdersRequest
.
getSource
()[
i
]))
{
orderClients
.
add
(
OrderClientType
.
BEAUTIFUL
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
BEAUTIFUL
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
ALIPAY
.
getIndex
());
}
}
else
if
(
"cashier"
.
equals
(
queryOrdersRequest
.
getSource
()[
i
]))
{
else
if
(
"cashier"
.
equals
(
queryOrdersRequest
.
getSource
()[
i
]))
{
orderClients
.
add
(
OrderClientType
.
CASHIER
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
CASHIER
.
getIndex
());
}
}
}
}
orderClients
.
add
(
OrderClientType
.
TIKTOKPAY
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
TIKTOKPAY
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
ALIPAY
.
getIndex
());
orderConditionsReq
.
setOrderClients
(
orderClients
);
orderConditionsReq
.
setOrderClients
(
orderClients
);
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
try
{
try
{
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
aaafffb4
...
@@ -4262,23 +4262,22 @@ public class OrderAdapter {
...
@@ -4262,23 +4262,22 @@ public class OrderAdapter {
List
<
Integer
>
orderClients
=
new
ArrayList
<>();
List
<
Integer
>
orderClients
=
new
ArrayList
<>();
if
(
OrderChannelType
.
IWC
.
getCode
().
equals
(
channelType
))
{
if
(
OrderChannelType
.
IWC
.
getCode
().
equals
(
channelType
))
{
orderClients
.
add
(
OrderClientType
.
WAI_MEAL
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
WAI_MEAL
.
getIndex
());
//queryOrdersDto.setSource(new String[]{"meals"}
);
orderClients
.
add
(
OrderClientType
.
ALIPAY
.
getIndex
()
);
}
else
if
(
OrderChannelType
.
SAASMALL
.
getCode
().
equals
(
channelType
))
{
}
else
if
(
OrderChannelType
.
SAASMALL
.
getCode
().
equals
(
channelType
))
{
orderClients
.
add
(
OrderClientType
.
SAASMALL
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
SAASMALL
.
getIndex
());
//queryOrdersDto.setSource(new String[]{"saasmall"});
}
else
if
(
OrderChannelType
.
APP
.
getCode
().
equals
(
channelType
))
{
}
else
if
(
OrderChannelType
.
APP
.
getCode
().
equals
(
channelType
))
{
orderClients
.
add
(
OrderClientType
.
APP
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
APP
.
getIndex
());
//queryOrdersDto.setSource(new String[]{"app"}
);
orderClients
.
add
(
OrderClientType
.
ALIPAY
.
getIndex
()
);
}
else
if
(
OrderChannelType
.
BEAUTIFUL
.
getCode
().
equals
(
channelType
))
{
// 美业新加
}
else
if
(
OrderChannelType
.
BEAUTIFUL
.
getCode
().
equals
(
channelType
))
{
// 美业新加
orderClients
.
add
(
OrderClientType
.
BEAUTIFUL
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
BEAUTIFUL
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
ALIPAY
.
getIndex
());
}
else
if
(
OrderChannelType
.
CASHIER
.
getCode
().
equals
(
channelType
))
{
}
else
if
(
OrderChannelType
.
CASHIER
.
getCode
().
equals
(
channelType
))
{
orderClients
.
add
(
OrderClientType
.
CASHIER
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
CASHIER
.
getIndex
());
}
else
{
}
else
{
orderClients
.
add
(
OrderClientType
.
SAAS
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
SAAS
.
getIndex
());
//queryOrdersDto.setSource(new String[]{"saas"}
);
orderClients
.
add
(
OrderClientType
.
ALIPAY
.
getIndex
()
);
}
}
orderClients
.
add
(
OrderClientType
.
TIKTOKPAY
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
TIKTOKPAY
.
getIndex
());
orderClients
.
add
(
OrderClientType
.
ALIPAY
.
getIndex
());
queryOrdersDto
.
setOrderClients
(
orderClients
);
queryOrdersDto
.
setOrderClients
(
orderClients
);
List
<
Integer
>
payStatus
=
new
ArrayList
<>();
List
<
Integer
>
payStatus
=
new
ArrayList
<>();
...
...
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