From 325009946e7c987c4b087509ffef5087f8b3d09a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 14 一月 2019 11:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java | 28 ++++------------------------
1 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
index 1d2243d..666a04a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
@@ -119,10 +119,10 @@
@Override
- public List<TaoBaoOrderVO> listQuery(int start, int count,Integer keyType, String key,
+ public List<TaoBaoOrderVO> listQuery(int start, int count, String key,
String startTime, String endTime, Integer state) throws Exception {
- List<TaoBaoOrderVO> listData = taoBaoOrderMapper.listQuery(start, count, keyType, key, startTime, endTime, state);
+ List<TaoBaoOrderVO> listData = taoBaoOrderMapper.listQuery(start, count, key, startTime, endTime, state);
for (TaoBaoOrderVO taoBaoOrderVO : listData) {
@@ -134,35 +134,15 @@
} else if ("璁㈠崟澶辨晥".equals(orderState)) {
taoBaoOrderVO.setOrderState("3");
}
-
- /* 鍒拌处鐘舵�� */
- String moneyState = taoBaoOrderVO.getUserMoneyState();
- if ((HongBaoV2.STATE_BUKELINGQU+"").equals(moneyState)
- || (HongBaoV2.STATE_KELINGQU+"").equals(moneyState)) {
- taoBaoOrderVO.setUserMoneyState("1"); // 鏈埌璐�
- } else if ((HongBaoV2.STATE_YILINGQU + "").equals(moneyState)) {
- taoBaoOrderVO.setUserMoneyState("2"); // 宸插埌璐�
- } else {
- taoBaoOrderVO.setUserMoneyState("3"); // 宸插け鏁�
- }
-
- String userHongBaoType = taoBaoOrderVO.getUserHongBaoType();
- if ((HongBaoV2.TYPE_ZIGOU+"").equals(userHongBaoType)) {
- taoBaoOrderVO.setUserHongBaoType("1"); // 鑷喘
- } else if ((HongBaoV2.TYPE_SHARE_GOODS + "").equals(userHongBaoType)) {
- taoBaoOrderVO.setUserHongBaoType("2"); // 鍒嗕韩
- } else {
- taoBaoOrderVO.setUserHongBaoType("3"); // 閭�璇�
- }
}
return listData;
}
@Override
- public long countQuery(Integer keyType, String key, String startTime, String endTime,
+ public long countQuery(String key, String startTime, String endTime,
Integer state) throws Exception {
- return taoBaoOrderMapper.countQuery(keyType, key, startTime, endTime, state);
+ return taoBaoOrderMapper.countQuery(key, startTime, endTime, state);
}
}
--
Gitblit v1.8.0