修改弹窗、精彩活

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityList.java

@@ -115,13 +115,6 @@ public class ActivityList implements Serializable {
 	@ApiModelProperty("活动时期类型:0-永久,1-有期限")
 	private Integer  timeType;
 
-	/**
-	 * 活动时期类型:0-永久,1-有期限
-	 */
-	@Column(name = "time_type")
-	@ApiModelProperty(value = "活动时期类型")
-	private String timeType;
-
 
 
 

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityPopup.java

@@ -36,7 +36,6 @@ public class ActivityPopup {
     private String background;
 
 
-
     @Column(name = "start_time")
     private BigInteger startTime;
 
@@ -57,7 +56,7 @@ public class ActivityPopup {
 
 
     @Column(name = "is_del")
-    private BigInteger isDel;
+    private Integer isDel;
 
 
 

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/HomeActivities.java

@@ -97,6 +97,6 @@ public class HomeActivities implements Serializable {
      */
     @Column(name = "is_del")
     @ApiModelProperty(value = "是否删除")
-    private String isDel;
+    private Integer isDel;
 
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopupBiz.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.activity.biz;
 
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.xxfc.platform.activity.entity.ActivityPopup;
 import com.xxfc.platform.activity.entity.ActivityPopupUser;
 import com.xxfc.platform.activity.mapper.ActivityPopupMapper;
@@ -99,12 +100,11 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper,ActivityPopup>
     @Transactional(rollbackFor = Exception.class)
     public  void  setActivityPopup(AppUserDTO userInfo,Integer id){
         if (userInfo!=null) {
-
             Example exa=Example.builder(ActivityPopupUser.class).where(
                     WeekendSqls.<ActivityPopupUser>custom()
                     .andEqualTo(ActivityPopupUser::getPopupId,id)
+                    .andEqualTo(ActivityPopupUser::getUserId,userInfo.getUserid())
             ).build();
-
             List<ActivityPopupUser> activityPopupUsers = activityPopupUserBiz.selectByExample(exa);
             if (activityPopupUsers==null||activityPopupUsers.size()==0) {
                 ActivityPopupUser activityPopupUser = new ActivityPopupUser();
@@ -117,4 +117,15 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper,ActivityPopup>
         }
 
     }
+
+
+    public void deleteOne(Integer id) {
+        ActivityPopup activityPopup = selectById(id);
+        if (activityPopup.getStatus()==1) {
+            throw new BaseException("Please take it off the shelves first");
+        }else{
+            activityPopup.setIsDel(1);
+        }
+        updateById(activityPopup);
+    }
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/HomeActivitiesBiz.java

@@ -4,6 +4,7 @@ package com.xxfc.platform.activity.biz;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.xxfc.platform.activity.entity.ActivityList;
 import com.xxfc.platform.activity.entity.HomeActivities;
 import com.xxfc.platform.activity.mapper.HomeActivitiesMapper;
@@ -26,7 +27,6 @@ public class HomeActivitiesBiz extends BaseBiz<HomeActivitiesMapper, HomeActivit
                 .andLessThanOrEqualTo(HomeActivities::getStartTime,currentTime)
                 .andEqualTo(HomeActivities::getStatus,1)
                 .andEqualTo(HomeActivities::getIsDel,0)
-
         ).orderByAsc("sort").build();
         List<HomeActivities> activityLists = selectByExample(exa);
         return activityLists;
@@ -46,4 +46,14 @@ public class HomeActivitiesBiz extends BaseBiz<HomeActivitiesMapper, HomeActivit
         return  PageInfo.of(activityLists);
     }
 
+    public void deleteOne(Integer id) {
+        HomeActivities homeActivities = selectById(id);
+        if (homeActivities.getStatus()==1) {
+            throw new BaseException("Please take it off the shelves first");
+        }else{
+            homeActivities.setIsDel(1);
+        }
+
+        updateById(homeActivities);
+    }
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopupController.java

@@ -38,4 +38,7 @@ public class ActivityPopupController extends ActivityBaseController<ActivityPopu
     }
 
 
+
+
+
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopupManageController.java

@@ -24,6 +24,11 @@ import java.util.List;
 @Slf4j
 public class ActivityPopupManageController extends BaseController<ActivityPopupBiz, ActivityPopup> {
 
+    /**
+     * 后台列表
+     * @param query
+     * @return
+     */
     @PostMapping(value = "/manage/findAllByQuery")
     public ObjectRestResponse findAllByQuery(@RequestBody PopupQuery query) {
         Example example = new Example(ActivityPopup.class);
@@ -35,6 +40,11 @@ public class ActivityPopupManageController extends BaseController<ActivityPopupB
         return ObjectRestResponse.succ(PageInfo.of(activityPopups));
     }
 
+    /**
+     * 查询一条
+     * @param id
+     * @return
+     */
     @PostMapping(value = "/manage/getOne/{id}")
     public ObjectRestResponse<ActivityPopup> getOne(@PathVariable Integer id) {
         Example exa=new Example(ActivityPopup.class);
@@ -49,4 +59,16 @@ public class ActivityPopupManageController extends BaseController<ActivityPopupB
         }
         return ObjectRestResponse.succ(activityPopups.get(0));
     }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @DeleteMapping("manage/activity/deleteOne/{id}")
+    public ObjectRestResponse deleteOne(@PathVariable  Integer id){
+        baseBiz.deleteOne(id);
+        return ObjectRestResponse.succ();
+    }
+
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/HomeActivitiesController.java

@@ -7,6 +7,7 @@ import com.xxfc.platform.activity.biz.HomeActivitiesBiz;
 import com.xxfc.platform.activity.entity.ActivityList;
 import com.xxfc.platform.activity.entity.HomeActivities;
 import com.xxfc.platform.activity.vo.ActivitiesQuery;
+import org.apache.ibatis.annotations.Delete;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;
 
@@ -43,19 +44,36 @@ public class HomeActivitiesController extends BaseController<HomeActivitiesBiz,
     }
 
 
+    /**
+     * 获取一条精彩活动
+     * @param id
+     * @return
+     */
     @PostMapping(value = "/manage/activity/getOne/{id}")
     public ObjectRestResponse<HomeActivities> getOne(@PathVariable Integer id) {
         Example exa=new Example(HomeActivities.class);
-        exa.createCriteria().andEqualTo("isDel",0);
-        exa.createCriteria().andEqualTo("id",id);
-        List<HomeActivities> activityPopups = baseBiz.selectByExample(exa);
-        if (activityPopups==null||activityPopups.size()==0) {
+        Example.Criteria criteria = exa.createCriteria();
+        criteria.andEqualTo("isDel",0);
+        criteria.andEqualTo("id",id);
+        List<HomeActivities> homeActivities = baseBiz.selectByExample(exa);
+        if (homeActivities==null||homeActivities.size()==0) {
             return ObjectRestResponse.succ(new HomeActivities());
         }
-        if (activityPopups.size()>1) {
+        if (homeActivities.size()>1) {
             return ObjectRestResponse.createDefaultFail();
         }
-        return ObjectRestResponse.succ(activityPopups.get(0));
+        return ObjectRestResponse.succ(homeActivities.get(0));
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @DeleteMapping("manage/activity/deleteOne/{id}")
+    public ObjectRestResponse deleteOne(@PathVariable  Integer id){
+        baseBiz.deleteOne(id);
+        return ObjectRestResponse.succ();
     }
 
 }
\ No newline at end of file