bug修改

mitao

2025-01-17 afa0dbb4f54e7244835dd67ec33c3e545f122f71

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java

@@ -3,8 +3,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.ProfitSharingResult;
import com.github.binarywang.wxpay.bean.ecommerce.RefundNotifyResult;
import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingNotifyResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.ruoyi.order.domain.dto.MerVerifyPrizeDto;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.order.Order;
@@ -233,7 +235,7 @@
    * @author jqs34
    * @date 2023/6/18 17:20
    */
    MgtBulletinBoardVo boardOrderTotal();
    MgtBulletinBoardVo boardOrderTotal(List<Long> userIds);

    /**
    * @description 获取商户订单统计
@@ -431,7 +433,7 @@
     * @param  transaction
     * @return  void
     */
    void payBack(PartnerTransactionsResult transaction);
    void payBack(PartnerTransactionsResult transaction, BigDecimal feeAmount);

    /**
     * 取消订单
@@ -534,10 +536,6 @@
    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  获取销售排行
@@ -588,4 +586,15 @@
     * @return  MerMemberSimpleTotalVo
     */
    MerMemberSimpleTotalVo getMerMemberSimpleTotalVo(MerBaseDto merBaseDto);


    ProfitSharingResult queryBill(String orderId) throws WxPayException;


    /**
     * 根据活动id获取订单商品id列表
     * @param activityId
     * @return
     */
    List<String> getActivityOrderGoods(String activityId);
}