From 29ba6fbd0015b9a77b5c994f43429a5a42e2ecc4 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 17 Jan 2021 11:35:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 6 ------
1 files changed, 0 insertions(+), 6 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 9974d18..8bd6280 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
@@ -437,7 +437,6 @@
// 设置订单总价与折后价
order.setTotal(total);
order.setZkTotal(zkTotal);
- order.setArrears(zkTotal);
sysOrderDao.update(order);
return i;
}
@@ -1251,11 +1250,6 @@
@Override
public List<RankingVo> findApiShopAchieveRanking(SysOrder sysOrder) {
return sysOrderDao.selectShopAchieveRanking(sysOrder);
- }
-
- @Override
- public List<RankingVo> findStaffSaleAchieveRanking(SysOrder sysOrder) {
- return sysOrderDao.selectStaffSaleAchieveRanking(sysOrder);
}
@Transactional(rollbackFor = Exception.class)
--
Gitblit v1.9.1