From 2d538eff0cfe0eadff3cb9d9c1db9e45f6109ab1 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 03 一月 2020 17:25:56 +0800
Subject: [PATCH] 帮助中心版本区分
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 2ddc464..d2d4411 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
@@ -169,26 +169,30 @@
public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state, Integer type,
Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, Integer source)
throws CommonOrderException {
+ List<Integer> listSource = new ArrayList<>();
+ if (source != null) {
+ listSource.add(source);
+ }
+
return commonOrderMapper.listUserOrder(start, count, uid, state, type, orderState, orderNo, startTime, endTime,
- dateType, source);
+ dateType, listSource);
}
@Override
public long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
- String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException {
+ String startTime, String endTime, Integer dateType, List<Integer> listSource) throws CommonOrderException {
return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
- source);
+ listSource);
}
@Override
public List<CommonOrderVO> getOrderByUid(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
- Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, Integer source)
+ Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, List<Integer> listSource)
throws CommonOrderException, Exception {
int pageSize = Constant.PAGE_SIZE;
-
- List<CommonOrderVO> listOrder = listGroupOrderNoByUid((page - 1) * pageSize, pageSize, uid, state, type,
- orderState, orderNo, startTime, endTime, dateType, source);
+ List<CommonOrderVO> listOrder = commonOrderMapper.listUserOrder((page - 1) * pageSize, pageSize, uid, state, type,
+ orderState, orderNo, startTime, endTime, dateType, listSource);
// 璁㈠崟淇℃伅涓虹┖
if (listOrder == null || listOrder.size() == 0) {
@@ -470,7 +474,7 @@
signList.add(CommonOrder.TYPE_INVITE);
// 鐗堟湰鍖哄垎锛�2-0-2
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid,
order.getOrderNo(), sourceType);
if (orderSubsidy != null) {
@@ -596,7 +600,7 @@
boolean freeOrder = false;
// 鏄惁濂栧姳鎴愬姛
boolean rewardSuccess = false;
- boolean version2_1 = VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion());
+ boolean version2_1 = VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion());
if (list != null && list.size() > 0) {
for (UserSystemCouponRecord couponRecord : list) {
@@ -814,8 +818,8 @@
}
@Override
- public OrderCountVO getOrderCount(Long uid, Integer day, Integer source) {
- return commonOrderMapper.getOrderCount(uid, day, source);
+ public OrderCountVO getOrderCount(Long uid, Integer day, List<Integer> listSource) {
+ return commonOrderMapper.getOrderCount(uid, day, listSource);
}
@Override
--
Gitblit v1.8.0