From 486e2d4a76f2dce7edff272d12d5d98aec2e8bfe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 七月 2025 20:39:12 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java | 2 ++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java | 2 +-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 24 ++++++++++++------------
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
index b5a1724..806d05e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
@@ -213,7 +213,7 @@
*/
@Override
@Transactional
- @GlobalTransactional(rollbackFor = Exception.class)
+// @GlobalTransactional(rollbackFor = Exception.class) todo 放开分布式事务注解
public void useMerConsumerGoods(MerSureConsumerGoodsDto merSureConsumerGoodsDto){
List<MerSureConsumerGoodsListDto> goodsList = merSureConsumerGoodsDto.getMerSureConsumerGoodsListDtoList();
if (goodsList != null && !goodsList.isEmpty()) {
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 41499eb..2344a3e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -510,8 +510,8 @@
* @return
*/
@Override
- @Transactional
- @GlobalTransactional(rollbackFor = Exception.class)
+ @Transactional // todo 放开分布式事务注解
+// @GlobalTransactional(rollbackFor = Exception.class)
public AppPlaceOrderVo placeOrder(AppPlaceOrderDto appPlaceOrderDto) {
// 获取用户ID
Long userId = appPlaceOrderDto.getUserId();
@@ -1039,7 +1039,7 @@
*/
@Override
@Transactional
- @GlobalTransactional(rollbackFor = Exception.class)
+// @GlobalTransactional(rollbackFor = Exception.class) todo 放开分布式事务注解
public AppPlaceOrderVo placeActivityOrder(AppPlaceActivityDto appPlaceActivityDto) {
Long userId = appPlaceActivityDto.getUserId();
Member member = remoteMemberService.getMember(userId).getData();
@@ -1887,7 +1887,7 @@
*/
@Override
@Transactional
- @GlobalTransactional(rollbackFor = Exception.class)
+// @GlobalTransactional(rollbackFor = Exception.class) todo 放开分布式事务注解
public MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto) {
String orderId = merVerifyOrderDto.getOrderId();
BigDecimal relReceiveMoney = merVerifyOrderDto.getRelReceiveMoney();
@@ -2129,7 +2129,7 @@
*/
@Override
@Transactional
- @GlobalTransactional(rollbackFor = Exception.class)
+// @GlobalTransactional(rollbackFor = Exception.class) todo 放开分布式事务注解
public MerVerifyOrderVo sureVerifyOrderDouYin(MerVerifyOrderDto merVerifyOrderDto) {
String phone = merVerifyOrderDto.getPhone();
String orderId = merVerifyOrderDto.getOrderId();
@@ -2550,7 +2550,7 @@
*/
@Override
@Transactional
- @GlobalTransactional(rollbackFor = Exception.class)
+// @GlobalTransactional(rollbackFor = Exception.class) todo 放开分布式事务注解
public MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto) {
R<MerVerifyCouponGetVo> verifyCoupon = remoteCouponService.getVerifyCoupon(merVerifyCouponDto.getMemberCouponId());
if(verifyCoupon.getCode() != 200){
@@ -2690,7 +2690,7 @@
*/
@Override
@Transactional
- @GlobalTransactional(rollbackFor = Exception.class)
+// @GlobalTransactional(rollbackFor = Exception.class) todo 放开分布式事务注解
public MerVerifyAwardVo sureVerifyPrize(MerVerifyPrizeDto merVerifyPrizeDto) {
MerVerifyAwardVo merVerifyAwardVo = new MerVerifyAwardVo();
MemberGiftRecord memberGiftRecord = remoteMemberService.getVerifyPrize(merVerifyPrizeDto.getPrizeId()).getData();
@@ -2929,7 +2929,7 @@
*/
@Override
@Transactional
- @GlobalTransactional(rollbackFor = Exception.class)
+// @GlobalTransactional(rollbackFor = Exception.class) todo 放开分布式事务注解
public void createNewOrder(MerNewOrderDto merNewOrderDto) {
Long userId = merNewOrderDto.getBuyUserId();
Date nowTime = new Date();
@@ -5563,7 +5563,7 @@
*/
@Override
@Transactional
- @GlobalTransactional(rollbackFor = Exception.class)
+// @GlobalTransactional(rollbackFor = Exception.class) todo 放开分布式事务注解
public void autoCancelOrder(String orderId) {
//更新订单信息
Order order = this.getById(orderId);
@@ -5633,7 +5633,7 @@
*/
@Override
@Transactional
- @GlobalTransactional(rollbackFor = Exception.class)
+// @GlobalTransactional(rollbackFor = Exception.class) todo 放开分布式事务注解
public void payBack(PartnerTransactionsResult transaction, BigDecimal feeAmount) {
log.info("订单支付回调---"+transaction.toString());
// 更新订单状态 outTradeNo
@@ -5779,7 +5779,7 @@
*/
@Override
@Transactional
- @GlobalTransactional(rollbackFor = Exception.class)
+// @GlobalTransactional(rollbackFor = Exception.class) todo 放开分布式事务注解
public void refundOrder(String orderId) {
// 更新订单信息
Order order = this.getById(orderId);
@@ -6523,7 +6523,7 @@
}
}
- @GlobalTransactional(rollbackFor = Exception.class)
+// @GlobalTransactional(rollbackFor = Exception.class) todo 放开分布式事务注解
private void autoTimeCancelOrder(Order order) {
String orderId = order.getOrderId();
order.setOrderStatus(0);
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
index 7c5e30d..7fe2a38 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.AppNearbyShopDto;
import com.ruoyi.shop.domain.dto.MyAppointmentListDto;
@@ -97,6 +98,7 @@
}
Long userId = SecurityUtils.getUserId();
one = new TShopAppointableTime();
+ one.setId(IdUtils.fastSimpleUUID());
one.setShopId(dto.getShopId());
one.setAppointmentTime(LocalDateTime.parse(dto.getTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
one.setUserId(userId);
--
Gitblit v1.7.1