Merge branch 'feature/2020-1104-混合支付' into qa

f6e51df1 · xiaoer.li@freemud.com · 95e7462e · e3c767a7 · f6e51df1
Commit f6e51df1 authored Nov 18, 2020 by xiaoer.li@freemud.com
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletions

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+5 -1

No files found.
--- a/order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+++ b/order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
@@ -2304,7 +2304,11 @@ public class OrderServiceImpl implements Orderservice {
        }
        if (totalAmount > 0 && StringUtils.isBlank(cardCode) && Objects.isNull(createPrepayRequestDto.getUnionPayCard())) {
            createOrderResponse.setPaySuccess(false);
-        } else {
+        }
+        else if (totalAmount > 0 && StringUtils.isNotBlank(cardCode)) {
+            createOrderResponse.setPaySuccess(false);
+        }
+        else {
            createOrderResponse.setPaySuccess(true);
        }
        // 推荐优惠插件用户下单数据上报