商户端订单一键报警接口

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

@@ -67,7 +67,7 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, Alarm> implem
         Long merchantId = this.getCurrentUserId();
 
         LambdaQueryWrapper<TOrder> queryWrapper = Wrappers.lambdaQuery(TOrder.class)
-                .eq(TOrder::getOrderNo, dto.getOrderNo())
+                .eq(TOrder::getOrderNo, dto.getOrderId())
                 .eq(TOrder::getIsDelete, NOT_DELETE);
 
         TOrder order = this.orderService.getOne(queryWrapper);
@@ -92,7 +92,7 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, Alarm> implem
         alarm.setMerchantPhone(maTechnician.getTePhone());
         alarm.setMerchantSex(maTechnician.getTeSex());
         alarm.setAddress(order.getContactAddressInfo());
-        alarm.setOrderNo(dto.getOrderNo());
+        alarm.setOrderNo(order.getOrderNo());
         alarm.setIsDelete(NOT_DELETE);
         alarm.setAlarmStatus(0);
         alarm.setCreateTime(DateUtils.getNowDate());

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

@@ -11,7 +11,7 @@ import java.io.Serializable;
 public class AlarmSubmitDTO implements Serializable {
     private static final long serialVersionUID = 2402561213882683361L;
 
-    @NotBlank(message = "订单编号不能为空")
-    private String orderNo;
+    @NotBlank(message = "订单id不能为空")
+    private Long orderId;
 
 }