From 0d9ac58dc11f54351e5e18dba8e950717d78019f Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 09 九月 2019 14:55:24 +0800 Subject: [PATCH] 搜索发现 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 243 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 218 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..04fcc46 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,19 @@ 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.accept.AcceptData; +import com.yeshi.fanli.entity.jd.JDOrder; import com.yeshi.fanli.entity.order.CommonOrder; +import com.yeshi.fanli.entity.pdd.PDDOrder; +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 +22,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, Integer source) + throws CommonOrderException; /** * 缁熻鏌ヨ + * * @param uid * @param state * @param type @@ -50,50 +62,231 @@ * @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, Integer source) 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(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type, Integer orderState, + String orderNo, String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException; /** * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩 + * * @param uid * @return */ - public Map<String, BigDecimal> countOrderByHongBaoType(Long uid, Integer day); - - + public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source); + /** * 缁熻璁㈠崟 + * * @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, Integer source); + /** * 缁熻璁㈠崟 + * * @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, Integer source); + + /** + * 缁熻濂栭噾璁㈠崟鏁伴噺銆侀噾棰� + * + * @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, Integer source); /** * 鏍规嵁鏉′欢缁熻 + * * @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, Integer source); + + /** + * 鏍规嵁璁㈠崟鍙蜂笌璁㈠崟绫诲瀷鏌ヨ璁㈠崟 + * + * @param sourceType + * @param orderId + * @return + */ + public List<CommonOrder> listBySourceTypeAndOrderId(int sourceType, String orderId); + + /** + * 缂撳瓨娣樺疂绫绘櫘閫氳鍗� + * + * @param taoBaoOrder + * @param uid + * @return + * @throws CommonOrderException + */ + public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrder, Long uid) throws CommonOrderException; + + /** + * 缂撳瓨鎷煎澶氱被鏅�氳鍗� + * + * @param pddOrderList + * @param uid + * @return + * @throws CommonOrderException + */ + public List<CommonOrder> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) throws CommonOrderException; + + /** + * 缂撳瓨浜笢鏅�氳鍗� + * + * @param jdOrderList + * @param uid + * @return + * @throws CommonOrderException + */ + public List<CommonOrder> addJDOrder(JDOrder jdOrder, 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, Integer source) throws CommonOrderException; + + public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState, + String startTime, String endTime, Integer source) throws CommonOrderException; + /** + * 鏌ヨ璁㈠崟 + * + * @param uid + * @param orderNo + * @return + * @throws CommonOrderException + */ + public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState, Integer sourceType) + throws CommonOrderException; + + /** + * 浣跨敤濂栧姳鍒告垚鍔熷悗璺宠浆 淇敼 + * + * @param orderNo + * @return + */ + public JSONObject getRewardJumpInfo(String orderNo); + + /** + * 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯� + * + * @param sourceType + * @param tradeId + * @return + */ + public CommonOrder selectBySourceTypeAndTradeId(int sourceType, String tradeId); + + /** + * 鍒犻櫎閿欒璁㈠崟 + * + * @param coId + */ + public void deleteErrorCommonOrder(Long coId); + + /** + * 鏍规嵁璁㈠崟绫诲瀷涓庝氦鏄揑D鏌ヨ + * + * @param sourceType + * @param tradeId + * @return + */ + public List<CommonOrder> listBySourceTypeAndTradeId(int sourceType, String tradeId); + + /** + * 鏍规嵁鏉′欢鏌ヨ璁㈠崟 + * + * @param sourceType + * @param state + * @param minTime + * @param maxTime + * @param page + * @param pageSize + * @return + */ + public List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime, + Long maxTime, int page, int pageSize); + + /** + * 鏌ヨ璁㈠崟 -鏍规嵁璁㈠崟鍙� + * @param uid + * @param orderNO + * @return + */ + public List<CommonOrder> getByOrderNo(Long uid, String orderNO); } -- Gitblit v1.8.0