拼团

src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java

@@ -45,18 +45,16 @@ public class TaShareActivityController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/taShareActivity",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taShareActivity/list",method= RequestMethod.GET)
     public ResponseBean taShareActivityList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                             @RequestParam(value ="buildingId",required = false) String buildingId,
                                             @RequestParam(value ="activityName",required = false) String activityName,
                                             @RequestParam(value ="status",required = false) String status,
-                                            @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
-                                            @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime, HttpServletRequest request){
+                                            HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareActivityService.getList(pageNum, pageSize, buildingId, activityName, status, startTime, endTime, getOrgId(request));
-            responseBean.addSuccess(responseBean);
+            responseBean = iTaShareActivityService.getList(pageNum, pageSize, buildingId, activityName, status, null, null, getOrgId(request));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareActivityList -=- {}",e.toString());
@@ -157,13 +155,13 @@ public class TaShareActivityController extends BaseController {
      * @param id
      * @return
      */
-    @RequestMapping(value="/admin/taShareActivity/finish/{id}",method= RequestMethod.PUT)
-    public ResponseBean finishShareActicity(@PathVariable Integer id){
+    @RequestMapping(value="/admin/taShareActivity/finish/{groupActicityId}",method= RequestMethod.PUT)
+    public ResponseBean finishShareActicity(@PathVariable Integer groupActicityId){
         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = new TaShareActivity();
             taShareActivity.setStatus(2);
-            taShareActivity.setGroupActicityId(id);
+            taShareActivity.setGroupActicityId(groupActicityId);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {
@@ -179,23 +177,22 @@ public class TaShareActivityController extends BaseController {
 
     /**
      * 置顶活动，首页推荐
-     * @param groupActivityId
-     * @param weight
+     * @param taShareActivity
+     * @param request
      * @return
      */
     @RequestMapping(value = "/admin/taShareActivity/weight" ,method =RequestMethod.PUT)
-    public  ResponseBean buildingDynamicWeight(@RequestParam Integer groupActivityId, @RequestParam Integer weight, @RequestParam Integer sort, HttpServletRequest request){
+    public  ResponseBean buildingDynamicWeight(@RequestBody TaShareActivity taShareActivity, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        TaShareActivity taShareActivity = iTaShareActivityService.getById(groupActivityId);
-        if (weight != null){
-            taShareActivity.setWeight(weight);
+        if (taShareActivity.getWeight() != null){
+            taShareActivity.setWeight(taShareActivity.getWeight());
         }
-        if (sort != null){
-            taShareActivity.setSort(sort == 0 ? true : false);
+        if (taShareActivity.getSort() != null){
+            taShareActivity.setSort(taShareActivity.getSort());
         }
 
         QueryWrapper<TaNews> newsQueryWrapper = new QueryWrapper<>();
-        newsQueryWrapper.eq("group_acticity_id",groupActivityId);
+        newsQueryWrapper.eq("group_acticity_id", taShareActivity.getGroupActicityId());
         if (iTaShareActivityService.updateById(taShareActivity)){
             responseBean.addSuccess("成功");
         }else {

src/main/java/com/huiju/estateagents/controller/TaShareRecordController.java

@@ -4,7 +4,6 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaShareRecord;
 import com.huiju.estateagents.service.ITaShareRecordService;
-import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;