From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 205 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 170 insertions(+), 35 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..b4cc256 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,12 +1,16 @@
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;
+
+import net.sf.json.JSONObject;
public interface CommonOrderService {
@@ -15,32 +19,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 +59,176 @@
* @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);
-
-
- /**
- * 缁熻璁㈠崟
- * @param uid
- * @return
- */
- public long countOrder(Long uid, Integer type, Integer isToday);
-
- /**
- * 缁熻璁㈠崟
- * @param uid
- * @return
- */
- public BigDecimal countOrderMoney(Long uid, Integer type, Integer isToday);
+ public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day);
/**
+ * 缁熻璁㈠崟
+ *
+ * @param uid
+ * @return
+ */
+ public long countBonusOrderNumber(Long uid, Integer type, Integer isToday, String startTime, String endTime);
+
+ /**
+ * 缁熻璁㈠崟
+ *
+ * @param uid
+ * @return
+ */
+ public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer isToday, String startTime, String endTime);
+
+ /**
+ * 缁熻濂栭噾璁㈠崟鏁伴噺銆侀噾棰�
+ * @param uid
+ * @param type
+ * @param day
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, 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
+ */
+ public long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate);
+
+ /**
+ * 鍚庣鏌ヨ璁㈠崟鍒楄〃
+ * @param start
+ * @param count
+ * @param uid
+ * @param state
+ * @param type
+ * @param orderState
+ * @param orderNo
+ * @param startTime
+ * @param endTime
+ * @param dateType 1鏄ㄥぉ 2浠婂ぉ 3鏈湀 4 涓婃湀
+ * @return
+ * @throws CommonOrderException
+ */
+ public List<CommonOrderVO> listQueryByUid(long start, int count, Long uid, Integer state, Integer type,
+ Integer orderState, String orderNo, String startTime, String endTime, Integer dateType)
+ throws CommonOrderException;
+
+ public long countQueryByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo, String startTime,
+ String endTime, Integer dateType) throws CommonOrderException;
+
+ /**
+ * 鏌ヨ鎵�鏈夌敤鎴疯鍗�
+ * @param start
+ * @param count
+ * @param keyType
+ * @param key
+ * @param state
+ * @param type
+ * @param orderState
+ * @param startTime
+ * @param endTime
+ * @return
+ * @throws CommonOrderException
+ */
+
+ public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state, Integer type,
+ Integer orderState, String startTime, String endTime) throws CommonOrderException;
+
+ public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState, String startTime,
+ String endTime) throws CommonOrderException;
+
+ /**
+ * 鏍规嵁璁㈠崟鍙疯幏鍙栦俊鎭�
+ * @param orderNo
+ * @return
+ * @throws CommonOrderException
+ */
+ public CommonOrderVO getInfoByOrderNo(Long uid, String orderNo) throws CommonOrderException;
+
+ /**
+ * 鏌ヨ鍒稿鍔遍噾棰濅互鍙婅鍗曚俊鎭�
+ * @param uid
+ * @param state
+ * @param orderNo
+ * @return
+ * @throws CommonOrderException
+ */
+ public List<CommonOrderVO> getCouponHongbaoByOrderNo(Long uid, Integer state, String orderNo) throws CommonOrderException;
+
+ /**
+ * 鏌ヨ璁㈠崟
+ * @param uid
+ * @param orderNo
+ * @return
+ * @throws CommonOrderException
+ */
+ public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState) throws CommonOrderException;
+
+ /**
+ * 浣跨敤濂栧姳鍒告垚鍔熷悗璺宠浆 淇敼
+ * @param orderNo
+ * @return
+ */
+ public JSONObject getRewardJumpInfo(String orderNo);
}
--
Gitblit v1.8.0