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

Merge branch 'feature/售后单记录支付信息' of https://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -84,7 +84,7 @@ public class OrderCancelReqAdapter {
         payRefundItem.setRefundTradeNo(request.getRefundTradeNo());
         if (StringUtils.isNotBlank(request.getCashType())) {
             payRefundItem.setPayChannelType(Integer.valueOf(request.getCashType()));
-            payRefundItem.setPayChannelName(CashTypeEnum.getByCode(request.getCashType()) == null ? null : CashTypeEnum.getByCode(request.getCashType()).getDesc());
+            payRefundItem.setPayChannelName(CashTypeEnum.getByCode(request.getCashType()) == null ? "其他" : CashTypeEnum.getByCode(request.getCashType()).getDesc());
         } else {
             payRefundItem.setPayChannelType(PayMethodEnum.getIndexByCode(request.getPayMethodCode()));
             payRefundItem.setPayChannelName(PayMethodEnum.getDescByCode(request.getPayMethodCode()));

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

@@ -2,6 +2,7 @@ package com.freemud.application.sdk.api.ordercenter.enums;
 
 public enum CashTypeEnum {
 
+    OTHER("10", "其他"),
     HLM("50", "汇来米"),
     SQB("51", "收钱吧"),
     CASH("52", "现金");