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

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

@@ -66,11 +66,10 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, Alarm> implem
     public Boolean submitAlarm(AlarmSubmitDTO dto) {
 
         WxLoginUser wxLoginUser = this.getCurrentWxLoginUser();
-        Long merchantId = Long.parseLong(getCurrentWxLoginUser().getId());
-
+        Long merchantId = Long.parseLong(wxLoginUser.getId());
 
         LambdaQueryWrapper<TOrder> queryWrapper = Wrappers.lambdaQuery(TOrder.class)
-                .eq(TOrder::getOrderNo, dto.getOrderId())
+                .eq(TOrder::getId, dto.getOrderId())
                 .eq(TOrder::getIsDelete, NOT_DELETE);
 
         TOrder order = this.orderService.getOne(queryWrapper);

nightFragrance-massage/src/main/java/com/ylx/order/domain/dto/AlarmSubmitDTO.java

@@ -3,7 +3,7 @@ package com.ylx.order.domain.dto;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data
@@ -11,7 +11,7 @@ import java.io.Serializable;
 public class AlarmSubmitDTO implements Serializable {
     private static final long serialVersionUID = 2402561213882683361L;
 
-    @NotBlank(message = "订单id不能为空")
+    @NotNull(message = "订单id不能为空")
     private Long orderId;
 
 }

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

@@ -1145,7 +1145,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 
         // 项目表 projectUpdate 字段原子性自增 1
         LambdaUpdateWrapper<Project> projectUpdate = Wrappers.lambdaUpdate(Project.class)
-                .setSql(" = sales_completed + 1")
+                .setSql("sales_completed = sales_completed + 1")
                 .eq(Project::getId, order.getProjectId());
 
         this.projectService.update(null, projectUpdate);
@@ -1190,10 +1190,13 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         }
 
         // 更新到达信息
+        LocalDateTime now = LocalDateTime.now();
         LambdaUpdateWrapper<TOrder> update = Wrappers.lambdaUpdate(TOrder.class)
-                .set(TOrder::getArrivedTime, LocalDateTime.now())
-                .set(TOrder::getUpdateTime, LocalDateTime.now())
+                .set(TOrder::getArrivedTime, now)
+                .set(TOrder::getSignTime, now)
+                .set(TOrder::getUpdateTime, now)
                 .set(TOrder::getUpdateBy, loginUser.getCNickName())
+                .set(TOrder::getArrivalPhoto, StrUtil.join(",", dto.getImageUrls()))
                 .eq(TOrder::getId, orderId)
                 .eq(TOrder::getStatus, status);
         int count = baseMapper.update(null, update);