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 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());