From 4178aef23242c8689bbf320a607f2de12676d32c Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期六, 26 八月 2023 18:40:16 +0800 Subject: [PATCH] bug --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java index 62641ed..273d3e9 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java @@ -480,7 +480,6 @@ */ StaffActivityDateMemberTotalVo getStaffActivityMemberTotal(StaffTotalDto staffTotalDto); - /** * @description 检查订单状态定时任务 * @author jqs @@ -523,7 +522,7 @@ void createWxPayInfo(AppPlaceOrderVo appPlaceOrderVo, Long userId, Long shopId, String goodsName, String orderNo, String orderId, BigDecimal payMoney, - String openid, String payerClientIp, List<String> goodsNameList); + String openid, String payerClientIp, List<String> goodsNameList,Integer orderFrom); /** * @description 获取销售排行 @@ -542,4 +541,27 @@ * @return MerHomeShopTotalVo */ MerHomeShopTotalVo getShopServiceTotal(Long shopId); + + /** + * @description 获取区域统计 + * @author jqs + * @date 2023/8/25 11:49 + * @param shopIdList + * @return AgencyTotalVo + */ + AgencyTotalVo getAgencyTotalVo(List<Long> shopIdList); + + /** + * 订单编号获取订单 + * @param orderNo + * @return + */ + Order getByOrderNo(String orderNo); + + /** + * + * @param outTradeNo + * @return + */ + Order getByOutTradeNo(String outTradeNo); } -- Gitblit v1.7.1