Commit 6b566d73 by huluobin

美甲师修改预约重复生成订单问题

parent 77927ee7
...@@ -899,6 +899,10 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -899,6 +899,10 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
log.info("更新预约:{}", cmd); log.info("更新预约:{}", cmd);
ScheduleManage scheduleManage = this.setScheduleServe(cmd.getScheduleManageDTO(), cmd.getDefaultNodeList()); ScheduleManage scheduleManage = this.setScheduleServe(cmd.getScheduleManageDTO(), cmd.getDefaultNodeList());
if (scheduleManage.getStatus().equals(ScheduleManage.STATUS_KEEP_SCHEDULED)) {
throw new RRException("已完成预约,不能修改");
}
if (SessionUtils.isSourceFromCustomer()) { if (SessionUtils.isSourceFromCustomer()) {
this.validSubmit(scheduleManage); this.validSubmit(scheduleManage);
} }
......
...@@ -34,6 +34,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -34,6 +34,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.security.InvalidParameterException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -230,7 +231,16 @@ public class OrderManageController { ...@@ -230,7 +231,16 @@ public class OrderManageController {
@PostMapping("/technician/ordermanage/updateOrderManage") @PostMapping("/technician/ordermanage/updateOrderManage")
public JsonResult<Void> updateOrderManage(@RequestHeader String token, public JsonResult<Void> updateOrderManage(@RequestHeader String token,
@RequestBody OrderManage param) { @RequestBody OrderManage param) {
orderManageService.updateOrderManage(param); OrderIdLock orderIdLock = OrderIdLock.getInstance();
if (param.getId() == null) {
throw new InvalidParameterException();
}
try {
orderIdLock.lock(param.getId());
orderManageService.updateOrderManage(param);
} finally {
orderIdLock.unlock(param.getId());
}
return JsonResult.success(); return JsonResult.success();
} }
...@@ -269,4 +279,4 @@ public class OrderManageController { ...@@ -269,4 +279,4 @@ public class OrderManageController {
// marketService.calcOrderAmount(orderId); // marketService.calcOrderAmount(orderId);
return JsonResult.success(); return JsonResult.success();
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment