szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单生产流程优化

This commit is contained in:
Damonny 2025-01-12 01:58:10 +08:00
parent ce6cae1edb
commit 43d1fc9fa8
4 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/OrdersController.java
View File

@ -47,9 +47,9 @@ public class OrdersController {
return success(ordersService.createOrders(createReqVO));
}
@PostMapping("/re-create-order/{orderId}")
@PostMapping("/reCreateOrder")
@Operation(summary = "订单重提")
@PreAuthorize("@ss.hasPermission('haoka:orders:create')")
@PreAuthorize("@ss.hasPermission('haoka:orders:resubmit')")
public CommonResult<Long> reCreateOrders(@NotNull @PathVariable Long orderId) {
return success(ordersService.reCreateOrder(orderId));
}
@ -61,6 +61,14 @@ public class OrdersController {
ordersService.updateOrders(updateReqVO);
return success(true);
}
@PutMapping("/changeStatus")
@Operation(summary = "强制修改订单提交状态")
@PreAuthorize("@ss.hasPermission('haoka:orders:changeStatus')")
public CommonResult<Boolean> changeStatus(@Valid @RequestBody OrdersSaveReqVO updateReqVO) {
ordersService.changeStatus(updateReqVO);
return success(true);
}
@PutMapping("/audit")
@Operation(summary = "审核订单")
@PreAuthorize("@ss.hasPermission('haoka:orders:audit')")

3
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersRespVO.java
View File

@ -213,6 +213,9 @@ public class OrdersRespVO {
@ExcelProperty("上游订单号")
private String upstreamOrderId;
@Schema(description = "上游订单状态", example = "2")
private String upstreamOrderStatus;
@Schema(description = "生产备注", example = "你猜")
@ExcelProperty("生产备注")
private String producerMemo;

4
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersService.java
View File

@ -62,7 +62,7 @@ public interface OrdersService extends IService<OrdersDO> {
* @param orderId orderId
* @return orderId
*/
public Long reCreateOrder(Long orderId);
Long reCreateOrder(Long orderId);
/**
* 提交订单
@ -75,4 +75,6 @@ public interface OrdersService extends IService<OrdersDO> {
* @param updateReqVO
*/
void submitUpStreamStatus(OrdersSaveReqVO updateReqVO);
void changeStatus(OrdersSaveReqVO updateReqVO);
}

27
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java
View File

@ -106,6 +106,12 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
}
private OrdersDO handleOrderCreate(final OrdersDO ordersDO) {
OrderOperateLogSaveReqVO logSaveReqVO = new OrderOperateLogSaveReqVO();
logSaveReqVO.setOrderId(ordersDO.getId());
logSaveReqVO.setMsg("再次提交上游");
logSaveReqVO.setMsgType("0");
logSaveReqVO.setMsgSource("0");
orderOperateLogService.createOrderOperateLog(logSaveReqVO);
return createOrder(ordersDO);
}
@ -236,6 +242,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
logSaveReqVO.setMsg("提交初审:敏感地区待审核");
logSaveReqVO.setMsgType("1");
logSaveReqVO.setMsgSource("0");
orderOperateLogService.createOrderOperateLog(logSaveReqVO);
}
}
@ -336,6 +343,26 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
}
/**
* 强制修改订单提交状态
* @param updateReqVO
*/
@Override
public void changeStatus(OrdersSaveReqVO updateReqVO) {
OrdersDO ordersDO = validateOrdersExists(updateReqVO.getId());
Long status = updateReqVO.getStatus();
if("1".equals(String.valueOf(status))){
// 提交成功
ordersDO.setStatus(470L);
ordersDO.setUpstreamOrderStatus(470);
}else {
// 提交失败
ordersDO.setStatus(-460L);
ordersDO.setUpstreamOrderStatus(-460);
}
ordersMapper.updateById(ordersDO);
}
/**
* 调用运营商产生订单
*