From fdb089cb8bee6099efcbd7b0ca2672c63cbb6784 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 11 十一月 2019 09:33:56 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/shop/BanLiShopOrderService.java | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/shop/BanLiShopOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/shop/BanLiShopOrderService.java index 429c814..4b28fd2 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/shop/BanLiShopOrderService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/shop/BanLiShopOrderService.java @@ -3,7 +3,6 @@ import java.math.BigDecimal; import java.util.List; -import com.yeshi.fanli.entity.shop.BanLiShopGoodsSetsPay; import com.yeshi.fanli.entity.shop.BanLiShopOrder; import com.yeshi.fanli.exception.redpack.RedPackBalanceException; import com.yeshi.fanli.exception.shop.BanLiShopOrderException; @@ -23,23 +22,24 @@ * @throws BanLiShopOrderException */ public void addOrder(BanLiShopOrder order) throws BanLiShopOrderException; - - + /** * 鏋勯�犺鍗� + * * @param pay * @param uid * @return * @throws BanLiShopOrderException */ - public BanLiShopOrder createOrder(Long goodsSetPayId,String chargeAccount,Long uid) throws BanLiShopOrderException;; + public BanLiShopOrder createOrder(Long goodsSetPayId, String chargeAccount, Long uid) + throws BanLiShopOrderException;; /** * 浣胯鍗曞け鏁� * * @param id */ - public void invalidOrderByOrderId(Long id,String desc); + public void invalidOrderByOrderId(Long id, String desc); /** * 鎷掔粷璁㈠崟 @@ -88,6 +88,26 @@ public long countByUid(Long uid); /** + * 鏍规嵁鐢ㄦ埛ID,鐘舵�佹煡璇� + * + * @param uid + * @param stateList + * @param page + * @param pageSize + * @return + */ + public List<BanLiShopOrder> listByUidAndState(Long uid, List<Integer> stateList, int page, int pageSize); + + /** + * 鏍规嵁鐢ㄦ埛ID,鐘舵�佹煡璇� + * + * @param uid + * @param stateList + * @return + */ + public long countByUidAndState(Long uid, List<Integer> stateList); + + /** * 鏍规嵁涓婚敭妫�绱� * * @param id @@ -101,9 +121,10 @@ * @param order */ public void udpateSelectiveByPrimaryKey(BanLiShopOrder order); - + /** * 鏍规嵁璁㈠崟鍙锋煡璇� + * * @param orderNo * @return */ -- Gitblit v1.8.0