支付关单内层code判断

order-application-service/src/main/java/cn/freemud/entities/dto/pay/CloseUnifiedOrderResult.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class CloseUnifiedOrderResult {
 
-    private Integer resultCode;
+    private String resultCode;
     private String resultMsg;
 
 }

order-application-service/src/main/java/cn/freemud/entities/dto/pay/PaymentCloseUnifiedOrderResponse.java

-package cn.freemud.entities.dto.pay;
-
-public class PaymentCloseUnifiedOrderResponse {
-
-    private Integer code;
-    private String message;
-    private CloseUnifiedOrderResult data;
-
-}
+//package cn.freemud.entities.dto.pay;
+//
+//public class PaymentCloseUnifiedOrderResponse {
+//
+//    private Integer code;
+//    private String message;
+//    private CloseUnifiedOrderResult data;
+//
+//}

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

@@ -10,10 +10,7 @@ import cn.freemud.entities.dto.coupon.InvalidCouponsRequestDto;
 import cn.freemud.entities.dto.coupon.InvalidCouponsResponseDto;
 import cn.freemud.entities.dto.order.CreateOrderOperateDto;
 import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
-import cn.freemud.entities.dto.pay.PaymentCloseUnifiedOrderRequest;
-import cn.freemud.entities.dto.pay.PaymentCloseUnifiedOrderResponse;
-import cn.freemud.entities.dto.pay.PaymentQueryRequestDto;
-import cn.freemud.entities.dto.pay.PaymentQueryResponseDto;
+import cn.freemud.entities.dto.pay.*;
 import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
@@ -339,8 +336,9 @@ public class AppOrderServiceImpl implements AppOrderService {
                 closeUnifiedOrderRequest.setVer("2");
                 closeUnifiedOrderRequest.setPartnerId(orderBean.getCompanyId());
                 closeUnifiedOrderRequest.setStoreId(orderBean.getShopId());
-                com.freemud.application.sdk.api.base.BaseResponse<PaymentCloseUnifiedOrderResponse> cancelNewUnifiedOrder = payServiceimpl.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
-                if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getCode())) {
+                com.freemud.application.sdk.api.base.BaseResponse<CloseUnifiedOrderResult> cancelNewUnifiedOrder = payServiceimpl.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
+                if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getCode())
+                        || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getData().getResultCode())) {
                     throw new ServiceException(ResponseResult.ORDER_PRE_PAYMENT_CLOSE_FAILED);
                 }
             }

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

@@ -7,10 +7,7 @@ import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.UpdateReserveOrderResponseVo;
 import cn.freemud.entities.bo.CreateOrderBONew;
 import cn.freemud.entities.dto.*;
-import cn.freemud.entities.dto.pay.PaymentCloseUnifiedOrderRequest;
-import cn.freemud.entities.dto.pay.PaymentCloseUnifiedOrderResponse;
-import cn.freemud.entities.dto.pay.PaymentQueryRequestDto;
-import cn.freemud.entities.dto.pay.PaymentQueryResponseDto;
+import cn.freemud.entities.dto.pay.*;
 import cn.freemud.entities.dto.pay.svc.SVCCardAmountRequestDto;
 import cn.freemud.entities.dto.pay.svc.SVCCardAmountResponseDto;
 import cn.freemud.entities.dto.promotion.CouponPromotionDto;
@@ -587,9 +584,10 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
                     closeUnifiedOrderRequest.setVer("2");
                     closeUnifiedOrderRequest.setPartnerId(assortmentCustomerInfoVo.getPartnerId());
                     closeUnifiedOrderRequest.setStoreId(assortmentCustomerInfoVo.getStoreId());
-                    com.freemud.application.sdk.api.base.BaseResponse<PaymentCloseUnifiedOrderResponse> cancelNewUnifiedOrder = payService.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
-                    if(ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),cancelNewUnifiedOrder.getCode())){
-                        return ResponseUtil.error(ResponseResult.ENCIRCLEORDER_PRE_PAYMENT_CLOSE_FAILED);
+                    com.freemud.application.sdk.api.base.BaseResponse<CloseUnifiedOrderResult> cancelNewUnifiedOrder = payService.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
+                    if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getCode())
+                            || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getData().getResultCode())) {
+                        throw new ServiceException(ResponseResult.ORDER_PRE_PAYMENT_CLOSE_FAILED);
                     }
                 }
             }

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

@@ -848,7 +848,7 @@ public class PayServiceImpl {
     /**
      * 关闭预支付订单
      */
-    public com.freemud.application.sdk.api.base.BaseResponse<PaymentCloseUnifiedOrderResponse> cancelNewUnifiedOrder( PaymentCloseUnifiedOrderRequest request){
+    public com.freemud.application.sdk.api.base.BaseResponse<CloseUnifiedOrderResult> cancelNewUnifiedOrder( PaymentCloseUnifiedOrderRequest request){
         return paymentNewClient.cancelNewUnifiedOrder(request);
     }
 
@@ -944,8 +944,9 @@ public class PayServiceImpl {
             closeUnifiedOrderRequest.setVer("2");
             closeUnifiedOrderRequest.setPartnerId(orderBean.getCompanyId());
             closeUnifiedOrderRequest.setStoreId(orderBean.getShopId());
-            com.freemud.application.sdk.api.base.BaseResponse<PaymentCloseUnifiedOrderResponse> cancelNewUnifiedOrder = this.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
-            if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getCode())) {
+            com.freemud.application.sdk.api.base.BaseResponse<CloseUnifiedOrderResult> cancelNewUnifiedOrder = this.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
+            if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getCode())
+                    || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getData().getResultCode())) {
                 throw new ServiceException(ResponseResult.ORDER_PRE_PAYMENT_CLOSE_FAILED);
             }
         }
@@ -983,8 +984,9 @@ public class PayServiceImpl {
                 closeUnifiedOrderRequest.setVer("2");
                 closeUnifiedOrderRequest.setPartnerId(orderBean.getCompanyId());
                 closeUnifiedOrderRequest.setStoreId(orderBean.getShopId());
-                com.freemud.application.sdk.api.base.BaseResponse<PaymentCloseUnifiedOrderResponse> cancelNewUnifiedOrder = this.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
-                if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getCode())) {
+                com.freemud.application.sdk.api.base.BaseResponse<CloseUnifiedOrderResult> cancelNewUnifiedOrder = this.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
+                if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getCode())
+                        || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getData().getResultCode())) {
                     throw new ServiceException(ResponseResult.ORDER_PRE_PAYMENT_CLOSE_FAILED);
                 }
             }

order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentNewClient.java

@@ -68,7 +68,7 @@ public interface PaymentNewClient {
      */
     @LogIgnoreFeign(logMessage="payClose")
     @PostMapping("paymentcenter/close")
-    com.freemud.application.sdk.api.base.BaseResponse<PaymentCloseUnifiedOrderResponse> cancelNewUnifiedOrder(@RequestBody PaymentCloseUnifiedOrderRequest request);
+    com.freemud.application.sdk.api.base.BaseResponse<CloseUnifiedOrderResult> cancelNewUnifiedOrder(@RequestBody PaymentCloseUnifiedOrderRequest request);
 
     /**
      * 支付查询