From 6799b16ac3341cbb304e33f8cbff98c9f95283fb Mon Sep 17 00:00:00 2001 From: Damonny <826010988@qq.com> Date: Fri, 10 Jan 2025 21:33:03 +0800 Subject: [PATCH] =?UTF-8?q?upcreate:=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/orders/OrdersController.java | 7 +++ .../admin/orders/vo/OrdersSaveReqVO.java | 16 ++++- .../haoka/service/orders/OrdersService.java | 6 ++ .../service/orders/OrdersServiceImpl.java | 59 ++++++++++++------- 4 files changed, 65 insertions(+), 23 deletions(-) diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/OrdersController.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/OrdersController.java index b7f4948352..a20d803542 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/OrdersController.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/OrdersController.java @@ -68,6 +68,13 @@ public class OrdersController { ordersService.auditOrders(updateReqVO); return success(true); } + @PutMapping("/submit") + @Operation(summary = "提交订单") + @PreAuthorize("@ss.hasPermission('haoka:orders:submit')") + public CommonResult submitOrders(@Valid @RequestBody OrdersSaveReqVO updateReqVO) { + ordersService.submitOrders(updateReqVO); + return success(true); + } @DeleteMapping("/delete") @Operation(summary = "删除订单") diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersSaveReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersSaveReqVO.java index 815ae66bf1..7fc3d63346 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersSaveReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersSaveReqVO.java @@ -202,5 +202,19 @@ public class OrdersSaveReqVO { private String face; @Schema(description = "订单联系状态码") private Long callStatus; - + /** + * 请求参数 + */ + @Schema(description = "请求参数") + private String orderCreateRequest; + /** + * 返回参数 + */ + @Schema(description = "返回参数") + private String orderCreateResponse; + /** + * 是否加急 0或空 不加急 1 加急 + */ + @Schema(description = "是否加急") + private Integer isUrgent; } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersService.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersService.java index 89d8220ca2..946c421e56 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersService.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersService.java @@ -63,4 +63,10 @@ public interface OrdersService extends IService { * @return orderId */ public Long reCreateOrder(Long orderId); + + /** + * 提交订单 + * @param updateReqVO + */ + void submitOrders(OrdersSaveReqVO updateReqVO); } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java index 6bf6c17664..a07e29243c 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java @@ -175,9 +175,25 @@ public class OrdersServiceImpl extends ServiceImpl imple validateOrdersExists(updateReqVO.getId()); // 更新 OrdersDO updateObj = BeanUtils.toBean(updateReqVO, OrdersDO.class); - ordersMapper.updateById(updateObj); // 判断自动发货还是手动发货 + Long productId = updateObj.getProductId(); updateObj.setProducerId(1L); + ordersMapper.updateById(updateObj); + Long status = updateObj.getStatus(); +// 进入审核流程 + if (ObjectUtil.equals(status, 450)) { + // 450 审核通过 + createOrder(updateObj); + } + } + + /** + * 提交订单 + * @param updateReqVO + */ + @Override + public void submitOrders(OrdersSaveReqVO updateReqVO) { + OrdersDO updateObj = BeanUtils.toBean(updateReqVO, OrdersDO.class); createOrder(updateObj); } @@ -187,28 +203,27 @@ public class OrdersServiceImpl extends ServiceImpl imple * @param ordersDO */ private void createOrder(OrdersDO ordersDO) { - Long status = ordersDO.getStatus(); - if (ObjectUtil.equals(status, 450)) { - // 进入审核流程且下单 - OrderApiCreateParam param = new OrderApiCreateParam(); - BeanUtils.copyProperties(ordersDO, param); - ApiDealResp orderResponse = apiDealStrategyService.createOrder(param); - // 是否是是上游黑名单 如果是 存本地黑名单 - Boolean isBlack = orderResponse.getIsBlack(); - // 上游是否支持这个接口 - // Boolean isSupport = orderResponse.getIsSupport(); 都支持创建订单的 查询不一定 - // 成功？ - Boolean success = orderResponse.getSuccess(); - // 响应信息 - String msg = orderResponse.getMsg(); - // 订单创结果 - OrderApiCreateResp orderData = orderResponse.getData(); - // 上游订单ID - orderData.getSupplierOrderId(); + // 向上游提交订单 + OrderApiCreateParam param = new OrderApiCreateParam(); + BeanUtils.copyProperties(ordersDO, param); + ApiDealResp orderResponse = apiDealStrategyService.createOrder(param); + // 是否是是上游黑名单 如果是 存本地黑名单 todo + Boolean isBlack = orderResponse.getIsBlack(); + // 上游是否支持这个接口 + // Boolean isSupport = orderResponse.getIsSupport(); 都支持创建订单的 查询不一定 + // 成功？ + Boolean success = orderResponse.getSuccess(); + // 响应信息 + String msg = orderResponse.getMsg(); + // 订单创结果 + OrderApiCreateResp orderData = orderResponse.getData(); + // 上游订单ID + String supplierOrderId = orderData.getSupplierOrderId(); - // ordersDO 记录 create param 和 响应信息 - - } + // ordersDO 记录 create param 和 响应信息 + ordersDO.setOrderCreateResponse(orderData.getOrderCreateResponse()); + ordersDO.setUpstreamOrderId(supplierOrderId); + ordersMapper.updateById(ordersDO); } @Override