From 4220ceb661146c58d1d6855f14dcdcc3d8c7bb24 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期六, 05 一月 2019 14:45:10 +0800 Subject: [PATCH] Merge branch 'div1' --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 90 +++++++++++++++++++++++++++++++++----------- 1 files changed, 67 insertions(+), 23 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..4312b76 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 @@ -5,6 +5,7 @@ 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 +16,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 +56,88 @@ * @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 BigDecimal countOrderMoney(Long uid, Integer type, Integer isToday); /** * 鏍规嵁鏉′欢缁熻 + * * @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 CommonOrder addTaoBaoOrder(TaoBaoOrder taoBaoOrder, Long uid) throws CommonOrderException; + + /** + * 鏍规嵁鎻愭潯浠剁粺璁″凡鍒拌处閲戦 + * @param uid + * @param type + * @param orderNo + * @param startTime + * @param endTime + * @param day + * @return + */ + public Map<String, Object> countMoneyGroupOrderNoByUid(Long uid, Integer type, String orderNo, String startTime, + String endTime, Integer day); } -- Gitblit v1.8.0