From c9cbad5f5d18c6b2ac5a063e41007933d7028329 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 七月 2020 15:24:17 +0800
Subject: [PATCH] 返利配置文件加入系统区分
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index f140a2f..54da70c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -10,6 +10,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.SystemEnum;
import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -630,7 +631,6 @@
* @param hasRewardCoupon
* @param hongBaoState
* @param list
- * @param signList
*/
private void couponFactory(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState, Integer hongBaoType,
List<UserSystemCouponRecord> list, Long uid, boolean vip, AcceptData acceptData, BigDecimal hongBao)
@@ -1292,7 +1292,6 @@
*
* @param commonOrder
*/
- @Transactional(rollbackFor = Exception.class)
private CommonOrderAddResultDTO addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {
// 鍒ゆ柇鍟嗗搧鏄惁瀛樺湪
if (commonOrder == null)
@@ -1468,16 +1467,16 @@
@Override
public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
Integer type, Integer orderState, String startTime, String endTime, Integer source, List<Long> listShopId,
- List<Long> listGoodsId, Date minTime, BigDecimal money, BigDecimal payment) throws CommonOrderException {
+ List<Long> listGoodsId, Date minTime, BigDecimal money, BigDecimal payment,SystemEnum system) throws CommonOrderException {
List<CommonOrderVO> list = null;
if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, type, orderState,
- startTime, endTime, source, payment);
+ startTime, endTime, source, payment,system);
} else {
list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime,
- source, listShopId, listGoodsId, minTime, money, payment);
+ source, listShopId, listGoodsId, minTime, money, payment,system);
}
if (list == null) {
@@ -1663,14 +1662,14 @@
@Override
public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
- String startTime, String endTime, Integer source, List<Long> listShopId, List<Long> listGoodsId,
- Date minTime, BigDecimal money, BigDecimal payment) throws CommonOrderException {
+ String startTime, String endTime, Integer source, List<Long> listShopId, List<Long> listGoodsId,
+ Date minTime, BigDecimal money, BigDecimal payment, SystemEnum system) throws CommonOrderException {
if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
return commonOrderMapper.countQueryWithNoChild(keyType, key, state, type, orderState, startTime, endTime,
- source, payment);
+ source, payment,system);
} else {
return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source,
- listShopId, listGoodsId, minTime, money, payment);
+ listShopId, listGoodsId, minTime, money, payment,system);
}
}
--
Gitblit v1.8.0