Merge remote-tracking branch 'origin/dev' into dev

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

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

@@ -1,22 +1,22 @@
 package com.ylx.massage.service.impl;
+
+
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.common.utils.StringUtils;
 import com.ylx.massage.domain.Alarm;
-import com.ylx.massage.domain.MaTechnician;
-import com.ylx.massage.domain.vo.AlarmListVO;
 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;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -36,21 +36,17 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, Alarm> implem
 
     @Resource
     private TOrderService orderService;
-    @Resource
-    private IMaTechnicianService maTechnicianService;
 
     @Override
-    public Page<AlarmListVO> selectAlarmPage(Page<AlarmListVO> page, Alarm alarm) {
-        Alarm query = buildAlarmPageQuery(alarm);
-        return this.baseMapper.selectAlarmPage(page, query);
+    public Alarm queryById(String id) {
+        return null;
     }
 
     @Override
-    public Alarm queryById(String id) {
+    public Page<Alarm> queryByPage(Alarm alarm, PageRequest pageRequest) {
         return null;
     }
 
-
     @Override
     public Alarm update(Alarm alarm) {
         return null;
@@ -65,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())
@@ -80,56 +78,16 @@ 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);
     }
-
-    private Alarm buildAlarmPageQuery(Alarm alarm) {
-        Alarm query = new Alarm();
-        if (alarm == null) {
-            return query;
-        }
-        query.setMerchantName(alarm.getMerchantName());
-        query.setMerchantNickName(alarm.getMerchantNickName());
-        query.setMerchantSex(alarm.getMerchantSex());
-        query.setMerchantPhone(alarm.getMerchantPhone());
-        query.setAlarmStatus(alarm.getAlarmStatus());
-        query.setBeginTime(normalizeBeginTime(alarm.getBeginTime()));
-        query.setEndTime(normalizeEndTime(alarm.getEndTime()));
-        return query;
-    }
-
-    private String normalizeBeginTime(String beginTime) {
-        if (StringUtils.isBlank(beginTime)) {
-            return null;
-        }
-        String value = beginTime.trim();
-        return value.length() == 10 ? value + " 00:00:00" : value;
-    }
-
-    private String normalizeEndTime(String endTime) {
-        if (StringUtils.isBlank(endTime)) {
-            return null;
-        }
-        String value = endTime.trim();
-        return value.length() == 10 ? value + " 23:59:59" : value;
-    }
 }