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

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Owen 2025-01-07 22:10:27 +08:00
parent 0c285e742b e302e38e51
commit 89c205b5c8
3 changed files with 28 additions and 2 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/dal/dataobject/orders/OrdersDO.java
View File

@ -291,5 +291,17 @@ public class OrdersDO extends BaseDO {
* 身份证人脸
*/
private String face;
/**
* 生产方式 1 手动生产 2自动生产
*/
private Integer autoType;
/**
* 请求参数
*/
private String orderCreateRequest;
/**
* 返回参数
*/
private String orderCreateResponse;
}

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

@ -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);

5
yudao-server/src/main/resources/db/migration/V5.0.12__order_update_table.sql Normal file
View File

@ -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;