From 1f27afeb9a001ef9df74011ab4ab2a64a3f2c5db Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 12 Apr 2021 14:44:39 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index 647ead9..93362f4 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -1352,6 +1352,7 @@
orderItem.setPrice(czVo.getBjmoney());
orderItem.setStatus(Dictionary.ORDER_STATU_YFK);
orderItem.setAchieveList(czVo.getAchaeveList());
+ orderItem.setShoppingGoods(shoppingGoods);
orderItemDao.insert(orderItem);
List<SysOrderItem> items = new ArrayList<>();
items.add(orderItem);
@@ -1372,9 +1373,12 @@
moneyCardUseFlowDao.insert(moneyCardUseFlow);
order.setFlows(czVo.getFlows());
+
addOrderFlow(order);
+
// 添加员工业绩
achieveNewService.addAchaeveByOrder(order);
+
return order;
}
--
Gitblit v1.9.1