|
@@ -60,10 +60,11 @@ public class OperationalActivityController {
|
|
|
@RequestParam(value = "pageNum", required = false) Integer pageNum,
|
|
@RequestParam(value = "pageNum", required = false) Integer pageNum,
|
|
|
@RequestParam(value = "pageSize", required = false) Integer pageSize,
|
|
@RequestParam(value = "pageSize", required = false) Integer pageSize,
|
|
|
@RequestParam(value = "status", required = false) Integer status,
|
|
@RequestParam(value = "status", required = false) Integer status,
|
|
|
|
|
+ @RequestParam(value = "activityType", required = false) String activityType,
|
|
|
@RequestParam(value = "activityName", required = false) String activityName) {
|
|
@RequestParam(value = "activityName", required = false) String activityName) {
|
|
|
log.info("OperationalActivityController.pageActivityDetail storeId={}, storeName={}, pageNum={}, pageSize={}, status={}, activityName={}", storeId, storeName, pageNum, pageSize, status, activityName);
|
|
log.info("OperationalActivityController.pageActivityDetail storeId={}, storeName={}, pageNum={}, pageSize={}, status={}, activityName={}", storeId, storeName, pageNum, pageSize, status, activityName);
|
|
|
try {
|
|
try {
|
|
|
- IPage<StoreOperationalActivityVO> result = activityService.pageActivityDetail(storeId, storeName, pageNum, pageSize, status, activityName, null);
|
|
|
|
|
|
|
+ IPage<StoreOperationalActivityVO> result = activityService.pageActivityDetail(storeId, storeName, pageNum, pageSize, status, activityName, activityType);
|
|
|
return R.data(result);
|
|
return R.data(result);
|
|
|
} catch (IllegalArgumentException e) {
|
|
} catch (IllegalArgumentException e) {
|
|
|
return R.fail(e.getMessage());
|
|
return R.fail(e.getMessage());
|