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
5042860e
Commit
5042860e
authored
Aug 21, 2020
by
vega
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:createOrder:新增银联礼品卡支付方式,暂存,合并到dev,给前端
parent
4fe245a5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
2 deletions
+44
-2
.idea/libraries/Maven__com_freemud_application_service_sdk_couponcenter_sdk_1_11_0_SNAPSHOT.xml
+14
-0
.idea/libraries/Maven__com_freemud_application_service_sdk_sdk_common_base_1_5_2_RELEASE.xml
+14
-0
.idea/libraries/Maven__com_freemud_application_service_sdk_storecenter_sdk_3_1_1_RELEASE.xml
+14
-0
order-application-service/src/main/java/cn/freemud/enums/PayChannel.java
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1
-1
No files found.
.idea/libraries/Maven__com_freemud_application_service_sdk_couponcenter_sdk_1_11_0_SNAPSHOT.xml
0 → 100644
View file @
5042860e
<component
name=
"libraryTable"
>
<library
name=
"Maven: com.freemud.application.service.sdk:couponcenter-sdk:1.11.0-SNAPSHOT"
>
<CLASSES>
<root
url=
"jar://$MAVEN_REPOSITORY$/com/freemud/application/service/sdk/couponcenter-sdk/1.11.0-SNAPSHOT/couponcenter-sdk-1.11.0-20200813.082311-2.jar!/"
/>
</CLASSES>
<JAVADOC>
<root
url=
"jar://$MAVEN_REPOSITORY$/com/freemud/application/service/sdk/couponcenter-sdk/1.11.0-SNAPSHOT/couponcenter-sdk-1.11.0-20200813.082311-2-javadoc.jar!/"
/>
</JAVADOC>
<SOURCES>
<root
url=
"jar://$MAVEN_REPOSITORY$/com/freemud/application/service/sdk/couponcenter-sdk/1.11.0-SNAPSHOT/couponcenter-sdk-1.11.0-20200813.082311-2-sources.jar!/"
/>
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_freemud_application_service_sdk_sdk_common_base_1_5_2_RELEASE.xml
0 → 100644
View file @
5042860e
<component
name=
"libraryTable"
>
<library
name=
"Maven: com.freemud.application.service.sdk:sdk-common-base:1.5.2.RELEASE"
>
<CLASSES>
<root
url=
"jar://$MAVEN_REPOSITORY$/com/freemud/application/service/sdk/sdk-common-base/1.5.2.RELEASE/sdk-common-base-1.5.2.RELEASE.jar!/"
/>
</CLASSES>
<JAVADOC>
<root
url=
"jar://$MAVEN_REPOSITORY$/com/freemud/application/service/sdk/sdk-common-base/1.5.2.RELEASE/sdk-common-base-1.5.2.RELEASE-javadoc.jar!/"
/>
</JAVADOC>
<SOURCES>
<root
url=
"jar://$MAVEN_REPOSITORY$/com/freemud/application/service/sdk/sdk-common-base/1.5.2.RELEASE/sdk-common-base-1.5.2.RELEASE-sources.jar!/"
/>
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_freemud_application_service_sdk_storecenter_sdk_3_1_1_RELEASE.xml
0 → 100644
View file @
5042860e
<component
name=
"libraryTable"
>
<library
name=
"Maven: com.freemud.application.service.sdk:storecenter-sdk:3.1.1.RELEASE"
>
<CLASSES>
<root
url=
"jar://$MAVEN_REPOSITORY$/com/freemud/application/service/sdk/storecenter-sdk/3.1.1.RELEASE/storecenter-sdk-3.1.1.RELEASE.jar!/"
/>
</CLASSES>
<JAVADOC>
<root
url=
"jar://$MAVEN_REPOSITORY$/com/freemud/application/service/sdk/storecenter-sdk/3.1.1.RELEASE/storecenter-sdk-3.1.1.RELEASE-javadoc.jar!/"
/>
</JAVADOC>
<SOURCES>
<root
url=
"jar://$MAVEN_REPOSITORY$/com/freemud/application/service/sdk/storecenter-sdk/3.1.1.RELEASE/storecenter-sdk-3.1.1.RELEASE-sources.jar!/"
/>
</SOURCES>
</library>
</component>
\ No newline at end of file
order-application-service/src/main/java/cn/freemud/enums/PayChannel.java
View file @
5042860e
...
@@ -15,7 +15,7 @@ package cn.freemud.enums;
...
@@ -15,7 +15,7 @@ package cn.freemud.enums;
public
enum
PayChannel
{
public
enum
PayChannel
{
SVC
(
"10102"
,
"svc卡支付"
),
SVC
(
"10102"
,
"svc卡支付"
),
UPC
(
"10
400"
,
"银联礼品卡支付
"
),
UPC
(
"10
031"
,
"银联
"
),
ALIPAY
(
"10300"
,
"支付宝"
),
ALIPAY
(
"10300"
,
"支付宝"
),
WXPAY
(
"10211"
,
"微信"
);
WXPAY
(
"10211"
,
"微信"
);
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
5042860e
...
@@ -2281,7 +2281,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2281,7 +2281,7 @@ public class OrderServiceImpl implements Orderservice {
QueryOrdersResponse
.
DataBean
.
OrderBean
productOrderBean
=
operateDto
.
getProductOrderBean
();
QueryOrdersResponse
.
DataBean
.
OrderBean
productOrderBean
=
operateDto
.
getProductOrderBean
();
//支付-- 包含商品券无需支付、唤起微信支付、储值卡支付直接支付、扫脸支付
//支付-- 包含商品券无需支付、唤起微信支付、储值卡支付直接支付、扫脸支付
OrderPayResponse
orderPayResponse
=
pay
(
userLoginInfoDto
,
createOrderVo
,
totalAmount
,
cardAmount
,
fatherOrderBean
);
OrderPayResponse
orderPayResponse
=
pay
(
userLoginInfoDto
,
createOrderVo
,
totalAmount
,
cardAmount
,
fatherOrderBean
);
// 默认支付成功必有非码订单号
,不管成功与否,orderPayResponse都是不空的.此处是防御式处理
// 默认支付成功必有非码订单号
if
(
orderPayResponse
==
null
||
Objects
.
isNull
(
orderPayResponse
.
getFmId
()))
{
if
(
orderPayResponse
==
null
||
Objects
.
isNull
(
orderPayResponse
.
getFmId
()))
{
if
(
createOrderVo
.
getFaceCode
()
!=
null
){
if
(
createOrderVo
.
getFaceCode
()
!=
null
){
createOrderVo
.
setCardCode
(
createOrderVo
.
getFaceCode
());
createOrderVo
.
setCardCode
(
createOrderVo
.
getFaceCode
());
...
...
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