退款明细支付方式错误

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

@@ -12,6 +12,7 @@ import com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq;
 import com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundResponse;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 
 import java.util.ArrayList;
@@ -42,7 +43,7 @@ public class OrderCancelReqAdapter {
 
     public static PayRefundResponse.PayRefundItem convert(OrderRefundResponse orderRefundData) {
         PayRefundResponse.PayRefundItem refundItem = new PayRefundResponse.PayRefundItem();
-        if (orderRefundData.getCashType() != null) {
+        if (StringUtils.isNotBlank(orderRefundData.getCashType())) {
             refundItem.setPayChannelType(Integer.valueOf(orderRefundData.getCashType()));
             refundItem.setPayChannelName(CashTypeEnum.getByCode(orderRefundData.getCashType()).getDesc());
         } else {
@@ -61,7 +62,7 @@ public class OrderCancelReqAdapter {
         return orderRefundList.stream()
                 .map(r -> {
                     PayRefundResponse.PayRefundItem refundItem = new PayRefundResponse.PayRefundItem();
-                    if (r.getCashType() != null) {
+                    if (StringUtils.isNotBlank(r.getCashType())) {
                         refundItem.setPayChannelType(Integer.valueOf(r.getCashType()));
                         refundItem.setPayChannelName(CashTypeEnum.getByCode(r.getCashType()).getDesc());
                     } else {
@@ -81,7 +82,7 @@ public class OrderCancelReqAdapter {
         List<PayRefundResponse.PayRefundItem> payRefundItemList = Lists.newArrayList();
         PayRefundResponse.PayRefundItem payRefundItem = new PayRefundResponse.PayRefundItem();
         payRefundItem.setRefundTradeNo(request.getRefundTradeNo());
-        if (request.getCashType() != null) {
+        if (StringUtils.isNotBlank(request.getCashType())) {
             payRefundItem.setPayChannelType(Integer.valueOf(request.getCashType()));
             payRefundItem.setPayChannelName(CashTypeEnum.getByCode(request.getCashType()).getDesc());
         } else {