提交代码

service/src/main/java/com/hfkj/service/order/OrderRefundBusiness.java

@@ -90,7 +90,7 @@ public class OrderRefundBusiness {
             gasOrder.setRefundRemarks(refund.getRefundRemark());
             gasOrderService.updateGasOrder(gasOrder);
 
-            if (MerchantSourceTypeEnum.type1.getNumber().equals(gasOrder.getChannelType())) {
+            if (gasOrder.getAgentId() != null && MerchantSourceTypeEnum.type1.getNumber().equals(gasOrder.getChannelType())) {
                 try {
                     // 代理商商户账户退款
                     agentMerAccountService.refund(gasOrder.getAgentId(), gasOrder.getMerNo(), gasOrder.getGasRefuelPrice(), refund);