From a42f29ca6eb4ec9eeadda448b4bfe9cba1aca285 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 10 七月 2023 01:24:45 +0800
Subject: [PATCH] 按月交费功能开发完成
---
service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java b/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
index 2b0a4d0..f98bde5 100755
--- a/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
+++ b/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
@@ -1,11 +1,11 @@
package com.java110.user.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.activitiesBeautifulStaff.ActivitiesBeautifulStaffDto;
-import com.java110.dto.activitiesRule.ActivitiesRuleDto;
+import com.java110.dto.activities.ActivitiesBeautifulStaffDto;
+import com.java110.dto.activities.ActivitiesRuleDto;
import com.java110.dto.questionAnswer.QuestionAnswerDto;
-import com.java110.po.activitiesBeautifulStaff.ActivitiesBeautifulStaffPo;
-import com.java110.po.activitiesRule.ActivitiesRulePo;
+import com.java110.po.activities.ActivitiesBeautifulStaffPo;
+import com.java110.po.activities.ActivitiesRulePo;
import com.java110.user.bmo.activitiesBeautifulStaff.IDeleteActivitiesBeautifulStaffBMO;
import com.java110.user.bmo.activitiesBeautifulStaff.IGetActivitiesBeautifulStaffBMO;
import com.java110.user.bmo.activitiesBeautifulStaff.ISaveActivitiesBeautifulStaffBMO;
@@ -131,12 +131,17 @@
* @path /app/activitiesRule/queryActivitiesRule
*/
@RequestMapping(value = "/queryActivitiesRule", method = RequestMethod.GET)
- public ResponseEntity<String> queryActivitiesRule(
- @RequestHeader(value = "store-id", required = false) String storeId,
- @RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ public ResponseEntity<String> queryActivitiesRule(@RequestHeader(value = "store-id", required = false) String storeId,
+ @RequestParam(value = "ruleType", required = false) String ruleType,
+ @RequestParam(value = "ruleName", required = false) String ruleName,
+ @RequestParam(value = "activitiesObj", required = false) String activitiesObj,
+ @RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
ActivitiesRuleDto activitiesRuleDto = new ActivitiesRuleDto();
+ activitiesRuleDto.setRuleType(ruleType);
+ activitiesRuleDto.setRuleName(ruleName);
+ activitiesRuleDto.setActivitiesObj(activitiesObj);
activitiesRuleDto.setPage(page);
activitiesRuleDto.setRow(row);
activitiesRuleDto.setObjIds(new String[]{storeId, communityId});
--
Gitblit v1.8.0