From 24492b6f927deccd31b4bd42b49a19da348a6f7a Mon Sep 17 00:00:00 2001
From: Damonny <826010988@qq.com>
Date: Mon, 6 Jan 2025 23:47:46 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E8=AE=A2=E5=8D=95sqlupdate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../haoka/dal/dataobject/orders/OrdersDO.java       | 12 ++++++++++++
 .../haoka/service/orders/OrdersServiceImpl.java     | 13 +++++++++++--
 .../db/migration/V5.0.12__order_update_table.sql    |  5 +++++
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 yudao-server/src/main/resources/db/migration/V5.0.12__order_update_table.sql

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 be7a8821cc..2ab93f317c 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
@@ -291,5 +291,17 @@ public class OrdersDO extends BaseDO {
      * 身份证人脸
      */
     private String face;
+    /**
+     * 生产方式 1 手动生产  2自动生产
+     */
+    private Integer autoType;
+    /**
+     * 请求参数
+     */
+    private String orderCreateRequest;
+    /**
+     * 返回参数
+     */
+    private String orderCreateResponse;
 
 }
\ No newline at end of file
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 5ddcf1a76e..5d58be7c60 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
@@ -2,10 +2,12 @@ package cn.iocoder.yudao.module.haoka.service.orders;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.module.haoka.api.ApiFrom;
+import cn.iocoder.yudao.module.haoka.controller.admin.onsaleproduct.vo.OnSaleProductPreOrderRespVO;
 import cn.iocoder.yudao.module.haoka.service.api.models.ApiDealResp;
 import cn.iocoder.yudao.module.haoka.service.api.ApiDealStrategyService;
 import cn.iocoder.yudao.module.haoka.service.api.models.OrderApiCreateParam;
 import cn.iocoder.yudao.module.haoka.service.api.models.OrderApiCreateResp;
+import cn.iocoder.yudao.module.haoka.service.onsaleproduct.OnSaleProductService;
 import cn.iocoder.yudao.module.haoka.utils.SnowflakeId;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,8 @@ import static cn.iocoder.yudao.module.haoka.enums.ErrorCodeConstants.*;
 public class OrdersServiceImpl extends ServiceImpl<OrdersMapper,OrdersDO> implements OrdersService {
     @Resource
     private OrdersMapper ordersMapper;
+    @Resource
+    private OnSaleProductService onSaleProductService;
     @Autowired
     @Qualifier(ApiFrom.ApiDealStrategyImpl)
     private ApiDealStrategyService apiDealStrategyService;
@@ -46,6 +50,10 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper,OrdersDO> implem
         // 插入
         OrdersDO orders = BeanUtils.toBean(createReqVO, OrdersDO.class);
         orders.setId(SnowflakeId.generate());
+        // 注入产品生产方式
+        Long productId = createReqVO.getProductId();
+        Integer autoType = onSaleProductService.getOnSaleProductPreOrder(productId).getParentProduct().getAutoType();
+        orders.setAutoType(autoType);
         ordersMapper.insert(orders);
 
         OrderApiCreateParam param = new OrderApiCreateParam();
@@ -70,19 +78,20 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper,OrdersDO> implem
         // 更新
         OrdersDO updateObj = BeanUtils.toBean(updateReqVO, OrdersDO.class);
         ordersMapper.updateById(updateObj);
+        // 判断自动发货还是手动发货
+        updateObj.setProducerId(1L);
         createOrder(updateObj);
     }
 
     /**
      *
-     *
+     * 调用运营商产生订单
      * @param ordersDO
      */
     private void createOrder(OrdersDO ordersDO) {
         Long status = ordersDO.getStatus();
         if(ObjectUtil.equals(status,450)){
             // 进入审核流程且下单
-            ApiDealResp<OrderApiCreateResp> order = apiDealStrategyService.createOrder(null);
             OrderApiCreateParam param = new OrderApiCreateParam();
             BeanUtils.copyProperties(ordersDO,param);
             ApiDealResp<OrderApiCreateResp> orderResponse = apiDealStrategyService.createOrder(param);
diff --git a/yudao-server/src/main/resources/db/migration/V5.0.12__order_update_table.sql b/yudao-server/src/main/resources/db/migration/V5.0.12__order_update_table.sql
new file mode 100644
index 0000000000..d61a6c8aa0
--- /dev/null
+++ b/yudao-server/src/main/resources/db/migration/V5.0.12__order_update_table.sql
@@ -0,0 +1,5 @@
+-- 订单新增参数
+ALTER TABLE haoka_orders
+    ADD COLUMN order_create_request text NULL COMMENT '订单提交参数' AFTER face,
+    ADD COLUMN order_create_response text NULL COMMENT '订单响应参数' AFTER order_create_request,
+    ADD COLUMN auto_type int(11) NULL COMMENT '生产方式' AFTER order_create_response;
\ No newline at end of file