From 8243c06e629d79bba0388e6fb4f0e1ae70281ded Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Mar 2022 12:30:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/订单服务单代码改造' into feature/订单服务单代码改造
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
index 10237fb..d8dc496 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
@@ -17,10 +17,10 @@
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.ShoppingGoodsCategory;
import com.matrix.system.hive.bean.SysOrder;
+import com.matrix.system.hive.bean.SysOrderItem;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.plugin.util.CollectionUtils;
-import com.matrix.system.hive.pojo.ShoppingCarItem;
import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
import com.matrix.system.hive.service.ShoppingGoodsCategoryService;
import com.matrix.system.hive.service.ShoppingGoodsService;
@@ -109,31 +109,26 @@
@ApiOperation(value = "创建订单", notes = "创建订单")
@PostMapping(value = "/createOrder")
public AjaxResult createOrder(@RequestBody @Validated CreateOrderDto createOrderDto) {
- SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-
+ SysOrder order=new SysOrder();
+ order.setVipId(createOrderDto.getVipId());
ShoppingCarItemsVo car = new ShoppingCarItemsVo();
car.setVipId(createOrderDto.getVipId());
if (CollectionUtils.isNotEmpty(createOrderDto.getItems())) {
- List<ShoppingCarItem> list = new ArrayList<>();
+ List<SysOrderItem> list = new ArrayList<>();
for (CreateOderItemDto item : createOrderDto.getItems()) {
- ShoppingCarItem carItem = new ShoppingCarItem();
- carItem.setCount(item.getCount());
- carItem.setGoodsId(item.getGoodsId());
- carItem.setIsFree(item.getIsFree());
- carItem.setType(item.getGoodsType());
-
- carItem.setShoppingGoods(shoppingGoodsService.findById(item.getGoodsId()));
- list.add(carItem);
+ SysOrderItem orderItem = new SysOrderItem();
+ orderItem.setCount(item.getCount());
+ orderItem.setGoodsId(item.getGoodsId());
+ orderItem.setIsFree(item.getIsFree());
+ //jyytodo 这个字段可以不传
+ orderItem.setType(item.getGoodsType());
+ list.add(orderItem);
}
- car.setCarItems(list);
+ order.setItems(list);
}
- int i = sysOrderService.createOrder(WebUtil.getSession(), car);
- if (i > 0) {
- return AjaxResult.buildSuccessInstance("下单成功");
- }
-
- return AjaxResult.buildFailInstance("下单失败");
+ sysOrderService.checkAndSaveOrder(order);
+ return AjaxResult.buildSuccessInstance("下单成功");
}
@ApiOperation(value = "获取订单列表", notes = "获取订单列表")
--
Gitblit v1.9.1