fix:修复线下混合支付退款空指针

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

@@ -45,7 +45,7 @@ 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());
@@ -64,7 +64,7 @@ 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());
@@ -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()).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());

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

@@ -88,7 +88,6 @@ public class PaymentHandle {
             PayRefundResponse multiRefundResponse = multiRefundService.multiRefund(orderBean.getCompanyId(), orderBean.getShopId(), orderBean.getOid(), refundAmount, orderBean.getOrderPayItem());
             if (multiRefundResponse != null) {
                 refundResponse = multiRefundResponse;
-                ApiLog.infoMessage("getCommonPayRefundResponse---1, 返回json:{}", JSONObject.toJSONString(refundResponse));
             }else {
                 OrderExtendedReq extended = orderBean.getOrderExtended();
                 if (StringUtils.isNotBlank(extended.getAgentPayerId()) && !Objects.equals(extended.getAgentPayerId(), orderBean.getUserId())) {

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

@@ -220,7 +220,6 @@ public class SaasOrderHandle {
             });
         }
         cancelOrderRequest.setPayRefundItemList(refundItemList);
-        ApiLog.infoMessage("orderReject---2, 返回json:{}", JSONObject.toJSONString(cancelOrderRequest));
 
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderReject(cancelOrderRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {

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

@@ -222,8 +222,6 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         }
 
         //订单拒单
-        ApiLog.infoMessage("orderReject---1, 返回json:{}", JSONObject.toJSONString(refundResponse));
-
         saasOrderHandle.orderReject(request, refundResponse, orderBean);
         // 推送pos、微信消息中心
         orderBaseService.sendMessage(orderBean, OperateType.ORDER_REJECT, request.getReason());