From 4e557c1b42a6952c0c7e1deb8faa89a5d54b11d1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 十二月 2018 14:49:20 +0800
Subject: [PATCH] 新版订单同步修改 增加微信域名拦截检测
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 51 +++++++++++----------------------------------------
1 files changed, 11 insertions(+), 40 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 850162e..4ce1d0a 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
@@ -4,9 +4,9 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
import javax.annotation.Resource;
@@ -68,51 +68,27 @@
@Override
public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state,
- Integer type, String orderNo, String startTime,String endTime) throws CommonOrderException{
- return commonOrderMapper.listGroupOrderNoByUid(start, count, uid, state, type, orderNo, startTime, endTime);
+ Integer type,Integer orderState, String orderNo, String startTime,String endTime,
+ Integer dateType) throws CommonOrderException{
+ return commonOrderMapper.listGroupOrderNoByUid(start, count, uid, state, type, orderState,
+ orderNo, startTime, endTime, dateType);
}
@Override
- public long countGroupOrderNoByUid(Long uid,Integer state, Integer type, String orderNo,
- String startTime,String endTime) throws CommonOrderException{
- return commonOrderMapper.countGroupOrderNoByUid(uid, state, type, orderNo, startTime, endTime);
+ public long countGroupOrderNoByUid(Long uid,Integer state, Integer type, Integer orderState,
+ String orderNo, String startTime,String endTime, Integer dateType) throws CommonOrderException{
+ return commonOrderMapper.countGroupOrderNoByUid(uid, state, type, orderState, orderNo,
+ startTime, endTime, dateType);
}
@Override
public List<CommonOrderVO> getOrderByUid (Integer page, Long uid, Integer state, Integer type,
- String orderNo, String startTime, String endTime) throws CommonOrderException {
+ Integer orderState, String orderNo, String startTime, String endTime, Integer dateType) throws CommonOrderException {
int pageSize = Constant.PAGE_SIZE;
List<CommonOrderVO> listOrder = listGroupOrderNoByUid((page - 1) * pageSize, pageSize, uid,
- state, type, orderNo, startTime, endTime);
-
- // 璁㈠崟淇℃伅涓虹┖
- if (listOrder == null || listOrder.size() == 0) {
- listOrder = new ArrayList<CommonOrderVO>();
- return listOrder;
- }
-
- // 鍟嗗搧淇℃伅
- List<CommonOrderVO> listGoods = commonOrderMapper.listByOrderNoAndType(listOrder);
- // 璁㈠崟鍟嗗搧涓虹┖
- if (listGoods ==null || listGoods.size() == 0) {
- return listOrder;
- }
-
- // 鏁版嵁鍔犲伐閲嶆柊缁勭粐
- listDataFactory(listOrder, listGoods);
-
- return listOrder;
- }
-
-
- @Override
- public List<CommonOrderVO> listBonusOrder (Integer page, Long uid, Integer type,Integer day) throws CommonOrderException {
-
- int pageSize = Constant.PAGE_SIZE;
-
- List<CommonOrderVO> listOrder = commonOrderMapper.listBonusOrder((page - 1) * pageSize, pageSize, uid, type, day);
+ state, type, orderState, orderNo, startTime, endTime, dateType);
// 璁㈠崟淇℃伅涓虹┖
if (listOrder == null || listOrder.size() == 0) {
@@ -152,11 +128,6 @@
@Override
public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime,String endTime) {
return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime);
- }
-
- @Override
- public Map<String, BigDecimal> countBonusOrderByState(Long uid,Integer type, Integer day) {
- return commonOrderMapper.countBonusOrderByState(uid, type, day);
}
public void listDataFactory (List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods ) {
--
Gitblit v1.8.0