From 30bc5274884e0f6d11580f9d3af9e71d7a320888 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 24 八月 2023 19:03:10 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 10 ++++++++--
1 files changed, 8 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..80cb520 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;
@@ -106,7 +107,9 @@
appMemberBindingDto.setShopId(appPlaceOrderDto.getShopId());
appMemberBindingDto.setUserId(userId);
appMemberBindingDto.setBindingFlag(1);
+ appMemberBindingDto.setBindingType(1);
memberService.updateMemberBinding(appMemberBindingDto);
+ appPlaceOrderDto.setNewMemberFlag(1);
}
}
}
@@ -130,7 +133,9 @@
appMemberBindingDto.setShopId(appPlaceActivityDto.getShopId());
appMemberBindingDto.setUserId(userId);
appMemberBindingDto.setBindingFlag(1);
+ appMemberBindingDto.setBindingType(2);
memberService.updateMemberBinding(appMemberBindingDto);
+ appPlaceActivityDto.setNewMemberFlag(1);
}
}
AppPlaceOrderVo appPlaceOrderVo = orderService.placeActivityOrder(appPlaceActivityDto);
@@ -183,8 +188,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