|
|
@@ -121,10 +121,10 @@ public class OperationalActivityServiceImpl implements OperationalActivityServic
|
|
|
if (StringUtils.isNotBlank(activityType)) {
|
|
|
wrapper.eq(StoreOperationalActivity::getActivityType, activityType);
|
|
|
}
|
|
|
-//
|
|
|
-// if (!storeIds.isEmpty()) {
|
|
|
-// wrapper.in(StoreOperationalActivity::getStoreId, storeIds);
|
|
|
-// }
|
|
|
+
|
|
|
+ if (!storeIds.isEmpty()) {
|
|
|
+ wrapper.in(StoreOperationalActivity::getStoreId, storeIds);
|
|
|
+ }
|
|
|
wrapper.eq(StoreOperationalActivity::getDeleteFlag, 0);
|
|
|
wrapper.orderByDesc(StoreOperationalActivity::getSignupStartTime);
|
|
|
|
|
|
@@ -210,7 +210,7 @@ public class OperationalActivityServiceImpl implements OperationalActivityServic
|
|
|
case 2:
|
|
|
return "未开始";
|
|
|
case 3:
|
|
|
- return "审核拒绝";
|
|
|
+ return "审核驳回";
|
|
|
case 4:
|
|
|
return "已售罄";
|
|
|
case 5:
|