电子风味卡对特殊返回进行展示

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

@@ -1822,9 +1822,9 @@ public class OrderServiceImpl implements Orderservice {
             BaseResponse baseResponse = failPreOrderPay(LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getProductOrderBean(), cardCode, createPrepayRequestDto.getOrderClient(),
                     Objects.isNull(orderPayResponse) ? null : orderPayResponse.getMsg());
             // 电子风味卡需要给用户特殊的返回
-            if (totalAmount > 0 && Objects.nonNull(createPrepayRequestDto.getUnionPayCard()) && Objects.nonNull(orderPayResponse) &&
-                    (ResponseCodeConstant.PASSWORD_WRONG.equals(orderPayResponse.getPayTransId()) || ResponseCodeConstant.NOT_SUFFICIENT_FUND.equals(orderPayResponse.getPayTransId()))) {
-                baseResponse.setMessage(orderPayResponse.getMsg());
+            if (totalAmount > 0 && Objects.nonNull(createPrepayRequestDto.getUnionPayCard()) && Objects.nonNull(orderPayResponse)) {
+                baseResponse.setMessage((ResponseCodeConstant.PASSWORD_WRONG.equals(orderPayResponse.getPayTransId()) || ResponseCodeConstant.NOT_SUFFICIENT_FUND.equals(orderPayResponse.getPayTransId())) ?
+                        orderPayResponse.getMsg() : "支付失败");
             }
             return baseResponse;
         }
@@ -2302,9 +2302,9 @@ public class OrderServiceImpl implements Orderservice {
             BaseResponse baseResponse = failPreOrderPay(LogThreadLocal.getTrackingNo(), productOrderBean, createOrderVo.getCardCode(), null,
                     Objects.isNull(orderPayResponse) ? null : orderPayResponse.getMsg());
             // 电子风味卡需要给用户特殊的返回
-            if (totalAmount > 0 && Objects.nonNull(createOrderVo.getUnionPayCard()) && Objects.nonNull(orderPayResponse) &&
-                    (ResponseCodeConstant.PASSWORD_WRONG.equals(orderPayResponse.getPayTransId()) || ResponseCodeConstant.NOT_SUFFICIENT_FUND.equals(orderPayResponse.getPayTransId()))) {
-                baseResponse.setMessage(orderPayResponse.getMsg());
+            if (totalAmount > 0 && Objects.nonNull(createOrderVo.getUnionPayCard()) && Objects.nonNull(orderPayResponse)) {
+                baseResponse.setMessage((ResponseCodeConstant.PASSWORD_WRONG.equals(orderPayResponse.getPayTransId()) || ResponseCodeConstant.NOT_SUFFICIENT_FUND.equals(orderPayResponse.getPayTransId())) ?
+                        orderPayResponse.getMsg() : "支付失败");
             }
             return baseResponse;
         }