From b3942f278045cf74410d81a62ded4696f22d170d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 13:08:14 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java |   93 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 83 insertions(+), 10 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 aeb0925..9be0d02 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
@@ -2,14 +2,15 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsResult;
+import com.github.binarywang.wxpay.bean.ecommerce.RefundNotifyResult;
+import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingNotifyResult;
+import com.ruoyi.order.domain.dto.MerVerifyPrizeDto;
 import com.ruoyi.order.domain.dto.*;
 import com.ruoyi.order.domain.pojo.order.Order;
 import com.ruoyi.order.domain.vo.*;
 import com.ruoyi.system.api.domain.dto.*;
-import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
-import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
-import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
-import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
+import com.ruoyi.system.api.domain.vo.*;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -152,7 +153,7 @@
      * @param merOrderPageDto
      * @return
      */
-    List<MerOrderPageVo> pageMerOrder(Page page,MerOrderPageDto merOrderPageDto);
+    List<MerOrderPageVo> pageMerOrder(Page page, MerOrderPageDto merOrderPageDto);
 
     /**
      * 分页商户端用户收银记录
@@ -160,7 +161,7 @@
      * @param merMemberNoClearOrderDto
      * @return
      */
-    List<MerMemberNoClearOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto);
+    List<MerMemberOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto);
 
     /**
      * 获取用户订单统计
@@ -384,10 +385,10 @@
      * @description  商户端订单管理统计
      * @author  jqs
      * @date    2023/7/4 16:27
-     * @param merBaseDto
+     * @param merOrderPageDto
      * @return  MerTotalOrderVo
      */
-    MerTotalOrderVo totalMerOrder(MerBaseDto merBaseDto);
+    MerTotalOrderVo totalMerOrder(MerOrderPageDto merOrderPageDto);
 
     /**
      * @description  平台获取商户订单记录
@@ -412,10 +413,10 @@
      * @description  订单支付回调
      * @author  jqs
      * @date    2023/7/13 17:57
-     * @param orderId
+     * @param  transaction
      * @return  void
      */
-    void payBack(String orderId);
+    void payBack(PartnerTransactionsResult transaction);
 
     /**
      * 取消订单
@@ -478,4 +479,76 @@
      * @return  StaffActivityDateMemberTotalVo
      */
     StaffActivityDateMemberTotalVo getStaffActivityMemberTotal(StaffTotalDto staffTotalDto);
+
+
+    /**
+     * @description  检查订单状态定时任务
+     * @author  jqs
+     * @date    2023/7/25 14:40
+     * @param
+     * @return  void
+     */
+    void checkOrderStatus();
+
+    /**
+     * 分账通知回调
+     * @param result
+     */
+    void profitSharingBack(ProfitSharingNotifyResult result);
+
+    /**
+     * 订单退款回调
+     * @param result
+     */
+    void orderRefundBack(RefundNotifyResult result);
+
+    /**
+     * @description  获取商户订单统计
+     * @author  jqs
+     * @date    2023/8/4 10:25
+     * @param mgtShopAllOrderPageDto
+     * @return  MgtShopAllOrderTotal
+     */
+    MgtShopAllOrderTotal getMgtShopAllOrderTotal(MgtShopAllOrderPageDto mgtShopAllOrderPageDto);
+
+
+    /**
+     * 分页获取会员消费记录
+     * @param merOrderPageDto
+     * @return
+     */
+    List<MerOrderPageVo> pageMerMemberPayOrder(Page page,MerMemberNoClearOrderDto merOrderPageDto);
+
+
+    void createWxPayInfo(AppPlaceOrderVo appPlaceOrderVo, Long userId, Long shopId,
+                                 String goodsName, String orderNo,
+                                 String orderId, BigDecimal payMoney,
+                                 String openid, String payerClientIp, List<String> goodsNameList,Integer orderFrom);
+
+    /**
+     * @description  获取销售排行
+     * @author  jqs
+     * @date    2023/8/24 18:00
+     * @param shopIdList
+     * @return  List<MgtMapIntTotalVo>
+     */
+    List<MgtMapBigTotalVo> shopSalesRank(List<Long> shopIdList);
+
+    /**
+     * @description  获取商户服务统计
+     * @author  jqs
+     * @date    2023/8/24 18:28
+     * @param shopId
+     * @return  MerHomeShopTotalVo
+     */
+    MerHomeShopTotalVo getShopServiceTotal(Long shopId);
+
+    /**
+     * @description  获取区域统计
+     * @author  jqs
+     * @date    2023/8/25 11:49
+     * @param shopIdList
+     * @return  AgencyTotalVo
+     */
+    AgencyTotalVo getAgencyTotalVo(List<Long> shopIdList);
 }

--
Gitblit v1.7.1