no message

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/OrderBaseController.java

@@ -163,13 +163,13 @@ public class OrderBaseController {
 
     @PostMapping("/reject")
     @ApiOperation(value = "驳回工单")
-    public ResponseHelper reject(@RequestParam String orderBaseId,@RequestParam String createWebsitId,@RequestParam String createWebsitName) throws InterruptedException {
+    public ResponseHelper reject(@RequestParam String orderBaseId) throws InterruptedException {
         Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + orderBaseId);
         if(!obtain.tryLock(10,TimeUnit.SECONDS)){
             throw new RemoteServiceException("系统繁忙,请稍后再试");
         }
         try{
-            orderBaseLogic.reject(orderBaseId,createWebsitId,createWebsitName);
+            orderBaseLogic.reject(orderBaseId);
         }finally {
             obtain.unlock();
         }

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -1,6 +1,7 @@
 package com.gree.mall.manager.logic.workorder;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -889,7 +890,7 @@ public class OrderBaseLogic {
      * @param orderBaseId
      */
     @Transactional
-    public void reject(String orderBaseId, String createWebsitId, String createWebsitName) {
+    public void reject(String orderBaseId) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
         if (pgOrderBase == null) {
@@ -905,7 +906,14 @@ public class OrderBaseLogic {
         pgOrderBase.setOrderStatus(OrderBaseStatusEnum.FWZ.getKey());
         pgOrderBase.setOrderStatusText(OrderBaseStatusEnum.FWZ.getRemark());
         pgOrderBase.updateById();
-        orderLogLogic.addLog(orderBaseId, "未完工驳回", adminUser.getNickName() + "于" + DateUtil.formatDateTime(new Date()) + "驳回工单到服务中", createWebsitName);
+
+        String optWebsitName = "";
+        if (CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds())) {
+            final AdminWebsit websit = adminWebsitService.getById(adminUser.getAdminWebsitIds().get(0));
+            optWebsitName = websit.getName();
+        }
+
+        orderLogLogic.addLog(orderBaseId, "未完工驳回", adminUser.getNickName() + "于" + DateUtil.formatDateTime(new Date()) + "驳回工单到服务中", optWebsitName);
         //删除标记
         orderFlagLogic.deleteOrderFlag(orderBaseId, OrderFlagEnum.YWG);
         //删除产生的结算数据