Merge branch 'dev' into test

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -2738,6 +2738,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                         if (ObjectUtil.isNotEmpty(consumerSecondaryCard)) {
                             totalFee = getBigDecimal(consumerSecondaryCard, priceResponse, byId, payPrice);
                         } else {
+                            queryWrapper.eq(Activity::getLabelId, roomLabel.getLabelId());
                             queryWrapper.eq(Activity::getPackId, roomLabel.getPackId());
                             activity = activityService.getOne(queryWrapper);
                             totalFee = getBigDecimal(request, activity, payPrice, user, consumerMember);