From 788deca1b4a24f8a24e49c24f7d89975a1d74bbe Mon Sep 17 00:00:00 2001 From: admin <2780501319@qq.com> Date: 星期日, 03 十一月 2019 23:31:25 +0800 Subject: [PATCH] 商城订单退款处理 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 81 +++++++++++++++++++++++++++++++++------- 1 files changed, 66 insertions(+), 15 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 0599cdd..713aa4c 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.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; @@ -76,8 +77,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, Integer source) + throws CommonOrderException,Exception; /** * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩 @@ -93,7 +95,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 +104,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 +118,7 @@ * @return */ public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime, - String endTime); + String endTime, Integer source); /** * 鏍规嵁鏉′欢缁熻 @@ -125,8 +129,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 +149,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 +159,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 +169,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 +223,11 @@ */ public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state, - Integer type, Integer orderState, String startTime, String endTime) throws CommonOrderException; + 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) throws CommonOrderException; - + String startTime, String endTime, Integer source) throws CommonOrderException; /** * 鏌ヨ璁㈠崟 @@ -233,7 +237,7 @@ * @return * @throws CommonOrderException */ - public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState) + public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState, Integer sourceType) throws CommonOrderException; /** @@ -242,7 +246,7 @@ * @param orderNo * @return */ - public JSONObject getRewardJumpInfo(String orderNo); + public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType); /** * 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯� @@ -253,4 +257,51 @@ */ 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); + + /** + * 鏍规嵁鐢ㄦ埛ID鏌ヨ鏈�杩戜竴鏉℃湁鏁堢殑璁㈠崟 + * + * @param uid + * @return + */ + public CommonOrder selectLatestValidByUid(Long uid); + } -- Gitblit v1.8.0