From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 f237f58..5e9a369 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
@@ -218,6 +218,7 @@
List<Integer> listSource) throws CommonOrderException, Exception {
int pageSize = Constant.PAGE_SIZE;
+
List<CommonOrderVO> listOrder = commonOrderMapper.listUserOrder((page - 1) * pageSize, pageSize, uid, state,
type, orderState, orderNo, startTime, endTime, dateType, listSource);
@@ -1816,11 +1817,12 @@
@Override
public List<CommonOrderVO> getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
Integer orderState, String orderNo, String startTime, String endTime, Integer dateType,
- List<Integer> listSource) throws CommonOrderException, Exception {
+ List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException, Exception {
int pageSize = Constant.PAGE_SIZE;
+
List<CommonOrderVO> listOrder = commonOrderMapper.getOrderList((page - 1) * pageSize, pageSize, uid, state,
- type, orderState, orderNo, startTime, endTime, dateType, listSource);
+ type, orderState, orderNo, startTime, endTime, dateType, listSource,notBackSuVip);
// 璁㈠崟淇℃伅涓虹┖
if (listOrder == null || listOrder.size() == 0) {
@@ -1842,9 +1844,9 @@
@Override
public long countOrderList(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
- String startTime, String endTime, Integer dateType, List<Integer> listSource) throws CommonOrderException {
+ String startTime, String endTime, Integer dateType, List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException {
return commonOrderMapper.countOrderList(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
- listSource);
+ listSource, notBackSuVip);
}
/**
@@ -2033,6 +2035,14 @@
List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
.selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid);
+
+ if (settleTime != null) {
+ orderStateContent = "鍞悗鎴愬姛";
+ WeiQuanInfo weiQuanInfo = new WeiQuanInfo();
+ weiQuanInfo.setOldHongBao("楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ weiQuanInfo.setWqHongBao("鍞悗锛�-楼" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ order.setWeiQuanInfo(weiQuanInfo);
+ }
hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
}
}
@@ -2193,4 +2203,10 @@
return commonOrderMapper.getNewestOrderNoByTaoBao();
}
+
+ @Override
+ public List<CommonOrder> listByOrderNo(String orderNo) {
+ return commonOrderMapper.listByOrderNo(orderNo);
+ }
+
}
--
Gitblit v1.8.0