新对接支付返回响应数据

order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

@@ -14,7 +14,6 @@ import cn.freemud.management.thirdparty.OMSPaymentClient;
 import cn.freemud.management.util.RedisUtil;
 import cn.freemud.redis.RedisCache;
 import com.alibaba.fastjson.JSONObject;
-import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIappWxappStore;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformIappWxappStoreManager;
 import com.freemud.application.sdk.api.base.BaseResponse;
 import com.freemud.application.sdk.api.log.ErrorLog;
@@ -159,17 +158,16 @@ public class PaymentHandle {
         MultiOrderRefundRequest multiOrderRefundRequest = paymentSdkAdapter.getMultiOrderPayRefundRequest(orderBean, getRefundAmount(orderBean));
         MultiOrderRefundResponse multiOrderRefundResponse = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest, orderBean.getCompanyId());
         String message = "";
-        if (multiOrderRefundResponse == null
-                || multiOrderRefundResponse.getData() == null
-                || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.ORDER_PAY_RESPONSE_SUCCESS.equals(multiOrderRefundResponse.getCode())) {
-            // fisherman 退款异常 也当做 退款中处理
-            refundStatus = PayRefundStatus.RUNNING;
+        if (Objects.isNull(multiOrderRefundResponse) || multiOrderRefundResponse.getCode() != 200) {
+            refundStatus = PayRefundStatus.FAIL;
         } else {
-            List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = multiOrderRefundResponse.getData().refundPlatformResponseList;
-            if (null != refundPlatformResponseList && refundPlatformResponseList.size() > 0) {
+            MultiOrderRefundResponse.RefundPlatform data = multiOrderRefundResponse.getData();
+            if (Objects.isNull(data) || CollectionUtils.isEmpty(data.refundPlatformResponseList)) {
+                refundStatus = PayRefundStatus.FAIL;
+            } else {
+                List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = data.refundPlatformResponseList;
                 redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(refundPlatformResponseList.get(0).getTransId()), orderBean.getOid(), 1L, TimeUnit.DAYS);
-            }
-            if (CollectionUtils.isNotEmpty(refundPlatformResponseList)) {
+
                 long refundError = refundPlatformResponseList.stream()
                         .filter(s -> s.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUNDED_RESULTCODE) != 0
                                 && s.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUND_SUCCESS) != 0)
@@ -191,6 +189,7 @@ public class PaymentHandle {
                 }
             }
         }
+
         PayRefundResponse payRefundResponse = handlePayRefundResponse(refundStatus, multiOrderRefundRequest.getRefundTradeNo());
         if (StringUtils.isNotEmpty(message)) {
             payRefundResponse.setMessage(message);