From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期六, 18 一月 2020 12:06:27 +0800 Subject: [PATCH] 用户注册信息 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 125 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 109 insertions(+), 16 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 bcc9639..b1da93c 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,13 +5,16 @@ import java.util.List; import java.util.Map; +import com.yeshi.fanli.dto.order.CommonOrderAddResultDTO; 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.order.ESOrder; 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 com.yeshi.fanli.vo.order.OrderCountVO; import net.sf.json.JSONObject; @@ -63,7 +66,7 @@ * @throws CommonOrderException */ long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo, - String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException; + String startTime, String endTime, Integer dateType, List<Integer> listSource) throws CommonOrderException; /** * 绉诲姩娈佃鍗曞垪琛� @@ -76,8 +79,9 @@ * 鍒拌处鐘舵�� * @return */ - 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; + public List<CommonOrderVO> getOrderByUid(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type, + Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, List<Integer> listSource) + throws CommonOrderException,Exception; /** * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩 @@ -93,7 +97,8 @@ * @param uid * @return */ - public long countBonusOrderNumber(Long uid, Integer type, Integer isToday, String startTime, String endTime, Integer source); + public long countBonusOrderNumber(Long uid, Integer type, Integer isToday, String startTime, String endTime, + Integer source); /** * 缁熻璁㈠崟 @@ -101,7 +106,8 @@ * @param uid * @return */ - public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer isToday, String startTime, String endTime, Integer source); + public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer isToday, String startTime, String endTime, + Integer source); /** * 缁熻濂栭噾璁㈠崟鏁伴噺銆侀噾棰� @@ -114,7 +120,7 @@ * @return */ public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime, - String endTime); + String endTime, Integer source); /** * 鏍规嵁鏉′欢缁熻 @@ -125,8 +131,8 @@ * @param endTime * @return */ - public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime, - Integer day, Integer source); + public Long countUserOrderToApp(Long uid, Integer type, String startTime, String endTime, + Integer day, Integer source, Integer state, Integer stateOrder); /** * 鏍规嵁璁㈠崟鍙蜂笌璁㈠崟绫诲瀷鏌ヨ璁㈠崟 @@ -145,7 +151,7 @@ * @return * @throws CommonOrderException */ - public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrder, Long uid) throws CommonOrderException; + public List<CommonOrderAddResultDTO> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrder, Long uid) throws CommonOrderException; /** * 缂撳瓨鎷煎澶氱被鏅�氳鍗� @@ -155,7 +161,7 @@ * @return * @throws CommonOrderException */ - public List<CommonOrder> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) throws CommonOrderException; + public List<CommonOrderAddResultDTO> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) throws CommonOrderException; /** * 缂撳瓨浜笢鏅�氳鍗� @@ -165,7 +171,7 @@ * @return * @throws CommonOrderException */ - public List<CommonOrder> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException; + public List<CommonOrderAddResultDTO> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException; /** * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺 @@ -219,11 +225,13 @@ */ 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; + Integer type, Integer orderState, String startTime, String endTime, Integer source, + List<Long> listShopId, List<Long> listGoodsId, Date minTime, BigDecimal money) + throws CommonOrderException; public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState, - String startTime, String endTime, Integer source) throws CommonOrderException; - + String startTime, String endTime, Integer source, + List<Long> listShopId, List<Long> listGoodsId,Date minTime, BigDecimal money) throws CommonOrderException; /** * 鏌ヨ璁㈠崟 @@ -242,7 +250,7 @@ * @param orderNo * @return */ - public JSONObject getRewardJumpInfo(String orderNo); + public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType); /** * 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯� @@ -280,7 +288,92 @@ * @param pageSize * @return */ - List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime, + 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); + + /** + * 鏍规嵁鐢ㄦ埛ID鏌ヨ鏈�杩戜竴鏉℃湁鏁堢殑璁㈠崟 + * + * @param uid + * @return + */ + public CommonOrder selectLatestValidByUid(Long uid); + + /** + * 鏌ヨ棣栫瑪鏈夋晥璁㈠崟 + * @param uid + * @return + */ + public CommonOrderVO firstValidOrderByUid(Long uid); + + + /** + * 鏌ヨ棣栫瑪鏈夋晥璁㈠崟 + * @param uid + * @param type 绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇� + * @return + */ + public CommonOrderVO firstValidOrderByUidAndType(Long uid, Integer type); + + /** + * 鏌ヨ鏄惁涓婃湀鍒拌处璁㈠崟 + * @param uid + * @param type 绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇� + * @return + */ + public CommonOrderVO firstValidOrderLastMonthByUidAndType(Long uid, Integer type); + + /** + * 棣栦釜鍒嗕韩璁㈠崟 + * @param uid + * @return + */ + public CommonOrder getFirstShareOrderByUid(Long uid); + + /** + * 璁㈠崟涓幏寰楁湁鏁堝閲� + * @param orderNo + * @param sourceType + * @return + */ + public BigDecimal getTotalRewardMoneyByOrderNoAndSourceType(String orderNo, Integer sourceType); + + /** + * 缁熻24灏忔椂鏈夋晥鑷喘璁㈠崟 + * @param uid + * @param minTime + * @return + */ + public long count24HValidOrderByUid(Long uid, Date minTime); + + /** + * 璁㈠崟缁熻鏈夋晥鏁伴噺 + * @param uid + * @param day + * @param source + * @return + */ + public OrderCountVO getOrderCount(Long uid, Integer day, List<Integer> listSource); + + /** + * 鎼滅储璁㈠崟淇℃伅 + * @param page + * @param size + * @param uid + * @param list + * @return + */ + public List<CommonOrderVO> searchOrderByUid(int page, int size, Long uid, List<ESOrder> list) throws Exception; + + public long countSearchOrderByUid(Long uid, List<ESOrder> list); + } -- Gitblit v1.8.0