From 74421b0b93cd802549eb9a60d190e9ff2716df7d Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Sun, 29 Mar 2026 15:52:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8B=BC=E5=9B=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/MallOrderServiceImpl.java         | 21 +++++++------------
 .../controller/WechatPayController.java       | 13 ++++++++++--
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java
index f376b39c..4dd44633 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java
@@ -314,9 +314,9 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
         if (group == null) {
             throw new RuntimeException("拼团不存在");
         }
-        if (group.getStatus() != GROUP_STATUS_FORMING && group.getStatus() != GROUP_STATUS_FACE2FACE) {
+        /*if (group.getStatus() != GROUP_STATUS_FORMING && group.getStatus() != GROUP_STATUS_FACE2FACE) {
             throw new RuntimeException("当前拼团状态不可参团");
-        }
+        }*/
         //超出拼团人数 也可以参与
         /*if (group.getCurrentMembers() >= group.getTargetMembers()) {
             throw new RuntimeException("拼团已满员");
@@ -567,21 +567,14 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
         // 拼团信息（拼团订单才查）
         if (ORDER_TYPE_GROUP == order.getOrderType()) {
             // 通过 headOrderId 或 groupUserIds 中包含此 userId 查找拼团
-            LambdaQueryWrapper<MallOrderGroup> gq = new LambdaQueryWrapper<>();
-            // 团长订单匹配 headOrderId
-            gq.eq(MallOrderGroup::getHeadOrderId, orderId);
-            MallOrderGroup group = mallOrderGroupMapper.selectOne(gq);
-            if (group == null) {
                 // 参团人：通过 userId + shopId 匹配
-                LambdaQueryWrapper<MallOrderGroup> gq2 = new LambdaQueryWrapper<>();
-                gq2.eq(MallOrderGroup::getShopId, order.getShopId())
-                   .like(MallOrderGroup::getGroupOrderIds, order.getId())
-                   .last("LIMIT 1");
-                group = mallOrderGroupMapper.selectOne(gq2);
-            }
+            LambdaQueryWrapper<MallOrderGroup> gq2 = new LambdaQueryWrapper<>();
+            gq2.eq(MallOrderGroup::getShopId, order.getShopId())
+               .like(MallOrderGroup::getGroupOrderIds, order.getId())
+               .last("LIMIT 1");
+            MallOrderGroup group = mallOrderGroupMapper.selectOne(gq2);
             vo.setGroupInfo(group);
         }
-
         return vo;
     }
 
diff --git a/hiver-modules/hiver-social/src/main/java/cc/hiver/social/controller/WechatPayController.java b/hiver-modules/hiver-social/src/main/java/cc/hiver/social/controller/WechatPayController.java
index 0023b140..3b586587 100644
--- a/hiver-modules/hiver-social/src/main/java/cc/hiver/social/controller/WechatPayController.java
+++ b/hiver-modules/hiver-social/src/main/java/cc/hiver/social/controller/WechatPayController.java
@@ -81,14 +81,23 @@ public class WechatPayController {
             payParams.put("message","调起微信支付失败");
             return ResponseEntity.ok(payParams);
         }else{
-            //订单支付成功逻辑
-            mallOrderService.paySuccess(request.get("outTradeNo"));
             // 2. 生成前端支付参数
             Map<String, String> payParams = buildPaySign(prepayId);
             payParams.put("code","200");
             return ResponseEntity.ok(payParams);
         }
     }
+
+    @PostMapping("/paySuccess")
+    public ResponseEntity<Map<String, String>> paySuccess(@RequestBody Map<String, String> request) throws Exception {
+        //订单支付成功逻辑
+        mallOrderService.paySuccess(request.get("outTradeNo"));
+        Map<String, String> payParams = new HashMap<>();
+        payParams.put("code","200");
+        payParams.put("message","支付成功订单更新");
+        return ResponseEntity.ok(payParams);
+    }
+
     public Map<String, String> buildPaySign(String prepayId) throws Exception {
         // 1. 生成参数
         String timeStamp = String.valueOf(System.currentTimeMillis() / 1000); // 秒