Commit 5042860e by vega

feat:createOrder:新增银联礼品卡支付方式,暂存,合并到dev,给前端

parent 4fe245a5
<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
<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
<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
...@@ -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("10400", "银联礼品卡支付"), UPC("10031", "银联"),
ALIPAY("10300", "支付宝"), ALIPAY("10300", "支付宝"),
WXPAY("10211", "微信"); WXPAY("10211", "微信");
......
...@@ -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());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment