Merge branch 'feature/1.9.36-新增银联礼品卡支付-肖家炜' into develop

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

@@ -2176,7 +2176,7 @@ public class OrderServiceImpl implements Orderservice {
         if (baseEditResponse != null) {
             return baseEditResponse;
         }
-        if (totalAmount > 0 && StringUtils.isBlank(cardCode)) {
+        if (totalAmount > 0 && StringUtils.isBlank(cardCode) && Objects.isNull(createPrepayRequestDto.getUnionPayCard())) {
             createOrderResponse.setPaySuccess(false);
         } else {
             createOrderResponse.setPaySuccess(true);