From e971ea090aa1f320f3c3f78c3a2a8d50f16dd4d0 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 15 Jan 2021 23:38:19 +0800
Subject: [PATCH] 小程序预约接口修改
---
zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
index ca6c675..8d5d0f9 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
@@ -12,7 +12,12 @@
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.AchieveNew;
+import com.matrix.system.hive.bean.SysOrder;
+import com.matrix.system.hive.bean.SysOrderItem;
import com.matrix.system.hive.service.AchieveNewService;
+import com.matrix.system.hive.service.SysOrderItemService;
+import com.matrix.system.hive.service.SysOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestBody;
@@ -38,6 +43,11 @@
@Resource
private AchieveNewService achieveNewService;
+ @Autowired
+ private SysOrderService sysOrderService;
+
+ @Autowired
+ private SysOrderItemService sysOrderItemService;
/**
* 门店每日单据明细表
@@ -132,7 +142,7 @@
public AjaxResult del(Long id) {
int i = achieveNewService.removeById(id);
if (i > 0) {
- return AjaxResult.buildSuccessInstance("删除失败");
+ return AjaxResult.buildSuccessInstance("删除成功");
}
return AjaxResult.buildFailInstance("删除失败");
}
@@ -140,9 +150,25 @@
@RequestMapping(value = "/add")
@ResponseBody
public AjaxResult add(@RequestBody List<AchieveNew> list) {
+ SysOrder order = sysOrderService.findById(list.get(0).getOrderId());
+ List<SysOrderItem> orderItems = sysOrderItemService.findByOrderId(order.getId());
+ orderItems.forEach(item -> {
+ List<AchieveNew> achieveNewList = new ArrayList<>();
+ for(AchieveNew achieveNew : list) {
+ achieveNewService.removeById(achieveNew.getId());
+ achieveNew.setId(null);
+ achieveNew.setConsume(null);
+ achieveNew.setCardCash(null);
-
- return AjaxResult.buildSuccessInstance("添加成功");
+ if (achieveNew.getOrderItemId().equals(item.getId())) {
+ achieveNewList.add(achieveNew);
+ }
+ }
+ item.setAchaeveList(achieveNewList);
+ });
+ order.setItems(orderItems);
+ achieveNewService.addAchaeveByOrder(order);
+ return AjaxResult.buildSuccessInstance("保存成功");
}
}
--
Gitblit v1.9.1