|
|
|
@ -206,8 +206,8 @@ public class RecycleOrderController {
|
|
|
|
|
return CommonResult.success(true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ApiOperation("确认完成回收订单")
|
|
|
|
|
@PostMapping("/complete")
|
|
|
|
|
@ApiOperation("确认完成定点订单")
|
|
|
|
|
@PostMapping("/complete-tm")
|
|
|
|
|
@UserTypeAnnotation(UserTypeEnum.RECYCLER)
|
|
|
|
|
public CommonResult<Boolean> completeTMOrder(@RequestBody TMRecycleOrderFinishVO tmOrderFinishVO) {
|
|
|
|
|
UserDTO userDTO = UserContext.getUser();
|
|
|
|
@ -217,17 +217,6 @@ public class RecycleOrderController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation("确认完成定点订单")
|
|
|
|
|
@PostMapping("/complete-dz")
|
|
|
|
|
@UserTypeAnnotation(UserTypeEnum.RECYCLER)
|
|
|
|
|
public CommonResult<Boolean> completeTMOrder(@RequestBody RecycleOrderFinishVO orderCompleteVO) {
|
|
|
|
|
UserDTO userDTO = UserContext.getUser();
|
|
|
|
|
orderCompleteVO.setStaffsId(userDTO.getId());
|
|
|
|
|
recycleOrderService.finishOrder(orderCompleteVO);
|
|
|
|
|
return CommonResult.success(true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 完善扩展属性
|
|
|
|
|
*
|
|
|
|
|