feats

pom.xml

@@ -114,6 +114,15 @@
 				<activeByDefault>false</activeByDefault>
 			</activation>
 		</profile>
+		<profile>
+			<id>test</id>
+			<properties>
+				<profileActive>test</profileActive>
+			</properties>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+		</profile>
 	</profiles>
 
 	<build>

src/main/java/com/yunzhi/liyuanhui/common/DateUtils.java

@@ -2,6 +2,9 @@ package com.yunzhi.liyuanhui.common;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
 
 public class DateUtils {
@@ -28,4 +31,10 @@ public class DateUtils {
 
         return sdf.parse(str + "23:59:59");
     }
+
+    public static Date local2Date(LocalDateTime ldt) {
+        ZoneId zone = ZoneId.systemDefault();
+        Instant instant = ldt.atZone(zone).toInstant();
+        return Date.from(instant);
+    }
 }

src/main/java/com/yunzhi/liyuanhui/controller/TaActivityController.java

@@ -1,12 +1,15 @@
 package com.yunzhi.liyuanhui.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.liyuanhui.common.BaseController;
 import com.yunzhi.liyuanhui.common.ResponseBean;
 import com.yunzhi.liyuanhui.common.StringUtils;
+import com.yunzhi.liyuanhui.entity.TaActivityVote;
 import com.yunzhi.liyuanhui.entity.TaPerson;
+import com.yunzhi.liyuanhui.enums.StatusEnum;
 import com.yunzhi.liyuanhui.service.ITaActivityEnrollService;
 import com.yunzhi.liyuanhui.service.ITaActivityVoteService;
 import org.bouncycastle.cms.PasswordRecipient;
@@ -48,21 +51,36 @@ public class TaActivityController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/{client}/activity",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/activity",method= RequestMethod.GET)
     public ResponseBean taActivityList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @RequestParam(value ="typeId", required = false) Integer typeId,
-                                       @RequestParam(value ="toIndex", defaultValue = "false") Boolean toIndex,
                                        @RequestParam(value ="name", required = false) String name,
-                                       @RequestParam(value ="status", required = false) Integer status,
-                                       @PathVariable String client) throws Exception{
+                                       @RequestParam(value ="status", required = false) Integer status) throws Exception{
 
         IPage<TaActivity> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaActivity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(null != typeId, "type_id", typeId);
-        queryWrapper.eq(toIndex, "to_index", toIndex);
         queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
         queryWrapper.eq(null != status, "status", status);
+        queryWrapper.gt(null == status, "status", StatusEnum.DELETED.getCode());
+        queryWrapper.orderByDesc("weight, create_date");
+
+        IPage<TaActivity> result = iTaActivityService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    @RequestMapping(value="/wx/activity",method= RequestMethod.GET)
+    public ResponseBean getWxList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                  @RequestParam(value ="typeId", required = false) Integer typeId,
+                                  @RequestParam(value ="toIndex", defaultValue = "false") Boolean toIndex) throws Exception{
+
+        IPage<TaActivity> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaActivity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(null != typeId, "type_id", typeId);
+        queryWrapper.eq(toIndex, "to_index", toIndex);
+        queryWrapper.gt("status", StatusEnum.READY.getCode());
         queryWrapper.orderByDesc("weight, create_date");
 
         IPage<TaActivity> result = iTaActivityService.page(pg, queryWrapper);
@@ -99,10 +117,14 @@ public class TaActivityController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taActivity/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/activity/{id}", method= RequestMethod.DELETE)
     public ResponseBean taActivityDelete(@PathVariable Integer id) throws Exception{
 
-        if(iTaActivityService.removeById(id)){
+        UpdateWrapper<TaActivity> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("status", StatusEnum.DELETED.getCode());
+        updateWrapper.eq("activity_id", id);
+
+        if(iTaActivityService.update(updateWrapper)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -136,18 +158,39 @@ public class TaActivityController extends BaseController {
                                       HttpServletRequest request) throws Exception{
         TaActivity result = iTaActivityService.getActivityProfile(id);
 
+        if (null != result) {
+            if (StatusEnum.DELETED.getCode().equals(result.getStatus())) {
+                return ResponseBean.error("当前内容已经被删除", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+        }
+
         if ("wx".equals(client)) {
+            if (StatusEnum.READY.getCode().equals(result.getStatus())) {
+                return ResponseBean.error("当前内容不存在或者未发布", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+
             TaPerson taPerson = getPerson(request);
             // 是否参与投票
             if (null != result.getIsVote() && result.getIsVote()) {
                 boolean isVoted = iTaActivityVoteService.isVotedBy(result.getActivityId(), taPerson.getPersonId());
-                result.setIsSelfVoted(isVoted);
+                TaActivityVote taActivityVote = iTaActivityVoteService.getBy(result.getActivityId(), taPerson);
+                if (null != taActivityVote) {
+                    result.setSelfVoted(taActivityVote.getItemId());
+                }
             }
             // 是否参与报名
             if (null != result.getIsEnroll() && result.getIsEnroll()) {
                 boolean isSelfEnrolled = iTaActivityEnrollService.isEnrolledBy(result.getActivityId(), taPerson);
                 result.setIsSelfEnrolled(isSelfEnrolled);
             }
+
+            // 增加 pv 忽略错误
+            try {
+                result.setPv(result.getPv() + 1);
+                iTaActivityService.updateById(result);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
 
         return ResponseBean.success(result);

src/main/java/com/yunzhi/liyuanhui/controller/TaAdvertController.java

@@ -1,6 +1,7 @@
 package com.yunzhi.liyuanhui.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.liyuanhui.common.BaseController;
@@ -43,19 +44,35 @@ public class TaAdvertController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/{client}/advert",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/advert",method= RequestMethod.GET)
     public ResponseBean taAdvertList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                      @RequestParam(value ="title", required = false) String title,
                                      @RequestParam(value ="position", required = false) String position,
-                                     @RequestParam(value ="status", required = false) Integer status,
-                                     @PathVariable String client) throws Exception{
+                                     @RequestParam(value ="status", required = false) Integer status) throws Exception{
 
         IPage<TaAdvert> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaAdvert> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(!StringUtils.isEmpty(title), "title", title);
         queryWrapper.eq(!StringUtils.isEmpty(position), "position", position);
         queryWrapper.eq(status != null, "status", status);
+        queryWrapper.gt(status == null, "status", StatusEnum.DELETED.getCode());
+        queryWrapper.orderByDesc("sort_no");
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaAdvert> result = iTaAdvertService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    @RequestMapping(value="/wx/advert",method= RequestMethod.GET)
+    public ResponseBean getWxList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @RequestParam(value ="position", required = false) String position) throws Exception{
+
+        IPage<TaAdvert> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaAdvert> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(!StringUtils.isEmpty(position), "position", position);
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
         queryWrapper.orderByDesc("sort_no");
         queryWrapper.orderByDesc("create_date");
 
@@ -83,10 +100,14 @@ public class TaAdvertController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taAdvert/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/advert/{id}", method= RequestMethod.DELETE)
     public ResponseBean taAdvertDelete(@PathVariable Integer id) throws Exception{
 
-        if(iTaAdvertService.removeById(id)){
+        UpdateWrapper<TaAdvert> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("status", StatusEnum.DELETED.getCode());
+        updateWrapper.eq("adv_id", id);
+
+        if(iTaAdvertService.update(updateWrapper)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败", ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/yunzhi/liyuanhui/controller/TaNewsController.java

@@ -1,11 +1,13 @@
 package com.yunzhi.liyuanhui.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.liyuanhui.common.BaseController;
 import com.yunzhi.liyuanhui.common.ResponseBean;
 import com.yunzhi.liyuanhui.common.StringUtils;
+import com.yunzhi.liyuanhui.enums.StatusEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,9 +45,8 @@ public class TaNewsController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/{client}/news",method= RequestMethod.GET)
-    public ResponseBean taNewsList(@PathVariable String client,
-                                   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    @RequestMapping(value="/admin/news",method= RequestMethod.GET)
+    public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                    @RequestParam(value = "typeId", required = false) Integer typeId,
                                    @RequestParam(value = "title", required = false) String title,
@@ -56,6 +57,22 @@ public class TaNewsController extends BaseController {
         queryWrapper.eq(null != typeId, "type_id", typeId);
         queryWrapper.like(!StringUtils.isEmpty(title), "title", title);
         queryWrapper.eq(null != status, "status", status);
+        queryWrapper.gt(null == status, "status", StatusEnum.DELETED.getCode());
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaNews> result = iTaNewsService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    @RequestMapping(value="/wx/news",method= RequestMethod.GET)
+    public ResponseBean getWxList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @RequestParam(value = "typeId", required = false) Integer typeId) throws Exception{
+
+        IPage<TaNews> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaNews> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(null != typeId, "type_id", typeId);
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaNews> result = iTaNewsService.page(pg, queryWrapper);
@@ -82,10 +99,14 @@ public class TaNewsController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taNews/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/news/{id}", method= RequestMethod.DELETE)
     public ResponseBean taNewsDelete(@PathVariable Integer id) throws Exception{
 
-        if(iTaNewsService.removeById(id)){
+        UpdateWrapper<TaNews> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("status", StatusEnum.DELETED.getCode());
+        updateWrapper.eq("news_id", id);
+
+        if(iTaNewsService.update(updateWrapper)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -116,6 +137,20 @@ public class TaNewsController extends BaseController {
     @RequestMapping(value="/{client}/news/{id}",method= RequestMethod.GET)
     public ResponseBean taNewsGet(@PathVariable String client,
                                   @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaNewsService.getById(id));
+        TaNews result = iTaNewsService.getById(id);
+
+        if (null != result) {
+            if (StatusEnum.DELETED.getCode().equals(result.getStatus())) {
+                return ResponseBean.error("当前内容已经被删除", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+        }
+
+        if ("wx".equals(client)) {
+            if (StatusEnum.READY.getCode().equals(result.getStatus())) {
+                return ResponseBean.error("当前内容不存在或者未发布", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+        }
+
+        return ResponseBean.success(result);
     }
 }

src/main/java/com/yunzhi/liyuanhui/controller/TaPersonController.java

@@ -70,13 +70,15 @@ public class TaPersonController extends BaseController {
          List<TaPerson> personList = iTaPersonService.getListBy(phone, name);
          for (TaPerson person: personList) {
              // 设置性别
-             if (1 == person.getSex()) {
+             if (Integer.valueOf(1) == person.getSex()) {
                  person.setGender("男");
-             } else if (2 == person.getSex()) {
+             } else if (Integer.valueOf(1) == person.getSex()) {
                  person.setGender("女");
              } else {
                  person.setGender("未知");
              }
+             // 转换成 excel 可识别的时间
+             person.setExcelDate(DateUtils.local2Date(person.getCreateDate()));
          }
 
         ExcelUtils.flush(response, TaPerson.class, personList, "会员信息统计");

src/main/java/com/yunzhi/liyuanhui/controller/TaRecommenderController.java

@@ -125,7 +125,7 @@ public class TaRecommenderController extends BaseController {
         IPage<TaRecommender> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaRecommender> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_id", personId);
-        queryWrapper.gt("status", StatusEnum.DELETED);
+        queryWrapper.gt("status", StatusEnum.DELETED.getCode());
         queryWrapper.orderByDesc("create_date");
         return ResponseBean.success(iTaRecommenderService.list(queryWrapper));
     }

src/main/java/com/yunzhi/liyuanhui/entity/RecommendExport.java

@@ -1,6 +1,7 @@
 package com.yunzhi.liyuanhui.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
 
 import java.util.Date;
@@ -8,27 +9,34 @@ import java.util.Date;
 @Data
 public class RecommendExport {
 
+    @ColumnWidth(30)
     @ExcelProperty(value = "时间", index = 1)
     private Date createDate;
 
+    @ColumnWidth(20)
     @ExcelProperty(value = "手机", index = 2)
     private String phone;
 
+    @ColumnWidth(20)
     @ExcelProperty(value = "名称", index = 3)
     private String name;
 
     @ExcelProperty(value = "性别", index = 4)
     private String sex;
 
+    @ColumnWidth(50)
     @ExcelProperty(value = "备注", index = 5)
     private String remark;
 
+    @ColumnWidth(20)
     @ExcelProperty(value = "推荐人手机", index = 6)
     private String recPhone;
 
+    @ColumnWidth(20)
     @ExcelProperty(value = "推荐人名称", index = 7)
     private String recName;
 
+    @ColumnWidth(15)
     @ExcelProperty(value = "审核状态", index = 8)
     private String status;
 }

src/main/java/com/yunzhi/liyuanhui/entity/TaActivity.java

@@ -132,6 +132,11 @@ public class TaActivity implements Serializable {
      */
     private Integer enrollNum;
 
+    /**
+     * 最大报名人数
+     */
+    private Integer enrollMax;
+
     /**
      * 分享图
      */
@@ -152,6 +157,11 @@ public class TaActivity implements Serializable {
      */
     private Boolean toIndex;
 
+    /**
+     * pv
+     */
+    private Integer pv;
+
     /**
      * 投票列表
      */
@@ -162,7 +172,7 @@ public class TaActivity implements Serializable {
      * 是否参与投票
      */
     @TableField(exist = false)
-    Boolean isSelfVoted;
+    Integer selfVoted;
 
     /**
      * 是否参与报名

src/main/java/com/yunzhi/liyuanhui/entity/TaPerson.java

@@ -1,11 +1,15 @@
 package com.yunzhi.liyuanhui.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,66 +27,82 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class TaPerson implements Serializable {
 
+    @ExcelIgnore
     private static final long serialVersionUID = 1L;
 
     /**
      * 人员ID
      */
+    @ExcelIgnore
     @TableId(value = "person_id", type = IdType.AUTO)
     private Integer personId;
 
     /**
      * openid
      */
+    @ExcelIgnore
     private String openid;
 
     /**
      * 姓名
      */
+    @ColumnWidth(20)
     @ExcelProperty(value = "名称", index = 3)
     private String name;
 
     /**
      * 昵称
      */
+    @ColumnWidth(30)
     @ExcelProperty(value = "昵称", index = 4)
     private String nickname;
 
     /**
      * 头像
      */
+    @ExcelIgnore
     private String avatar;
 
     /**
      * 电话
      */
+    @ColumnWidth(20)
     @ExcelProperty(value = "手机", index = 2)
     private String phone;
 
     /**
      * 性别
      */
+    @ExcelIgnore
     private Integer sex;
 
     /**
      * 创建时间
      */
-    @ExcelProperty(value = "时间", index = 1)
+    @ExcelIgnore
     private LocalDateTime createDate;
 
+    @ColumnWidth(30)
+    @ExcelProperty(value = "时间", index = 1)
+    @TableField(exist = false)
+    private Date excelDate;
+
     /**
      * 推荐人
      */
+    @ExcelIgnore
     private Integer recommender;
 
     /**
      * 推荐时间
      */
+    @ExcelIgnore
     private LocalDateTime recDate;
 
     /**
      * 状态
      */
+    @ExcelIgnore
     private Integer status;
 
     @ExcelProperty(value = "性别", index = 5)

src/main/java/com/yunzhi/liyuanhui/service/ITaActivityVoteService.java

@@ -19,4 +19,6 @@ public interface ITaActivityVoteService extends IService<TaActivityVote> {
     boolean vote(TaActivity taActivity, TaActivityVoteItem taActivityVoteItem, TaPerson taPerson) throws Exception;
 
     boolean isVotedBy(Integer activityId, Integer personId) throws Exception;
+
+    TaActivityVote getBy(Integer activityId, TaPerson taPerson) throws Exception;
 }

src/main/java/com/yunzhi/liyuanhui/service/impl/TaActivityEnrollServiceImpl.java

@@ -55,8 +55,19 @@ public class TaActivityEnrollServiceImpl extends ServiceImpl<TaActivityEnrollMap
             taActivityEnroll.setEnrollNum(1);
         }
 
+        if (null != taActivity.getEnrollNum() && null != taActivity.getEnrollMax()) {
+            if (taActivity.getEnrollNum() >= taActivity.getEnrollMax()) {
+                throw new Exception("当前报名人数已满");
+            }
+
+            if ((taActivity.getEnrollNum() + taActivityEnroll.getEnrollNum()) > taActivity.getEnrollMax()) {
+                throw new Exception("当前报名名额只剩 " + String.valueOf(taActivity.getEnrollMax() - taActivity.getEnrollNum()) + " 位");
+            }
+        }
+
         // 判断当前手机号是否已经报名
         QueryWrapper<TaActivityEnroll> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("activity_id", taActivity.getActivityId());
         queryWrapper.nested(q -> q.eq("person_phone", taPerson.getPhone())
                 .or().eq("person_phone", taActivityEnroll.getEnrollPhone())
                 .or().eq("enroll_phone", taPerson.getPhone())
@@ -78,9 +89,9 @@ public class TaActivityEnrollServiceImpl extends ServiceImpl<TaActivityEnrollMap
             throw new RuntimeException("报名失败, 请重试");
         }
 
-        // 更新投票人数
+        // 更新报名人数
         UpdateWrapper<TaActivity> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("enroll_num", taActivity.getEnrollNum() + 1);
+        updateWrapper.set("enroll_num", taActivity.getEnrollNum() + taActivityEnroll.getEnrollNum());
         updateWrapper.eq("activity_id", taActivity.getActivityId());
         updateWrapper.eq("enroll_num", taActivity.getEnrollNum());
         boolean update = iTaActivityService.update(updateWrapper);

src/main/java/com/yunzhi/liyuanhui/service/impl/TaActivityServiceImpl.java

@@ -35,7 +35,7 @@ public class TaActivityServiceImpl extends ServiceImpl<TaActivityMapper, TaActiv
 
         QueryWrapper<TaActivityVoteItem> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("activity_id", id);
-        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.gt("status", StatusEnum.DELETED.getCode());
         queryWrapper.orderByAsc("sort_no");
 
         taActivity.setVoteItemList(iTaActivityVoteItemService.list(queryWrapper));

src/main/java/com/yunzhi/liyuanhui/service/impl/TaActivityVoteServiceImpl.java

@@ -9,6 +9,7 @@ import com.yunzhi.liyuanhui.entity.TaActivityVoteItem;
 import com.yunzhi.liyuanhui.entity.TaPerson;
 import com.yunzhi.liyuanhui.enums.StatusEnum;
 import com.yunzhi.liyuanhui.mapper.TaActivityVoteMapper;
+import com.yunzhi.liyuanhui.service.ITaActivityService;
 import com.yunzhi.liyuanhui.service.ITaActivityVoteItemService;
 import com.yunzhi.liyuanhui.service.ITaActivityVoteService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,6 +31,9 @@ public class TaActivityVoteServiceImpl extends ServiceImpl<TaActivityVoteMapper,
     @Autowired
     TaActivityVoteMapper taActivityVoteMapper;
 
+    @Autowired
+    ITaActivityService iTaActivityService;
+
     @Autowired
     ITaActivityVoteItemService iTaActivityVoteItemService;
 
@@ -88,6 +92,16 @@ public class TaActivityVoteServiceImpl extends ServiceImpl<TaActivityVoteMapper,
             throw new RuntimeException("投票失败, 请重试");
         }
 
+        // 更新投票总人数
+        UpdateWrapper<TaActivity> updateWrapper2 = new UpdateWrapper<>();
+        updateWrapper2.set("vote_num", taActivity.getVoteNum() + 1);
+        updateWrapper2.eq("activity_id", taActivity.getActivityId());
+        updateWrapper2.eq("vote_num", taActivity.getVoteNum());
+        boolean update2 = iTaActivityService.update(updateWrapper2);
+        if (!update2) {
+            throw new RuntimeException("投票失败, 请重试");
+        }
+
         return true;
     }
 
@@ -98,4 +112,12 @@ public class TaActivityVoteServiceImpl extends ServiceImpl<TaActivityVoteMapper,
         queryWrapper.eq("person_id", personId);
         return this.count(queryWrapper) > 0;
     }
+
+    @Override
+    public TaActivityVote getBy(Integer activityId, TaPerson taPerson) throws Exception {
+        QueryWrapper<TaActivityVote> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("activity_id", activityId);
+        queryWrapper.eq("person_id", taPerson.getPersonId());
+        return this.getOne(queryWrapper);
+    }
 }

src/main/resources/application-prod.yml

@@ -7,10 +7,10 @@ spring:
     username: liyuanhui
     password: abcd@123456
 
-#weixin:
-#  miniapp:
-#    appid: wx842b0af4df4552a5
-#    secret: 602601def4b83277e6add96a82be937b
-#    token:
-#    aesKey:
-#    msgDataFormat: JSON
+weixin:
+  miniapp:
+    appid: wx842b0af4df4552a5
+    secret: 602601def4b83277e6add96a82be937b
+    token:
+    aesKey:
+    msgDataFormat: JSON

src/main/resources/application-test.yml

@@ -0,0 +1,16 @@
+###
+server:
+  port: 8083
+spring:
+  datasource:
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/liyuanhui?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    username: liyuanhui
+    password: abcd@123456
+
+#weixin:
+#  miniapp:
+#    appid: wx842b0af4df4552a5
+#    secret: 602601def4b83277e6add96a82be937b
+#    token:
+#    aesKey:
+#    msgDataFormat: JSON

src/main/resources/mapper/TaActivityMapper.xml

@@ -4,13 +4,14 @@
 
     <select id="getListByPersonId" resultType="com.yunzhi.liyuanhui.entity.TaActivity">
         SELECT
-            t.*
+            DISTINCT t.*
         FROM ta_activity t
         LEFT JOIN ta_activity_enroll s ON t.activity_id = s.activity_id
+        LEFT JOIN ta_activity_vote v on t.activity_id = v.activity_id
         WHERE
             s.person_id = #{personId}
+            OR v.person_id = #{personId}
         ORDER BY
-            s.create_date DESC,
             t.create_date DESC
     </select>
 </mapper>