From a224639cb2a8cc9dcab35cc1f8d6c0e778300ef9 Mon Sep 17 00:00:00 2001 From: Damonny <826010988@qq.com> Date: Sat, 11 Jan 2025 17:08:48 +0800 Subject: [PATCH] =?UTF-8?q?create:=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=B8=8A=E6=B8=B8=E7=8A=B6=E6=80=81sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/orders/OrdersController.java | 8 ++++++ .../admin/orders/vo/OrdersSaveReqVO.java | 6 ++++ .../haoka/dal/dataobject/orders/OrdersDO.java | 5 ++++ .../haoka/service/orders/OrdersService.java | 6 ++++ .../service/orders/OrdersServiceImpl.java | 28 +++++++++++++------ ...ert_upstream_order_status_enum_to_dict.sql | 20 +++++++++++++ 6 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 yudao-server/src/main/resources/db/migration/V5.0.15__insert_upstream_order_status_enum_to_dict.sql 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 a20d803542..df5e5f9d3e 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 @@ -76,6 +76,14 @@ public class OrdersController { return success(true); } + @PutMapping("/submitUpStreamStatus") + @Operation(summary = "强制修改订单提交状态") + @PreAuthorize("@ss.hasPermission('haoka:orders:submitUpStreamStatus')") + public CommonResult submitUpStreamStatus(@Valid @RequestBody OrdersSaveReqVO updateReqVO) { + ordersService.submitUpStreamStatus(updateReqVO); + return success(true); + } + @DeleteMapping("/delete") @Operation(summary = "删除订单") @Parameter(name = "id", description = "编号", required = true) 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 7fc3d63346..7a69879132 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 @@ -217,4 +217,10 @@ public class OrdersSaveReqVO { */ @Schema(description = "是否加急") private Integer isUrgent; + + /** + * 上游订单状态（生产异常 -430 开卡失败-460 提交异常 0 开卡中470 待发货500 已发货550 已激活700） + */ + @Schema(description = "上游订单状态") + private Integer upstreamOrderStatus; } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/orders/OrdersDO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/orders/OrdersDO.java index 2315d5f2cc..b6f61a75a1 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/orders/OrdersDO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/orders/OrdersDO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.haoka.dal.dataobject.orders; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -233,6 +234,10 @@ public class OrdersDO extends BaseDO { * 上游订单号 */ private String upstreamOrderId; + /** + * 上游订单状态（-430 生产异常 -460 提交异常 0 开卡中470 待发货500 已发货550 已激活700） + */ + private Integer upstreamOrderStatus; /** * 生产备注 */ 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 946c421e56..3097eb7f01 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 @@ -69,4 +69,10 @@ public interface OrdersService extends IService { * @param updateReqVO */ void submitOrders(OrdersSaveReqVO updateReqVO); + + /** + * 强制修改订单提交状态 + * @param updateReqVO + */ + void submitUpStreamStatus(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 a07e29243c..f31f278377 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 @@ -197,6 +197,11 @@ public class OrdersServiceImpl extends ServiceImpl imple createOrder(updateObj); } + @Override + public void submitUpStreamStatus(OrdersSaveReqVO updateReqVO) { + + } + /** * 调用运营商产生订单 * @@ -211,18 +216,23 @@ public class OrdersServiceImpl extends ServiceImpl imple 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.setOrderCreateResponse(orderData.getOrderCreateResponse()); - ordersDO.setUpstreamOrderId(supplierOrderId); + if(success){ + // 订单创结果 + OrderApiCreateResp orderData = orderResponse.getData(); + // ordersDO 记录 create param 和 响应信息 + ordersDO.setOrderCreateResponse(orderData.getOrderCreateResponse()); + // 上游订单ID + String supplierOrderId = orderData.getSupplierOrderId(); + ordersDO.setUpstreamOrderId(supplierOrderId); + // 记录成功操作记录 todo + }else { + // 失败操作记录 todo + } + // 更新订单 ordersMapper.updateById(ordersDO); } diff --git a/yudao-server/src/main/resources/db/migration/V5.0.15__insert_upstream_order_status_enum_to_dict.sql b/yudao-server/src/main/resources/db/migration/V5.0.15__insert_upstream_order_status_enum_to_dict.sql new file mode 100644 index 0000000000..db1e85b9e1 --- /dev/null +++ b/yudao-server/src/main/resources/db/migration/V5.0.15__insert_upstream_order_status_enum_to_dict.sql @@ -0,0 +1,20 @@ +-- 创建字典类型 +INSERT INTO `system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `updater`, `deleted`) +VALUES ('上游订单状态', 'haoka_upstream_order_status', 0, '', '1', '1', b'0'); + +# 生产异常 -430 开卡失败-460 提交异常 0 开卡中 470 待发货 500 已发货 550 已激活 700 + +-- 插入字典数据 +INSERT INTO `system_dict_data` (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `updater`, `deleted`) +VALUES + (1, '生产异常', '-430', 'haoka_upstream_order_status', 0, '', '', NULL, '1', '1', b'0'), + (2, '开卡失败', '-460', 'haoka_upstream_order_status', 0, '', '', NULL, '1', '1', b'0'), + (3, '提交异常', '0', 'haoka_upstream_order_status', 0, '', '', NULL, '1', '1', b'0'), + (4, '开卡中', '470', 'haoka_upstream_order_status', 0, '', '', NULL, '1', '1', b'0'), + (5, '待发货', '500', 'haoka_upstream_order_status', 0, '', '', NULL, '1', '1', b'0'), + (6, '已发货', '550', 'haoka_upstream_order_status', 0, '', '', NULL, '1', '1', b'0'), + (7, '已激活', '700', 'haoka_upstream_order_status', 0, '', '', NULL, '1', '1', b'0'); + +ALTER TABLE `haoka_orders` + MODIFY COLUMN `refund_status` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交易状态' AFTER `status_updated_at`, + ADD COLUMN `upstream_order_status` varchar(50) NULL COMMENT '上游订单状态' AFTER `upstream_order_id`; \ No newline at end of file