From cfeca361311321474e2ed147db874946c652fc92 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 17:56:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
index 0af1e43..9965f68 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
@@ -1,6 +1,7 @@
package com.ruoyi.order.controller.miniapp;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.web.controller.BaseController;
@@ -183,8 +184,9 @@
Long userId = SecurityUtils.getUserId();
AppPlaceOrderVo appPlaceOrderVo = new AppPlaceOrderVo();
Order order = orderService.getById(appBaseGetDto.getId());
- order.setOrderStatus(2);
- orderService.saveOrUpdate(order);
+ PartnerTransactionsResult transaction = new PartnerTransactionsResult();
+ transaction.setOutTradeNo(appBaseGetDto.getId());
+ orderService.payBack(transaction);
appPlaceOrderVo.setOrderId(order.getOrderId());
appPlaceOrderVo.setOrderNo(order.getOrderNo());
appPlaceOrderVo.setPayType(order.getPayType());
--
Gitblit v1.7.1