商户端订单一键报警接口

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/AlarmServiceImpl.java

@@ -5,13 +5,12 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ylx.base.BaseServiceImpl;
+import com.ylx.common.core.domain.model.WxLoginUser;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.common.utils.DateUtils;
 import com.ylx.massage.domain.Alarm;
-import com.ylx.massage.domain.MaTechnician;
 import com.ylx.massage.mapper.AlarmMapper;
 import com.ylx.massage.service.AlarmService;
-import com.ylx.massage.service.IMaTechnicianService;
 import com.ylx.order.domain.TOrder;
 import com.ylx.order.domain.dto.AlarmSubmitDTO;
 import com.ylx.order.service.TOrderService;
@@ -37,8 +36,6 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, Alarm> implem
 
     @Resource
     private TOrderService orderService;
-    @Resource
-    private IMaTechnicianService maTechnicianService;
 
     @Override
     public Alarm queryById(String id) {
@@ -64,7 +61,9 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, Alarm> implem
     @Transactional(rollbackFor = Exception.class)
     public Boolean submitAlarm(AlarmSubmitDTO dto) {
 
-        Long merchantId = this.getCurrentUserId();
+        WxLoginUser wxLoginUser = this.getCurrentWxLoginUser();
+        Long merchantId = Long.parseLong(getCurrentWxLoginUser().getId());
+
 
         LambdaQueryWrapper<TOrder> queryWrapper = Wrappers.lambdaQuery(TOrder.class)
                 .eq(TOrder::getOrderNo, dto.getOrderId())
@@ -79,24 +78,15 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, Alarm> implem
             throw new ServiceException("您无权操作此订单");
         }
 
-        MaTechnician maTechnician = this.maTechnicianService.getById(merchantId);
-        if (ObjectUtil.isNull(maTechnician)) {
-            throw new RuntimeException("商户不存在");
-        }
-
         Alarm alarm = new Alarm();
         alarm.setMerchantId(merchantId.toString());
-        /*alarm.setMerchantName(maTechnician.getTeName());
-        alarm.setMerchantNickName(maTechnician.getTeNickName());
-        alarm.setMerchantAvatar(maTechnician.getTeAvatar());
-        alarm.setMerchantPhone(maTechnician.getTePhone());
-        alarm.setMerchantSex(maTechnician.getTeSex());*/
+        alarm.setOrderId(order.getId());
         alarm.setAddress(order.getContactAddressInfo());
         alarm.setOrderNo(order.getOrderNo());
         alarm.setIsDelete(NOT_DELETE);
         alarm.setAlarmStatus(0);
         alarm.setCreateTime(DateUtils.getNowDate());
-        alarm.setCreateBy(maTechnician.getTeNickName());
+        alarm.setCreateBy(wxLoginUser.getCNickName());
 
         return super.save(alarm);
     }