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 |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 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 36c35cc..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
@@ -5,6 +5,7 @@
 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.*;
@@ -13,7 +14,6 @@
 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.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -156,7 +156,7 @@
      * @param merOrderPageDto
      * @return
      */
-    List<MerOrderPageVo> pageMerOrder(Page page,MerOrderPageDto merOrderPageDto);
+    List<MerOrderPageVo> pageMerOrder(Page page, MerOrderPageDto merOrderPageDto);
 
     /**
      * 分页商户端用户收银记录
@@ -164,7 +164,7 @@
      * @param merMemberNoClearOrderDto
      * @return
      */
-    List<MerMemberNoClearOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto);
+    List<MerMemberOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto);
 
     /**
      * 获取用户订单统计
@@ -388,7 +388,7 @@
      * @description  商户端订单管理统计
      * @author  jqs
      * @date    2023/7/4 16:27
-     * @param merBaseDto
+     * @param merOrderPageDto
      * @return  MerTotalOrderVo
      */
     MerTotalOrderVo totalMerOrder(MerOrderPageDto merOrderPageDto);
@@ -416,7 +416,7 @@
      * @description  订单支付回调
      * @author  jqs
      * @date    2023/7/13 17:57
-     * @param Transaction transaction
+     * @param  transaction
      * @return  void
      */
     void payBack(PartnerTransactionsResult transaction);
@@ -521,4 +521,10 @@
      * @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