From 0b413f3fd67110cfd7752f27eb171bde06edc4b4 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 18 八月 2023 18:56:39 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java |  264 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 257 insertions(+), 7 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 fd0480c..0012d41 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,6 +2,10 @@
 
 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.*;
@@ -9,8 +13,9 @@
 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.MgtMapTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -33,11 +38,30 @@
     AppSureOrderVo buyGoods(AppSureOrderDto appSureOrderDto);
 
     /**
+     * @description  抢购商品
+     * @author  jqs
+     * @date    2023/7/6 11:45
+     * @param appPanicBuyDto
+     * @return  AppSureOrderVo
+     */
+    AppPanicBuyVo panicBuyGoods(AppPanicBuyDto appPanicBuyDto);
+
+
+    /**
      * 创建订单
      * @param appPlaceOrderDto
      * @return
      */
     AppPlaceOrderVo placeOrder(AppPlaceOrderDto appPlaceOrderDto);
+
+    /**
+     * @description  创建活动订单
+     * @author  jqs
+     * @date    2023/7/6 17:59
+     * @param appPlaceActivityDto
+     * @return  AppPlaceOrderVo
+     */
+    AppPlaceOrderVo placeActivityOrder( AppPlaceActivityDto appPlaceActivityDto);
 
     /**
      * 分页获取用户订单
@@ -79,7 +103,7 @@
      * @param orderId
      * @return
      */
-    MerVerifyOrderVo verifyOrder(String orderId);
+    MerVerifyOrderVo verifyOrder(String orderId,Long shopId);
 
     /**
      * 确认核销订单
@@ -87,6 +111,24 @@
      * @return
      */
     MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto);
+
+    /**
+     * @description  确认核销优惠券
+     * @author  jqs
+     * @date    2023/6/28 11:26
+     * @param merVerifyCouponDto
+     * @return  MerVerifyCouponVo
+     */
+    MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto);
+
+    /**
+     * @description  确认核销奖品
+     * @author  jqs
+     * @date    2023/7/9 9:54
+     * @param merVerifyPrizeDto
+     * @return  MerVerifyAwardVo
+     */
+    MerVerifyAwardVo sureVerifyPrize(MerVerifyPrizeDto merVerifyPrizeDto);
 
     /**
      * 收银未结清订单列表
@@ -114,7 +156,7 @@
      * @param merOrderPageDto
      * @return
      */
-    List<MerOrderPageVo> pageMerOrder(Page page,MerOrderPageDto merOrderPageDto);
+    List<MerOrderPageVo> pageMerOrder(Page page, MerOrderPageDto merOrderPageDto);
 
     /**
      * 分页商户端用户收银记录
@@ -122,7 +164,7 @@
      * @param merMemberNoClearOrderDto
      * @return
      */
-    List<MerMemberNoClearOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto);
+    List<MerMemberOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto);
 
     /**
      * 获取用户订单统计
@@ -229,9 +271,9 @@
      * @author  jqs
      * @date    2023/6/21 15:27
      * @param mgtBasePlatformDto
-     * @return  List<MgtMapTotalVo>
+     * @return  List<MgtMapIntTotalVo>
      */
-    List<MgtMapTotalVo> listMemberGoodsRank(MgtBasePlatformDto mgtBasePlatformDto);
+    List<MgtMapIntTotalVo> listMemberGoodsRank(MgtBasePlatformDto mgtBasePlatformDto);
 
     /**
     * @description 获取平台商户数据统计
@@ -276,5 +318,213 @@
      * @param verifyCode
      * @return  MerVerifyCouponVo
      */
-    MerVerifyCouponVo verifyCoupon(String verifyCode);
+    MerVerifyCouponVo verifyCoupon(String verifyCode,Long shopId);
+
+    /**
+     * @description  获取核销奖品
+     * @author  jqs
+     * @date    2023/7/8 17:46
+     * @param verifyCode
+     * @param shopId
+     * @return  MerVerifyAwardVo
+     */
+    MerVerifyAwardVo verifyPrize(String verifyCode,Long shopId);
+
+    /**
+     * @description  获取用户未支付金额
+     * @author  jqs
+     * @date    2023/6/29 18:00
+     * @param merBaseDto
+     * @return  BigDecimal
+     */
+    BigDecimal getMemberUnpaidOrder(MerBaseDto merBaseDto);
+
+    /**
+     * @description  商户端获取订单统计
+     * @author  jqs
+     * @date    2023/7/3 19:29
+     * @param merTotalDto
+     * @return  MerOrderTotalVo
+     */
+    MerOrderTotalVo getMerOrderTotal(MerTotalDto merTotalDto);
+
+    /**
+     * @description  商户端获取订单分布统计
+     * @author  jqs
+     * @date    2023/7/4 9:29
+     * @param merTotalDto
+     * @return  MerOrderDistributionTotalVo
+     */
+    MerOrderDistributionTotalVo MerOrderDistributionTotalVo(MerTotalDto merTotalDto);
+
+    /**
+     * @description  商户端获取销售占比统计
+     * @author  jqs
+     * @date    2023/7/4 13:58
+     * @param merTotalDto
+     * @return  MerOrderTypeTotalVo
+     */
+    MerOrderTypeTotalVo getMerOrderTypeTotal(MerTotalDto merTotalDto);
+
+    /**
+     * @description  商户端获取销售排行
+     * @author  jqs
+     * @date    2023/7/4 14:23
+     * @param merTotalDto
+     * @return  MerOrderGoodsRankVo
+     */
+    MerOrderGoodsRankVo getMerOrderGoodsRank(MerTotalDto merTotalDto);
+
+    /**
+     * @description  商户端获取渠道排行
+     * @author  jqs
+     * @date    2023/7/4 14:51
+     * @param merTotalDto
+     * @return  MerOrderFromRankVo
+     */
+    MerOrderFromRankVo getMerOrderFromRank(MerTotalDto merTotalDto);
+
+    /**
+     * @description  商户端订单管理统计
+     * @author  jqs
+     * @date    2023/7/4 16:27
+     * @param merOrderPageDto
+     * @return  MerTotalOrderVo
+     */
+    MerTotalOrderVo totalMerOrder(MerOrderPageDto merOrderPageDto);
+
+    /**
+     * @description  平台获取商户订单记录
+     * @author  jqs
+     * @date    2023/7/5 20:17
+     * @param page
+     * @param mgtShopAllOrderPageDto
+     * @return  List<MgtShopAllOrderPageVo>
+     */
+    List<MgtShopAllOrderPageVo> pageMgtShopAllOrder(Page page, MgtShopAllOrderPageDto mgtShopAllOrderPageDto);
+
+    /**
+     * @description 自动取消订单
+     * @author  jqs
+     * @date    2023/7/13 17:15
+     * @param orderId
+     * @return  void
+     */
+    void autoCancelOrder(String orderId);
+
+    /**
+     * @description  订单支付回调
+     * @author  jqs
+     * @date    2023/7/13 17:57
+     * @param  transaction
+     * @return  void
+     */
+    void payBack(PartnerTransactionsResult transaction);
+
+    /**
+     * 取消订单
+     * @param orderId
+     */
+    void refundOrder(String orderId);
+
+    /**
+     * @description  员工端活动订单统计
+     * @author  jqs
+     * @date    2023/7/17 15:25
+     * @param staffTotalDto
+     * @return  StaffActivityOrderTotalVo
+     */
+    StaffActivityOrderTotalVo getStaffActivityOrderTotal(StaffTotalDto staffTotalDto);
+
+
+    /**
+     * @description  员工端活动统计
+     * @author  jqs
+     * @date    2023/7/17 15:51
+     * @param staffTotalDto
+     * @return  StaffActivityTotalVo
+     */
+    StaffActivityTotalVo getStaffActivityTotal(StaffTotalDto staffTotalDto);
+
+    /**
+     * @description  员工端活动统计订单分布
+     * @author  jqs
+     * @date    2023/7/17 16:16
+     * @param staffTotalDto
+     * @return  MerOrderDistributionTotalVo
+     */
+    MerOrderDistributionTotalVo getStaffOrderDistributionTotal(StaffTotalDto staffTotalDto);
+
+
+    /**
+     * @description  员工端活动统计销售占比
+     * @author  jqs
+     * @date    2023/7/17 17:03
+     * @param staffTotalDto
+     * @return  MerOrderTypeTotalVo
+     */
+    MerOrderTypeTotalVo getStaffOrderTypeTotal(StaffTotalDto staffTotalDto);
+
+    /**
+     * @description  员工端获客人数
+     * @author  jqs
+     * @date    2023/7/17 18:42
+     * @param staffTotalDto
+     * @return  StaffActivityDateMemberTotalVo
+     */
+    StaffActivityDateMemberTotalVo getStaffActivityGetMemberTotal(StaffTotalDto staffTotalDto);
+
+    /**
+     * @description  员工端获客人数
+     * @author  jqs
+     * @date    2023/7/17 18:42
+     * @param staffTotalDto
+     * @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);
 }

--
Gitblit v1.7.1