拼团

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

@@ -1,25 +1,19 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.service.ITaShareActivityService;
+import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -65,15 +59,18 @@ public class TaShareActivityController extends BaseController {
 
     /**
      * 保存对象
-     * @param taShareActivity 实体对象
+     * @param parameter 实体对象json格式
      * @return
      */
     @RequestMapping(value="/admin/taShareActivity",method= RequestMethod.POST)
-    public ResponseBean taShareActivityAdd(@RequestBody TaShareActivity taShareActivity, HttpServletRequest request){
+    public ResponseBean taShareActivityAdd(@RequestBody String parameter, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
             taShareActivity.setOrgId(getOrgId(request));
             taShareActivity.setStatus(0);
+            taShareActivity.setSort(false);
+            taShareActivity.setWeight(0);
             if (iTaShareActivityService.save(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {
@@ -111,15 +108,14 @@ public class TaShareActivityController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
-     * @param taShareActivity 实体对象
+     * @param  parameter 实体对象json
      * @return
      */
-    @RequestMapping(value="/admin/taShareActivity/{id}",method= RequestMethod.PUT)
-    public ResponseBean taShareActivityUpdate(@PathVariable Integer id,
-                                        @RequestBody TaShareActivity taShareActivity){
+    @RequestMapping(value="/admin/taShareActivity/update",method= RequestMethod.PUT)
+    public ResponseBean taShareActivityUpdate(@RequestBody String parameter){
         ResponseBean responseBean = new ResponseBean();
         try {
+            TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {
@@ -155,13 +151,13 @@ public class TaShareActivityController extends BaseController {
      * @param id
      * @return
      */
-    @RequestMapping(value="/admin/taShareActivity/finish/{groupActicityId}",method= RequestMethod.PUT)
-    public ResponseBean finishShareActicity(@PathVariable Integer groupActicityId){
+    @RequestMapping(value="/admin/taShareActivity/finish/{id}",method= RequestMethod.PUT)
+    public ResponseBean finishShareActicity(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = new TaShareActivity();
             taShareActivity.setStatus(2);
-            taShareActivity.setGroupActicityId(groupActicityId);
+            taShareActivity.setGroupActicityId(id);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {
@@ -185,10 +181,10 @@ public class TaShareActivityController extends BaseController {
     public  ResponseBean buildingDynamicWeight(@RequestBody TaShareActivity taShareActivity, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         if (taShareActivity.getWeight() != null){
-            taShareActivity.setWeight(taShareActivity.getWeight());
+            taShareActivity.setWeight(taShareActivity.getWeight() == 0 ? 1 : 0);
         }
         if (taShareActivity.getSort() != null){
-            taShareActivity.setSort(taShareActivity.getSort());
+            taShareActivity.setSort(taShareActivity.getSort() == true ? false : true);
         }
 
         QueryWrapper<TaNews> newsQueryWrapper = new QueryWrapper<>();

src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java

@@ -36,7 +36,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
 
         QueryWrapper<TaShareActivity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(buildingId != null, "building_id", buildingId);
-        queryWrapper.like(activityName != null, "activityName", activityName);
+        queryWrapper.like(activityName != null, "activity_name", activityName);
         queryWrapper.eq(status != null, "status", status);
         queryWrapper.eq(startTime != null, "start_time", startTime);
         queryWrapper.eq(endTime != null, "end_time", endTime);