From dc5daa769ec4c69a435f49159543fe21972f59fe Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Fri, 4 Nov 2022 14:21:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E7=A7=AF=E5=88=86=E4=B8=93=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cweb/controller/CmsContentController.java  | 1 -
 .../com/hai/service/impl/OutRechargeOrderServiceImpl.java    | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java b/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java
index 04b3e5a4..4f7a63aa 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java
@@ -113,7 +113,6 @@ public class CmsContentController {
                         }
                         Map<String, Object> mapUser = new HashMap<>();
 
-                        mapUser.put("companyId" , companyId);
                         mapUser.put("whereCheck" , false);
                         mapUser.put("msgType" , 1);
                         mapUser.put("userId" , userInfoModel.getHighUser().getId());
diff --git a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
index c3e241c2..1d8c9d47 100644
--- a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
@@ -20,6 +20,7 @@ import com.hai.enum_type.OrderPushType;
 import com.hai.enum_type.RechargePayType;
 import com.hai.model.*;
 import com.hai.order.service.OrderService;
+import com.hai.order.type.OrderRefundOpUserType;
 import com.hai.service.*;
 import com.hai.service.pay.impl.GoodsOrderServiceImpl;
 import io.swagger.models.auth.In;
@@ -814,7 +815,9 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
         }
 
         HighOrder highOrder = highOrderService.getOrderByOrderNo(outRechargeOrder.getOrderNo());
-        orderService.refundOrder(highOrder, "话费自动退款");
+        orderService.refundOrder(highOrder, "话费自动退款",OrderRefundOpUserType.TYPE1,
+                null,
+                "系统自动退款");
         outRechargeOrder.setPayStatus(105);
         outRechargeOrder.setRechargeStatus(203);
         outRechargeOrder.setRefundTime(new Date());