Merge branch 'feature/售后单记录支付信息'

order-management/src/main/java/cn/freemud/management/adapter/OrderCancelReqAdapter.java

@@ -45,10 +45,10 @@ public class OrderCancelReqAdapter {
         PayRefundResponse.PayRefundItem refundItem = new PayRefundResponse.PayRefundItem();
         if (StringUtils.isNotBlank(orderRefundData.getCashType())) {
             refundItem.setPayChannelType(Integer.valueOf(orderRefundData.getCashType()));
-            refundItem.setPayChannelName(CashTypeEnum.getByCode(orderRefundData.getCashType()).getDesc());
+            refundItem.setPayChannelName(CashTypeEnum.getByCode(orderRefundData.getCashType()) == null ? null : CashTypeEnum.getByCode(orderRefundData.getCashType()).getDesc());
         } else {
-            refundItem.setPayChannelType(PayMethodEnum.getByCode(orderRefundData.getPayMethodCode()).getIndex());
-            refundItem.setPayChannelName(PayMethodEnum.getByCode(orderRefundData.getPayMethodCode()).getDesc());
+            refundItem.setPayChannelType(PayMethodEnum.getIndexByCode(orderRefundData.getPayMethodCode()));
+            refundItem.setPayChannelName(PayMethodEnum.getDescByCode(orderRefundData.getPayMethodCode()));
         }
         refundItem.setAmount(orderRefundData.getRefundAmount().intValue());
         refundItem.setRefundTradeNo(orderRefundData.getRefundTradeNo());
@@ -64,10 +64,10 @@ public class OrderCancelReqAdapter {
                     PayRefundResponse.PayRefundItem refundItem = new PayRefundResponse.PayRefundItem();
                     if (StringUtils.isNotBlank(r.getCashType())) {
                         refundItem.setPayChannelType(Integer.valueOf(r.getCashType()));
-                        refundItem.setPayChannelName(CashTypeEnum.getByCode(r.getCashType()).getDesc());
+                        refundItem.setPayChannelName(CashTypeEnum.getByCode(r.getCashType()) == null ? null : CashTypeEnum.getByCode(r.getCashType()).getDesc());
                     } else {
-                        refundItem.setPayChannelType(PayMethodEnum.getByCode(r.getPayMethodCode()).getIndex());
-                        refundItem.setPayChannelName(PayMethodEnum.getByCode(r.getPayMethodCode()).getDesc());
+                        refundItem.setPayChannelType(PayMethodEnum.getIndexByCode(r.getPayMethodCode()));
+                        refundItem.setPayChannelName(PayMethodEnum.getDescByCode(r.getPayMethodCode()));
                     }
                     refundItem.setAmount(r.getSettleRefundAmount());
                     refundItem.setRefundTradeNo(r.getRefundTradeNo());
@@ -84,10 +84,10 @@ public class OrderCancelReqAdapter {
         payRefundItem.setRefundTradeNo(request.getRefundTradeNo());
         if (StringUtils.isNotBlank(request.getCashType())) {
             payRefundItem.setPayChannelType(Integer.valueOf(request.getCashType()));
-            payRefundItem.setPayChannelName(CashTypeEnum.getByCode(request.getCashType()).getDesc());
+            payRefundItem.setPayChannelName(CashTypeEnum.getByCode(request.getCashType()) == null ? null : CashTypeEnum.getByCode(request.getCashType()).getDesc());
         } else {
-            payRefundItem.setPayChannelType(PayMethodEnum.getByCode(request.getPayMethodCode()).getIndex());
-            payRefundItem.setPayChannelName(PayMethodEnum.getByCode(request.getPayMethodCode()).getDesc());
+            payRefundItem.setPayChannelType(PayMethodEnum.getIndexByCode(request.getPayMethodCode()));
+            payRefundItem.setPayChannelName(PayMethodEnum.getDescByCode(request.getPayMethodCode()));
         }
         payRefundItem.setAmount(request.getRefundAmount());
         payRefundItem.setRefundTime(DateUtil.convert2Date(request.getRefundTime(), "yyyy-MM-dd HH:mm:ss").getTime());

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

@@ -17,6 +17,7 @@ import cn.freemud.management.thirdparty.OMSPaymentClient;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.base.BaseResponse;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.CashTypeEnum;

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

@@ -10,6 +10,8 @@ import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.util.ResponseUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo;

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -395,6 +395,8 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
             if (PAY_RETURN_FILTER_CODES.contains(baseResponse.getCode())) {
                 return ResponseUtil.error(ResponseResult.getResponseResult(baseResponse.getCode()));
             }
+            ApiLog.infoMessage("商家取消订单失败, 请求json:{} 返回msg:{}", JSONObject.toJSONString(orderBean), baseResponse.getMessage());
+
             emailAlertService.sendEmailAlert("商家取消订单失败", "请求json:" + JSONObject.toJSONString(orderBean) + "返回msg:" + baseResponse.getMessage());
             return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR);
         }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayMethodEnum.java

@@ -33,6 +33,30 @@ public enum PayMethodEnum {
         return null;
     }
 
+    public static Integer getIndexByCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (PayMethodEnum payStatus : values()) {
+            if (payStatus.getCode().equals(code)) {
+                return payStatus.getIndex();
+            }
+        }
+        return null;
+    }
+
+    public static String getDescByCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (PayMethodEnum payStatus : values()) {
+            if (payStatus.getCode().equals(code)) {
+                return payStatus.getDesc();
+            }
+        }
+        return null;
+    }
+
     public String getCode() {
         return code;
     }