Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
gong
2025-12-18 18:30:58 +08:00

View File

@@ -115,9 +115,6 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
} else {
gbOrderDetail = mapper.getDetailByGroupNo(mainIdByShopId, shopId, groupOrderNo, StpKit.USER.getLoginIdAsLong());
gbOrderDetail.setGroupOrderNo(groupOrderNo);
if (!"ing".equals(gbOrderDetail.getWareGroupStatus())) {
throw new CzgException("拼团已结束");
}
}
List<GbOrderUserVO> users = mapper.getGbOrderDetailUsers(mainIdByShopId, shopId, gbOrderDetail.getGroupOrderNo());
gbOrderDetail.setUsers(users);