退款明细支付方式错误

order-management/src/main/java/cn/freemud/management/entities/dto/response/pay/OrderRefundResponse.java

 package cn.freemud.management.entities.dto.response.pay;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -23,4 +24,16 @@ public class OrderRefundResponse {
      */
     private String payCode;
 
+    /**
+     * 支付方式
+     * {@link com.freemud.application.sdk.api.ordercenter.enums.PayMethodEnum}
+     */
+    private String payMethodCode;
+
+    /**
+     * 现金类型， 当payMethodCode为其他的时候，存在该值
+     * {@link com.freemud.application.sdk.api.ordercenter.enums.CashTypeEnum}
+     */
+    private String cashType;
+
 }

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

@@ -18,8 +18,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.base.BaseResponse;
 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;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
-import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
+import com.freemud.application.sdk.api.ordercenter.enums.PayMethodEnum;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
@@ -202,8 +203,13 @@ public class PaymentHandle {
             message = orderRefundResponse.getMessage();
             OrderRefundResponse data = orderRefundResponse.getData();
             PayRefundResponse.PayRefundItem refundItem = new PayRefundResponse.PayRefundItem();
-            refundItem.setPayChannelType(Integer.valueOf(PayChannelType.getByEbcode(data.getPayCode()).getIndex()));
-            refundItem.setPayChannelName(PayChannelType.getByEbcode(data.getPayCode()).getName());
+            if (data.getCashType() != null) {
+                refundItem.setPayChannelType(Integer.valueOf(data.getCashType()));
+                refundItem.setPayChannelName(CashTypeEnum.getByCode(data.getCashType()).getDesc());
+            } else {
+                refundItem.setPayChannelType(PayMethodEnum.getByCode(data.getPayMethodCode()).getIndex());
+                refundItem.setPayChannelName(PayMethodEnum.getByCode(data.getPayMethodCode()).getDesc());
+            }
             refundItem.setAmount(data.getRefundAmount().intValue());
             refundItem.setRefundTradeNo(data.getRefundTradeNo());
             refundItem.setRefundTime(DateUtil.convert2Date(data.getRefundTime(), "yyyy-MM-dd HH:mm:ss").getTime());

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

+package com.freemud.application.sdk.api.ordercenter.enums;
+
+public enum CashTypeEnum {
+
+    HLM("50", "汇来米"),
+    SQB("51", "收钱吧"),
+    CASH("52", "现金");
+
+
+    private String code;
+    private String desc;
+
+    CashTypeEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static CashTypeEnum getByCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (CashTypeEnum cashTypeEnum : values()) {
+            if (cashTypeEnum.getCode().equals(code)) {
+                return cashTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

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

+package com.freemud.application.sdk.api.ordercenter.enums;
+
+public enum PayMethodEnum {
+
+    TZFB("TZFB", "支付宝", 2),
+    TYL("TYL", "银联", 13),
+    TWX("TWX", "微信", 1),
+    TSVC("TSVC", "储值卡", 3),
+    TOTHER("TOTHER", "其他支付", 10),
+    ;
+
+
+    private String code;
+    private Integer index;
+    private String desc;
+
+    PayMethodEnum(String code, String desc, Integer index) {
+        this.code = code;
+        this.desc = desc;
+        this.index = index;
+    }
+
+    public static PayMethodEnum getByCode(String code) {
+        if (code == null) {
+            return null;
+        }
+        for (PayMethodEnum payStatus : values()) {
+            if (payStatus.getCode().equals(code)) {
+                return payStatus;
+            }
+        }
+        return null;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public Integer getIndex() {
+        return index;
+    }
+
+    public void setIndex(Integer index) {
+        this.index = index;
+    }
+}