From 075f6eceec6908178ba53b40b7794e2f90f74c92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:40:10 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   93 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
index a51a11b..c6ffbc8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
@@ -1,10 +1,12 @@
 package com.yeshi.fanli.service.inter.order;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.exception.order.CommonOrderException;
 import com.yeshi.fanli.vo.order.CommonOrderVO;
 
@@ -15,32 +17,37 @@
 	public int insertSelective(CommonOrder record);
 
 	public int updateByPrimaryKey(CommonOrder record);
-	
-	public int updateByPrimaryKeySelective(CommonOrder record);
-	
-	public int deleteByPrimaryKey(Long id);
-	
-	public CommonOrder selectByPrimaryKey(Long id);
 
+	public int updateByPrimaryKeySelective(CommonOrder record);
+
+	public int deleteByPrimaryKey(Long id);
+
+	public CommonOrder selectByPrimaryKey(Long id);
 
 	/**
 	 * 鏌ヨ鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
+	 * 
 	 * @param start
 	 * @param count
 	 * @param uid
 	 * @param state
 	 * @param type
-	 * @param orderNo 璁㈠崟鍙�
-	 * @param startTime 璧峰绯荤粺褰曞叆鏃堕棿
-	 * @param endTime  缁撴潫绯荤粺褰曞叆鏃堕棿
+	 * @param orderNo
+	 *            璁㈠崟鍙�
+	 * @param startTime
+	 *            璧峰绯荤粺褰曞叆鏃堕棿
+	 * @param endTime
+	 *            缁撴潫绯荤粺褰曞叆鏃堕棿
 	 * @return
 	 * @throws CommonOrderException
 	 */
-	public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state,
-			Integer type,Integer orderState,String orderNo, String startTime, String endTime, Integer dateType) throws CommonOrderException;
+	public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state, Integer type,
+			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType)
+			throws CommonOrderException;
 
 	/**
 	 * 缁熻鏌ヨ
+	 * 
 	 * @param uid
 	 * @param state
 	 * @param type
@@ -50,50 +57,86 @@
 	 * @return
 	 * @throws CommonOrderException
 	 */
-	long countGroupOrderNoByUid(Long uid, Integer state, Integer type,Integer orderState,
-			String orderNo, String startTime, String endTime, Integer dateType) throws CommonOrderException;
-	
+	long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
+			String startTime, String endTime, Integer dateType) throws CommonOrderException;
+
 	/**
 	 * 绉诲姩娈佃鍗曞垪琛�
+	 * 
 	 * @param start
 	 * @param count
-	 * @param uid 鐢ㄦ埛id
-	 * @param type 鍒拌处鐘舵��
+	 * @param uid
+	 *            鐢ㄦ埛id
+	 * @param type
+	 *            鍒拌处鐘舵��
 	 * @return
 	 */
-	public List<CommonOrderVO> getOrderByUid(Integer page, Long uid, Integer state, Integer type,
-			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType) throws CommonOrderException;
+	public List<CommonOrderVO> getOrderByUid(Integer page, Long uid, Integer state, Integer type, Integer orderState,
+			String orderNo, String startTime, String endTime, Integer dateType) throws CommonOrderException;
 
 	/**
 	 * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
+	 * 
 	 * @param uid
 	 * @return
 	 */
-	public Map<String, BigDecimal> countOrderByHongBaoType(Long uid, Integer day);
-	
-	
+	public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day);
+
 	/**
 	 * 缁熻璁㈠崟
+	 * 
 	 * @param uid
 	 * @return
 	 */
-	public long countOrder(Long uid, Integer type, Integer isToday);
-	
+	public long countBonusOrderNumber(Long uid, Integer type, Integer isToday, String startTime, String endTime);
+
 	/**
 	 * 缁熻璁㈠崟
+	 * 
 	 * @param uid
 	 * @return
 	 */
-	public BigDecimal countOrderMoney(Long uid, Integer type,  Integer isToday);
+	public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer isToday, String startTime, String endTime);
 
 	/**
 	 * 鏍规嵁鏉′欢缁熻
+	 * 
 	 * @param uid
 	 * @param type
 	 * @param startTime
 	 * @param endTime
 	 * @return
 	 */
-	public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime);
+	public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime,
+			Integer day);
+
+	/**
+	 * 鏍规嵁璁㈠崟鍙蜂笌璁㈠崟绫诲瀷鏌ヨ璁㈠崟
+	 * 
+	 * @param sourceType
+	 * @param orderId
+	 * @return
+	 */
+	public List<CommonOrder> listBySourceTypeAndOrderId(int sourceType, String orderId);
+
+	/**
+	 * 缂撳瓨鏅�氳鍗�
+	 * 
+	 * @param taoBaoOrder
+	 * @param uid
+	 * @return
+	 */
+	public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrder, Long uid) throws CommonOrderException;
+
+
+	/**
+	 * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺
+	 * @param uid
+	 * @param state
+	 * @param minDate
+	 * @param maxDate
+	 * @return
+	 */
+	long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate);
 
 }

--
Gitblit v1.8.0