diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java
index a124ee4dc..f161ec5da 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java
@@ -115,6 +115,7 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
         } else {
             gbOrderDetail = mapper.getDetailByGroupNo(mainIdByShopId, shopId, groupOrderNo, StpKit.USER.getLoginIdAsLong());
             gbOrderDetail.setGroupOrderNo(groupOrderNo);
+            gbOrderDetail.setShopId(shopId);
         }
         List<GbOrderUserVO> users = mapper.getGbOrderDetailUsers(mainIdByShopId, shopId, gbOrderDetail.getGroupOrderNo());
         gbOrderDetail.setUsers(users);
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
index eff5c4ed1..83d1bb42c 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
@@ -1172,9 +1172,11 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
             }
             else if (PaymentPayTypeEnum.SourceType.DISTRIBUTION.equals(payment.getSourceType())) {
                 distributionUserService.open(payment.getSourceId(), payment.getAmount(), payment.getShopId(), payment.getId());
-            } else if (PaymentPayTypeEnum.SourceType.POINT.equals(payment.getSourceType())) {
+            }
+            else if (PaymentPayTypeEnum.SourceType.POINT.equals(payment.getSourceType())) {
                 goodPayService.payCallBack(payment.getSourceId(), payment.getId());
-            } else if (PaymentPayTypeEnum.SourceType.WARE.equals(payment.getSourceType())) {
+            }
+            else if (PaymentPayTypeEnum.SourceType.WARE.equals(payment.getSourceType())) {
                 gbOrderService.payCallBack(payment.getSourceId(), payment.getId());
             }
         }
diff --git a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
index 5202832e4..2f5428aa9 100644
--- a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
@@ -97,7 +97,7 @@
             gb_order `order`
             LEFT JOIN gb_order_detail detail on detail.group_order_no = `order`.group_order_no and `detail`.shop_id = #{shopId} and `detail`.user_id = #{userId} and `detail`.is_del = 0
             LEFT JOIN tb_shop_user `user` on `user`.main_shop_id = #{mainShopId} and `user`.user_id = detail.user_id
-            LEFT JOIN tb_shop_info shop on detail.shop_id = shop.id
+            LEFT JOIN tb_shop_info shop on `order`.shop_id = shop.id
         WHERE
             `order`.group_order_no = #{groupOrderNo}
         order by detail.create_time desc