From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 16 七月 2020 15:37:31 +0800 Subject: [PATCH] dubbo集成修改 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 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 005024e..8ab015d 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 @@ -6,6 +6,7 @@ import java.util.Map; import com.yeshi.fanli.dto.order.CommonOrderAddResultDTO; +import com.yeshi.fanli.entity.SystemEnum; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.jd.JDOrder; import com.yeshi.fanli.entity.order.CommonOrder; @@ -260,12 +261,12 @@ public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state, Integer type, Integer orderState, String startTime, String endTime, Integer source, - List<Long> listShopId, List<Long> listGoodsId, Date minTime, BigDecimal money,BigDecimal payment) + List<Long> listShopId, List<Long> listGoodsId, Date minTime, BigDecimal money,BigDecimal payment, SystemEnum system) throws CommonOrderException; public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState, String startTime, String endTime, Integer source, - List<Long> listShopId, List<Long> listGoodsId,Date minTime, BigDecimal money,BigDecimal payment) throws CommonOrderException; + List<Long> listShopId, List<Long> listGoodsId,Date minTime, BigDecimal money,BigDecimal payment, SystemEnum system) throws CommonOrderException; /** * 鏌ヨ璁㈠崟 @@ -489,4 +490,11 @@ */ public List<CommonOrder> getByOrderNoAndSourceType(Long uid, String orderNO, int sourceType); + /** + * 棣栧崟 + * @param uid + * @return + */ + public CommonOrder getFirstOrder(Long uid); + } -- Gitblit v1.8.0