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
b20da039
Commit
b20da039
authored
Dec 29, 2020
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
卖券订单添加支付渠道
parent
b5bb3ae0
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
order-application-service/src/main/java/cn/freemud/entities/vo/SellCouponCreateOrderVo.java
+0
-4
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+2
-1
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
+5
-2
No files found.
order-application-service/src/main/java/cn/freemud/entities/vo/SellCouponCreateOrderVo.java
View file @
b20da039
...
@@ -59,10 +59,6 @@ public class SellCouponCreateOrderVo {
...
@@ -59,10 +59,6 @@ public class SellCouponCreateOrderVo {
// @NotEmpty(message = "version 版本号不能为空")
// @NotEmpty(message = "version 版本号不能为空")
private
String
version
;
private
String
version
;
/**
* 下单支付渠道类型
*/
private
Byte
payChannelType
;
/**
/**
* 渠道 1 saas 2 img 爱马哥 默认saas 3. iwc i围餐
* 渠道 1 saas 2 img 爱马哥 默认saas 3. iwc i围餐
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
b20da039
...
@@ -2200,7 +2200,8 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2200,7 +2200,8 @@ public class OrderServiceImpl implements Orderservice {
orderClient
=
OrderClientType
.
APP
;
orderClient
=
OrderClientType
.
APP
;
}
}
//抖音小程序
//抖音小程序
if
(
PayChannelType
.
TIKTOKPAY
.
getIndex
().
equals
(
createOrderVo
.
getPayChannelType
())
&&
"5"
.
equalsIgnoreCase
(
createOrderVo
.
getChannel
()))
{
if
(
"5"
.
equalsIgnoreCase
(
createOrderVo
.
getChannel
()))
{
createOrderVo
.
setPayChannelType
(
PayChannelType
.
TIKTOKPAY
.
getIndex
());
orderClient
=
OrderClientType
.
TIKTOKPAY
;
orderClient
=
OrderClientType
.
TIKTOKPAY
;
}
}
long
totalAmount
=
0
;
long
totalAmount
=
0
;
...
...
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
View file @
b20da039
...
@@ -295,7 +295,8 @@ public class SellCouponOrderServiceImpl {
...
@@ -295,7 +295,8 @@ public class SellCouponOrderServiceImpl {
orderClient
=
OrderClientType
.
APP
.
getIndex
();
orderClient
=
OrderClientType
.
APP
.
getIndex
();
}
}
//抖音小程序
//抖音小程序
if
(
PayChannelType
.
TIKTOKPAY
.
getIndex
().
equals
(
requestVo
.
getPayChannelType
())
&&
"5"
.
equalsIgnoreCase
(
requestVo
.
getChannel
()))
{
if
(
"5"
.
equalsIgnoreCase
(
requestVo
.
getChannel
()))
{
request
.
setPayChannel
(
PayChannelType
.
TIKTOKPAY
.
getIndex
().
toString
());
orderClient
=
OrderClientType
.
TIKTOKPAY
.
getIndex
();
orderClient
=
OrderClientType
.
TIKTOKPAY
.
getIndex
();
}
}
String
partnerId
=
userLoginInfoDto
.
getPartnerId
();
String
partnerId
=
userLoginInfoDto
.
getPartnerId
();
...
@@ -382,7 +383,9 @@ public class SellCouponOrderServiceImpl {
...
@@ -382,7 +383,9 @@ public class SellCouponOrderServiceImpl {
request
.
setOrderExtended
(
orderAdapter
.
saveStoreInfo
(
storeInfo
));
request
.
setOrderExtended
(
orderAdapter
.
saveStoreInfo
(
storeInfo
));
request
.
setOperator
(
userLoginInfoDto
.
getNickName
());
request
.
setOperator
(
userLoginInfoDto
.
getNickName
());
request
.
setAppId
(
userLoginInfoDto
.
getWxAppId
());
request
.
setAppId
(
userLoginInfoDto
.
getWxAppId
());
request
.
setPayChannelType
(
requestVo
.
getPayChannelType
());
if
(
"5"
.
equalsIgnoreCase
(
requestVo
.
getChannel
().
toString
())){
request
.
setPayChannelType
(
PayChannelType
.
TIKTOKPAY
.
getIndex
());
}
request
.
setPayChannel
(
requestVo
.
getChannel
());
request
.
setPayChannel
(
requestVo
.
getChannel
());
return
request
;
return
request
;
...
...
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