feats

src/main/java/com/yunzhi/liyuanhui/LiyuanhuiApplication.java

@@ -2,7 +2,9 @@ package com.yunzhi.liyuanhui;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+@EnableTransactionManagement
 @SpringBootApplication
 public class LiyuanhuiApplication {
 

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

@@ -1,7 +1,9 @@
 package com.yunzhi.liyuanhui.common;
 
 import com.yunzhi.liyuanhui.entity.SysUser;
+import com.yunzhi.liyuanhui.entity.TaPerson;
 import com.yunzhi.liyuanhui.service.ISysUserService;
+import com.yunzhi.liyuanhui.service.ITaPersonService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -14,10 +16,13 @@ public class BaseController {
     @Autowired
     ISysUserService iSysUserService;
 
+    @Autowired
+    ITaPersonService iTaPersonService;
+
     protected SysUser getUser(HttpServletRequest request) {
         try {
             Map<String, Object> params = JWTUtils.decode(JWTUtils.getToken(request));
-            Integer userId = Integer.valueOf(params.get("userId").toString());
+            Integer userId = Integer.valueOf(params.get("id").toString());
             return iSysUserService.getById(userId);
         } catch (Exception e) {
 //            e.printStackTrace();
@@ -25,4 +30,16 @@ public class BaseController {
             return null;
         }
     }
+
+    protected TaPerson getPerson(HttpServletRequest request) {
+        try {
+            Map<String, Object> params = JWTUtils.decode(JWTUtils.getToken(request));
+            Integer personId = Integer.valueOf(params.get("id").toString());
+            return iTaPersonService.getById(personId);
+        } catch (Exception e) {
+//            e.printStackTrace();
+            log.error("解析客户失败: {}", e.getMessage());
+            return null;
+        }
+    }
 }

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

@@ -42,7 +42,8 @@ public class JWTUtils {
         Date iat = datePair[0];
         Date exp = datePair[1];
 
-        return Jwts.builder().setIssuer(claims.get("userId").toString()).setIssuedAt(iat).setExpiration(exp).addClaims(claims).signWith(SECRET_KEY).compact();
+        // addClaims 放到前面不会覆盖 其余字段
+        return Jwts.builder().addClaims(claims).setIssuer(claims.get("id").toString()).setIssuedAt(iat).setExpiration(exp).signWith(SECRET_KEY).compact();
     }
 
     public static Map<String, Object> decode(String token) throws Exception {

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

@@ -24,7 +24,7 @@ public class WxUtils {
         conf.setAesKey(config.getMiniapp().getAesKey());
         conf.setMsgDataFormat(config.getMiniapp().getMsgDataFormat());
 
-        WxMaService service = new WxMaServiceImpl();
+        service = new WxMaServiceImpl();
         service.setWxMaConfig(conf);
     }
 

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

@@ -1,11 +1,15 @@
 package com.yunzhi.liyuanhui.controller;
 
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import com.yunzhi.liyuanhui.common.*;
 import com.yunzhi.liyuanhui.entity.SysUser;
+import com.yunzhi.liyuanhui.entity.TaPerson;
 import com.yunzhi.liyuanhui.service.ISysUserService;
+import com.yunzhi.liyuanhui.service.ITaPersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
@@ -18,6 +22,12 @@ public class LoginController extends BaseController {
     @Autowired
     ISysUserService iSysUserService;
 
+    @Autowired
+    ITaPersonService iTaPersonService;
+    
+    @Autowired
+    WxUtils wxUtils;
+
     @PostMapping("/login")
     public ResponseBean login(@RequestBody Map<String, String> loginParam, HttpServletResponse response) throws Exception {
         if (null == loginParam) {
@@ -46,7 +56,7 @@ public class LoginController extends BaseController {
 
         // 生成 token
         Map<String, Object> claims = new HashMap<String, Object>(){{
-            put("userId", sysUser.getUserId());
+            put("id", sysUser.getUserId());
         }};
         String jws = JWTUtils.encode(claims);
         response.addHeader(JWTUtils.AUTH_HEADER, jws);
@@ -63,4 +73,36 @@ public class LoginController extends BaseController {
     public ResponseBean logout() {
         return ResponseBean.success(null);
     }
+
+    /**
+     * 微信登录
+     * @param code
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/wx/login")
+    public ResponseBean wxLogin(@RequestParam(value = "code") String code, HttpServletResponse response) throws Exception{
+        WxMaJscode2SessionResult sessionInfo = wxUtils.getService().getUserService().getSessionInfo(code);
+
+        // 获取个人信息
+        TaPerson taPerson = iTaPersonService.getOrSavePerson(sessionInfo.getOpenid());
+
+        // 其余信息
+        Map<String, Object> extraInfo = new HashMap<>();
+        extraInfo.put("sessionKey", sessionInfo.getSessionKey());
+
+        //
+        Map<String, Object> result = new HashMap<>();
+        result.put("person", taPerson);
+        result.put("extraInfo", extraInfo);
+
+
+        // 生成 token
+        Map<String, Object> claims = new HashMap<String, Object>(){{
+            put("id", taPerson.getPersonId());
+        }};
+        response.addHeader(JWTUtils.AUTH_HEADER, JWTUtils.encode(claims));
+
+        return ResponseBean.success(result);
+    }
 }

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

@@ -5,6 +5,7 @@ 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.enums.StatusEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,13 +43,13 @@ public class SysModuleController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/sysModule",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/sysModule",method= RequestMethod.GET)
     public ResponseBean sysModuleList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
         IPage<SysModule> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<SysModule> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByDesc("create_date");
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
 
         IPage<SysModule> result = iSysModuleService.page(pg, queryWrapper);
         return ResponseBean.success(result);

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

@@ -43,16 +43,19 @@ public class TaActivityController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/activity",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/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) throws Exception{
+                                       @RequestParam(value ="status", required = false) Integer status,
+                                       @PathVariable String client) 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.orderByDesc("weight, create_date");
@@ -112,8 +115,10 @@ public class TaActivityController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/activity/{id}",method= RequestMethod.GET)
-    public ResponseBean taActivityGet(@PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaActivityService.getById(id));
+    @RequestMapping(value="/{client}/activity/{id}",method= RequestMethod.GET)
+    public ResponseBean taActivityGet(@PathVariable String client,
+                                      @PathVariable Integer id) throws Exception{
+        TaActivity result = iTaActivityService.getActivityProfile(id);
+        return ResponseBean.success(result);
     }
 }

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

@@ -5,6 +5,7 @@ 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.entity.TaPerson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,8 @@ import com.yunzhi.liyuanhui.service.ITaActivityEnrollService;
 import com.yunzhi.liyuanhui.entity.TaActivityEnroll;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 活动报名 前端控制器
@@ -61,10 +64,18 @@ public class TaActivityEnrollController extends BaseController {
      * @param taActivityEnroll 实体对象
      * @return
      */
-    @RequestMapping(value="/taActivityEnroll",method= RequestMethod.POST)
-    public ResponseBean taActivityEnrollAdd(@RequestBody TaActivityEnroll taActivityEnroll) throws Exception{
+    @RequestMapping(value="/wx/activity/{activityId}/enroll",method= RequestMethod.POST)
+    public ResponseBean taActivityEnrollAdd(@PathVariable Integer activityId,
+                                            @RequestBody TaActivityEnroll taActivityEnroll,
+                                            HttpServletRequest request) throws Exception{
+        if (null == taActivityEnroll) {
+            return ResponseBean.error("请填写报名信息", ResponseBean.ERROR_MISSING_PARAMS);
+        } else {
+            taActivityEnroll.setActivityId(activityId);
+        }
 
-        if (iTaActivityEnrollService.save(taActivityEnroll)){
+        TaPerson taPerson = getPerson(request);
+        if (iTaActivityEnrollService.enroll(taActivityEnroll, taPerson)){
             return ResponseBean.success(taActivityEnroll);
         }else {
             return ResponseBean.error("保存失败", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -6,6 +6,12 @@ import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.liyuanhui.common.BaseController;
 import com.yunzhi.liyuanhui.common.ResponseBean;
+import com.yunzhi.liyuanhui.entity.TaActivity;
+import com.yunzhi.liyuanhui.entity.TaActivityVoteItem;
+import com.yunzhi.liyuanhui.entity.TaPerson;
+import com.yunzhi.liyuanhui.enums.StatusEnum;
+import com.yunzhi.liyuanhui.service.ITaActivityService;
+import com.yunzhi.liyuanhui.service.ITaActivityVoteItemService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +25,9 @@ import com.yunzhi.liyuanhui.service.ITaActivityVoteService;
 import com.yunzhi.liyuanhui.entity.TaActivityVote;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
     * 活动投票 前端控制器
@@ -36,6 +45,12 @@ public class TaActivityVoteController extends BaseController {
     @Autowired
     public ITaActivityVoteService iTaActivityVoteService;
 
+    @Autowired
+    private ITaActivityService iTaActivityService;
+
+    @Autowired
+    private ITaActivityVoteItemService iTaActivityVoteItemService;
+
 
     /**
      * 分页查询列表
@@ -58,17 +73,34 @@ public class TaActivityVoteController extends BaseController {
     }
 
     /**
-     * 保存对象
-     * @param taActivityVote 实体对象
+     * 活动投票
+     * @param activityId
+     * @param params
+     * @param request
      * @return
+     * @throws Exception
      */
-    @RequestMapping(value="/taActivityVote",method= RequestMethod.POST)
-    public ResponseBean taActivityVoteAdd(@RequestBody TaActivityVote taActivityVote) throws Exception{
+    @RequestMapping(value="/wx/activity/{activityId}/vote",method= RequestMethod.POST)
+    public ResponseBean taActivityVoteAdd(@PathVariable Integer activityId,
+                                          @RequestBody Map<String, Object> params,
+                                          HttpServletRequest request) throws Exception{
+        if (null == params) {
+            return ResponseBean.error("投票失败, 请设置投票内容", ResponseBean.ERROR_MISSING_PARAMS);
+        }
 
-        if (iTaActivityVoteService.save(taActivityVote)){
-            return ResponseBean.success(taActivityVote);
+        Object itemId = params.get("itemId");
+        if (null == itemId) {
+            return ResponseBean.error("投票失败, 请选择设置投票项目", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaActivity taActivity = iTaActivityService.getById(activityId);
+        TaPerson taPerson = getPerson(request);
+        TaActivityVoteItem taActivityVoteItem = iTaActivityVoteItemService.getById(Integer.valueOf(itemId.toString()));
+
+        if (iTaActivityVoteService.vote(taActivity, taActivityVoteItem, taPerson)){
+            return ResponseBean.success("投票成功");
         }else {
-            return ResponseBean.error("保存失败", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("投票失败", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 

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

@@ -0,0 +1,122 @@
+package com.yunzhi.liyuanhui.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
+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 com.yunzhi.liyuanhui.service.ITaAdvertService;
+import com.yunzhi.liyuanhui.entity.TaAdvert;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 广告位  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-08-13
+ */
+@RestController
+@RequestMapping("/")
+public class TaAdvertController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaAdvertController.class);
+
+    @Autowired
+    public ITaAdvertService iTaAdvertService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/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{
+
+        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.orderByDesc("sort_no");
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaAdvert> result = iTaAdvertService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taAdvert 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/advert",method= RequestMethod.POST)
+    public ResponseBean taAdvertAdd(@RequestBody TaAdvert taAdvert) throws Exception{
+
+        if (iTaAdvertService.save(taAdvert)){
+            return ResponseBean.success(taAdvert);
+        }else {
+            return ResponseBean.error("保存失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taAdvert/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taAdvertDelete(@PathVariable Integer id) throws Exception{
+
+        if(iTaAdvertService.removeById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taAdvert 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/advert/{id}",method= RequestMethod.PUT)
+    public ResponseBean taAdvertUpdate(@PathVariable Integer id,
+                                        @RequestBody TaAdvert taAdvert) throws Exception{
+
+        if (iTaAdvertService.updateById(taAdvert)){
+            return ResponseBean.success(taAdvert);
+        }else {
+            return ResponseBean.error("修改失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/advert/{id}",method= RequestMethod.GET)
+    public ResponseBean taAdvertGet(@PathVariable Integer id) throws Exception{
+
+        return ResponseBean.success(iTaAdvertService.getById(id));
+    }
+}

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

@@ -5,6 +5,8 @@ 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;
@@ -42,13 +44,16 @@ public class TaGalleryController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taGallery",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/gallery",method= RequestMethod.GET)
     public ResponseBean taGalleryList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                      @RequestParam(value = "typeId", required = false) String typeId) throws Exception{
 
         IPage<TaGallery> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaGallery> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByDesc("create_date");
+        queryWrapper.eq(!StringUtils.isEmpty(typeId), "type_id", typeId);
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.orderByAsc("create_date");
 
         IPage<TaGallery> result = iTaGalleryService.page(pg, queryWrapper);
         return ResponseBean.success(result);
@@ -59,7 +64,7 @@ public class TaGalleryController extends BaseController {
      * @param taGallery 实体对象
      * @return
      */
-    @RequestMapping(value="/taGallery",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/gallery",method= RequestMethod.POST)
     public ResponseBean taGalleryAdd(@RequestBody TaGallery taGallery) throws Exception{
 
         if (iTaGalleryService.save(taGallery)){

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

@@ -1,24 +1,22 @@
 package com.yunzhi.liyuanhui.controller;
 
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.common.WxUtils;
 import com.yunzhi.liyuanhui.enums.StatusEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-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.*;
 import com.yunzhi.liyuanhui.service.ITaPersonService;
 import com.yunzhi.liyuanhui.entity.TaPerson;
-import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -37,6 +35,9 @@ public class TaPersonController extends BaseController {
     @Autowired
     public ITaPersonService iTaPersonService;
 
+    @Autowired
+    WxUtils wxUtils;
+
 
     /**
      * 分页查询列表
@@ -99,7 +100,7 @@ public class TaPersonController extends BaseController {
      * @param taPerson 实体对象
      * @return
      */
-    @RequestMapping(value="/taPerson/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/wx/person/{id}",method= RequestMethod.POST)
     public ResponseBean taPersonUpdate(@PathVariable Integer id,
                                         @RequestBody TaPerson taPerson) throws Exception{
 
@@ -114,8 +115,39 @@ public class TaPersonController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taPerson/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/wx/person/{id}",method= RequestMethod.GET)
     public ResponseBean taPersonGet(@PathVariable Integer id) throws Exception{
         return ResponseBean.success(iTaPersonService.getById(id));
     }
+
+    /**
+     * 获取并更新客户手机
+     * @param personId
+     * @param params
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/wx/person/{personId}/phone")
+    public ResponseBean updatePhone(@PathVariable Integer personId, @RequestBody Map<String, String> params) throws Exception{
+        if (null == params) {
+            return ResponseBean.error("未获取足够参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        String sessionKey = params.get("sessionKey");
+        String encryptedData = params.get("encryptedData");
+        String iv = params.get("iv");
+
+        if (StringUtils.isEmpty(sessionKey) || StringUtils.isEmpty(encryptedData) || StringUtils.isEmpty(iv)) {
+            return ResponseBean.error("未获取足够参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        WxMaPhoneNumberInfo phoneNoInfo = wxUtils.getService().getUserService().getPhoneNoInfo(sessionKey, encryptedData, iv);
+        String phone = phoneNoInfo.getPurePhoneNumber();
+        if (StringUtils.isEmpty(phone)) {
+            return ResponseBean.error("获取手机号失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaPerson taPerson = iTaPersonService.updatePersonPhone(personId, phone);
+        return ResponseBean.success(taPerson);
+    }
 }

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

@@ -5,6 +5,7 @@ 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.enums.StatusEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,13 +43,15 @@ public class TdActivityTypeController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/tdActivityType",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/activityType",method= RequestMethod.GET)
     public ResponseBean tdActivityTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                           @RequestParam(value ="pageSize",defaultValue = "100") Integer pageSize,
+                                           @PathVariable String client) throws Exception{
 
         IPage<TdActivityType> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TdActivityType> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByDesc("create_date");
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.orderByDesc("sort_no");
 
         IPage<TdActivityType> result = iTdActivityTypeService.page(pg, queryWrapper);
         return ResponseBean.success(result);

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

@@ -0,0 +1,112 @@
+package com.yunzhi.liyuanhui.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+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 com.yunzhi.liyuanhui.service.ITdGalleryTypeService;
+import com.yunzhi.liyuanhui.entity.TdGalleryType;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 照片墙分类 生成照片墙的时候自动写入 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-08-14
+ */
+@RestController
+@RequestMapping("/")
+public class TdGalleryTypeController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdGalleryTypeController.class);
+
+    @Autowired
+    public ITdGalleryTypeService iTdGalleryTypeService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/galleryType",method= RequestMethod.GET)
+    public ResponseBean tdGalleryTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+
+        IPage<TdGalleryType> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TdGalleryType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("type_id");
+
+        IPage<TdGalleryType> result = iTdGalleryTypeService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param tdGalleryType 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdGalleryType",method= RequestMethod.POST)
+    public ResponseBean tdGalleryTypeAdd(@RequestBody TdGalleryType tdGalleryType) throws Exception{
+
+        if (iTdGalleryTypeService.save(tdGalleryType)){
+            return ResponseBean.success(tdGalleryType);
+        }else {
+            return ResponseBean.error("保存失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tdGalleryType/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tdGalleryTypeDelete(@PathVariable Integer id) throws Exception{
+
+        if(iTdGalleryTypeService.removeById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tdGalleryType 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdGalleryType/{id}",method= RequestMethod.PUT)
+    public ResponseBean tdGalleryTypeUpdate(@PathVariable Integer id,
+                                        @RequestBody TdGalleryType tdGalleryType) throws Exception{
+
+        if (iTdGalleryTypeService.updateById(tdGalleryType)){
+            return ResponseBean.success(tdGalleryType);
+        }else {
+            return ResponseBean.error("更新失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tdGalleryType/{id}",method= RequestMethod.GET)
+    public ResponseBean tdGalleryTypeGet(@PathVariable Integer id) throws Exception{
+        return ResponseBean.success(iTdGalleryTypeService.getById(id));
+    }
+}

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

@@ -1,9 +1,12 @@
 package com.yunzhi.liyuanhui.entity;
 
 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.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -144,5 +147,14 @@ public class TaActivity implements Serializable {
      */
     private Integer weight;
 
+    /**
+     * 推荐到首页
+     */
+    private Boolean toIndex;
 
+    /**
+     * 投票列表
+     */
+    @TableField(exist = false)
+    List<TaActivityVoteItem> voteItemList;
 }

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

@@ -55,29 +55,34 @@ public class TaActivityEnroll implements Serializable {
     private String activityTypeName;
 
     /**
-     * 报名人
+     * 操作人
      */
     private Integer personId;
 
     /**
-     * 名称
+     * 操作人名称
      */
     private String personName;
 
     /**
-     * 昵称
+     * 操作人手机号
+     */
+    private String personPhone;
+
+    /**
+     * 报名人
      */
-    private String personNickname;
+    private String enrollName;
 
     /**
-     * 头像
+     * 报名手机号
      */
-    private String personAvatar;
+    private String enrollPhone;
 
     /**
-     * 手机号
+     * 报名手机号
      */
-    private String phone;
+    private Integer enrollNum;
 
     /**
      * 报名时间

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

@@ -0,0 +1,78 @@
+package com.yunzhi.liyuanhui.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 广告位 
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaAdvert implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 广告ID
+     */
+    @TableId(value = "adv_id", type = IdType.AUTO)
+    private Integer advId;
+
+    /**
+     * 广告类型 冗余扩展
+     */
+    private String advType;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 图片
+     */
+    private String image;
+
+    /**
+     * 投放位置
+     */
+    private String position;
+
+    /**
+     * 资源类型
+     */
+    private String srcType;
+
+    /**
+     * 资源ID 没有ID说明不需要链接
+     */
+    private String srcId;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sortNo;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

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

@@ -1,6 +1,7 @@
 package com.yunzhi.liyuanhui.entity;
 
 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;
@@ -29,9 +30,15 @@ public class TaGallery implements Serializable {
     @TableId(value = "img_id", type = IdType.AUTO)
     private Integer imgId;
 
+    /**
+     * 照片地址
+     */
+    private String imgUrl;
+
     /**
      * 描述
      */
+    @TableField("`desc`")
     private String desc;
 
     /**
@@ -42,7 +49,7 @@ public class TaGallery implements Serializable {
     /**
      * 分类
      */
-    private String imgType;
+    private String typeId;
 
     /**
      * 排序

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

@@ -0,0 +1,40 @@
+package com.yunzhi.liyuanhui.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 照片墙分类 生成照片墙的时候自动写入
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdGalleryType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分类ID
+     */
+    private String typeId;
+
+    /**
+     * 分类名称
+     */
+    private String name;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/yunzhi/liyuanhui/interceptor/PermissionInterceptor.java

@@ -37,14 +37,16 @@ public class PermissionInterceptor implements HandlerInterceptor {
             return false;
         }
 
+        // 刷新 TOKEN
+        String newTk = JWTUtils.getToken(request);
+        JWTUtils.refresh(newTk, response);
+
         return true;
     }
 
     @Override
     public void postHandle(HttpServletRequest request, HttpServletResponse response, Object obj, ModelAndView mv) throws Exception {
-        // 刷新 TOKEN
-        String jws = JWTUtils.getToken(request);
-        JWTUtils.refresh(jws, response);
+        // TODO
     }
 
     private void responseTokenError(HttpServletResponse response, String error) throws IOException {

src/main/java/com/yunzhi/liyuanhui/mapper/TaAdvertMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.liyuanhui.mapper;
+
+import com.yunzhi.liyuanhui.entity.TaAdvert;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 广告位  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-13
+ */
+@Mapper
+public interface TaAdvertMapper extends BaseMapper<TaAdvert> {
+
+}

src/main/java/com/yunzhi/liyuanhui/mapper/TdGalleryTypeMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.liyuanhui.mapper;
+
+import com.yunzhi.liyuanhui.entity.TdGalleryType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 照片墙分类 生成照片墙的时候自动写入 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-14
+ */
+@Mapper
+public interface TdGalleryTypeMapper extends BaseMapper<TdGalleryType> {
+
+}

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

@@ -2,6 +2,7 @@ package com.yunzhi.liyuanhui.service;
 
 import com.yunzhi.liyuanhui.entity.TaActivityEnroll;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.liyuanhui.entity.TaPerson;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaActivityEnrollService extends IService<TaActivityEnroll> {
 
+    boolean enroll(TaActivityEnroll taActivityEnroll, TaPerson taPerson) throws Exception;
 }

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

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaActivityService extends IService<TaActivity> {
 
+    TaActivity getActivityProfile(Integer id) throws Exception;
 }

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

@@ -1,7 +1,10 @@
 package com.yunzhi.liyuanhui.service;
 
+import com.yunzhi.liyuanhui.entity.TaActivity;
 import com.yunzhi.liyuanhui.entity.TaActivityVote;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.liyuanhui.entity.TaActivityVoteItem;
+import com.yunzhi.liyuanhui.entity.TaPerson;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaActivityVoteService extends IService<TaActivityVote> {
 
+    boolean vote(TaActivity taActivity, TaActivityVoteItem taActivityVoteItem, TaPerson taPerson) throws Exception;
 }

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

@@ -0,0 +1,16 @@
+package com.yunzhi.liyuanhui.service;
+
+import com.yunzhi.liyuanhui.entity.TaAdvert;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 广告位  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-13
+ */
+public interface ITaAdvertService extends IService<TaAdvert> {
+
+}

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

@@ -13,4 +13,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaPersonService extends IService<TaPerson> {
 
+    /**
+     * 获取客户信息, 没有则新建一个
+     * @param openid
+     * @return
+     * @throws Exception
+     */
+    TaPerson getOrSavePerson(String openid) throws Exception;
+
+    /**
+     * 更新用户手机号
+     * @param personId
+     * @param phone
+     * @return
+     * @throws Exception
+     */
+    TaPerson updatePersonPhone(Integer personId, String phone) throws Exception;
 }

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

@@ -0,0 +1,16 @@
+package com.yunzhi.liyuanhui.service;
+
+import com.yunzhi.liyuanhui.entity.TdGalleryType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 照片墙分类 生成照片墙的时候自动写入 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-14
+ */
+public interface ITdGalleryTypeService extends IService<TdGalleryType> {
+
+}

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

@@ -1,10 +1,19 @@
 package com.yunzhi.liyuanhui.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.yunzhi.liyuanhui.common.StringUtils;
+import com.yunzhi.liyuanhui.entity.TaActivity;
 import com.yunzhi.liyuanhui.entity.TaActivityEnroll;
+import com.yunzhi.liyuanhui.entity.TaPerson;
+import com.yunzhi.liyuanhui.enums.StatusEnum;
 import com.yunzhi.liyuanhui.mapper.TaActivityEnrollMapper;
 import com.yunzhi.liyuanhui.service.ITaActivityEnrollService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.liyuanhui.service.ITaActivityService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -17,4 +26,63 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaActivityEnrollServiceImpl extends ServiceImpl<TaActivityEnrollMapper, TaActivityEnroll> implements ITaActivityEnrollService {
 
+    @Autowired
+    ITaActivityService iTaActivityService;
+
+    @Transactional
+    @Override
+    public boolean enroll(TaActivityEnroll taActivityEnroll, TaPerson taPerson) throws Exception {
+        TaActivity taActivity = iTaActivityService.getById(taActivityEnroll.getActivityId());
+
+        if (null == taActivity || !StatusEnum.NORMAL.getCode().equals(taActivity.getStatus()) || !taActivity.getIsEnroll()) {
+            throw new Exception("当前活动暂不支持报名");
+        }
+
+        if (StringUtils.isEmpty(taPerson.getPhone())) {
+            throw new Exception("请先进行授权手机号操作");
+        }
+
+        if (StringUtils.isEmpty(taActivityEnroll.getEnrollName()) || StringUtils.isEmpty(taActivityEnroll.getEnrollPhone())) {
+            throw new Exception("报名人或者手机号不能为空");
+        }
+
+        if (null == taActivityEnroll.getEnrollNum() || 0 >= taActivityEnroll.getEnrollNum()) {
+            taActivityEnroll.setEnrollNum(1);
+        }
+
+        // 判断当前手机号是否已经报名
+        QueryWrapper<TaActivityEnroll> queryWrapper = new QueryWrapper<>();
+        queryWrapper.nested(q -> q.eq("person_phone", taPerson.getPhone())
+                .or().eq("person_phone", taActivityEnroll.getEnrollPhone())
+                .or().eq("enroll_phone", taPerson.getPhone())
+                .or().eq("enroll_phone", taActivityEnroll.getEnrollPhone()));
+        int count = this.count(queryWrapper);
+        if (count > 0) {
+            throw new Exception("当前人员或所填手机号已经报名");
+        }
+
+        taActivityEnroll.setActivityName(taActivity.getName());
+        taActivityEnroll.setActivityThumb(taActivity.getThumb());
+        taActivityEnroll.setActivityTypeId(taActivity.getTypeId());
+        taActivityEnroll.setActivityTypeName(taActivity.getTypeName());
+        taActivityEnroll.setPersonId(taPerson.getPersonId());
+        taActivityEnroll.setPersonName(StringUtils.ifNull(taPerson.getName(), taPerson.getNickname()));
+        taActivityEnroll.setPersonPhone(taPerson.getPhone());
+
+        if(!save(taActivityEnroll)) {
+            throw new RuntimeException("报名失败, 请重试");
+        }
+
+        // 更新投票人数
+        UpdateWrapper<TaActivity> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("enroll_num", taActivity.getEnrollNum() + 1);
+        updateWrapper.eq("activity_id", taActivity.getActivityId());
+        updateWrapper.eq("enroll_num", taActivity.getEnrollNum());
+        boolean update = iTaActivityService.update(updateWrapper);
+        if (!update) {
+            throw new RuntimeException("报名失败, 请重试");
+        }
+
+        return true;
+    }
 }

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

@@ -1,9 +1,14 @@
 package com.yunzhi.liyuanhui.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.liyuanhui.entity.TaActivity;
+import com.yunzhi.liyuanhui.entity.TaActivityVoteItem;
+import com.yunzhi.liyuanhui.enums.StatusEnum;
 import com.yunzhi.liyuanhui.mapper.TaActivityMapper;
 import com.yunzhi.liyuanhui.service.ITaActivityService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.liyuanhui.service.ITaActivityVoteItemService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +22,19 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaActivityServiceImpl extends ServiceImpl<TaActivityMapper, TaActivity> implements ITaActivityService {
 
+    @Autowired
+    ITaActivityVoteItemService iTaActivityVoteItemService;
+
+    @Override
+    public TaActivity getActivityProfile(Integer id) throws Exception {
+        TaActivity taActivity = getById(id);
+
+        QueryWrapper<TaActivityVoteItem> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("activity_id", id);
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.orderByAsc("sort_no");
+
+        taActivity.setVoteItemList(iTaActivityVoteItemService.list(queryWrapper));
+        return taActivity;
+    }
 }

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

@@ -1,10 +1,21 @@
 package com.yunzhi.liyuanhui.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.yunzhi.liyuanhui.common.StringUtils;
+import com.yunzhi.liyuanhui.entity.TaActivity;
 import com.yunzhi.liyuanhui.entity.TaActivityVote;
+import com.yunzhi.liyuanhui.entity.TaActivityVoteItem;
+import com.yunzhi.liyuanhui.entity.TaPerson;
+import com.yunzhi.liyuanhui.enums.StatusEnum;
+import com.yunzhi.liyuanhui.mapper.TaActivityVoteItemMapper;
 import com.yunzhi.liyuanhui.mapper.TaActivityVoteMapper;
+import com.yunzhi.liyuanhui.service.ITaActivityVoteItemService;
 import com.yunzhi.liyuanhui.service.ITaActivityVoteService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -17,4 +28,67 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaActivityVoteServiceImpl extends ServiceImpl<TaActivityVoteMapper, TaActivityVote> implements ITaActivityVoteService {
 
+    @Autowired
+    TaActivityVoteMapper taActivityVoteMapper;
+
+    @Autowired
+    ITaActivityVoteItemService iTaActivityVoteItemService;
+
+    @Transactional
+    @Override
+    public boolean vote(TaActivity taActivity, TaActivityVoteItem taActivityVoteItem, TaPerson taPerson) throws Exception {
+        if (null == taActivity || null == taActivityVoteItem || null == taPerson) {
+            throw new Exception("参数错误");
+        }
+
+        if (StringUtils.isEmpty(taPerson.getPhone())) {
+            throw new Exception("请先进行授权手机号操作");
+        }
+
+        if (!taActivity.getIsVote() || !StatusEnum.NORMAL.getCode().equals(taActivity.getStatus()) || !taActivity.getIsVote()) {
+            throw new Exception("当前活动暂不支持投票");
+        }
+
+        if (!taActivity.getActivityId().equals(taActivityVoteItem.getActivityId())) {
+            throw new Exception("投票内容与活动不符");
+        }
+
+        // 当前人员是否已经进行过投票
+        QueryWrapper<TaActivityVote> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("activity_id", taActivity.getActivityId());
+        queryWrapper.eq("item_id", taActivityVoteItem.getItemId());
+        queryWrapper.eq("person_id", taPerson.getPersonId());
+        int peronVoted = this.count(queryWrapper);
+        if (peronVoted > 0) {
+            throw new Exception("当前人员已经投过票");
+        }
+
+        // 投票
+        TaActivityVote taActivityVote = new TaActivityVote();
+        taActivityVote.setActivityId(taActivity.getActivityId());
+        taActivityVote.setActivityName(taActivity.getName());
+        taActivityVote.setActivityThumb(taActivity.getThumb());
+        taActivityVote.setItemId(taActivityVoteItem.getItemId());
+        taActivityVote.setItemName(taActivityVoteItem.getName());
+        taActivityVote.setPersonId(taPerson.getPersonId());
+        taActivityVote.setPersonName(StringUtils.ifNull(taPerson.getName(), taPerson.getNickname()));
+        taActivityVote.setPersonAvatar(taPerson.getAvatar());
+        taActivityVote.setPhone(taPerson.getPhone());
+
+        if (!save(taActivityVote)) {
+            throw new RuntimeException("投票失败, 请重试");
+        }
+
+        // 更新票数
+        UpdateWrapper<TaActivityVoteItem> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("vote_num", taActivityVoteItem.getVoteNum() + 1);
+        updateWrapper.eq("item_id", taActivityVoteItem.getItemId());
+        updateWrapper.eq("vote_num", taActivityVoteItem.getVoteNum());
+        boolean update = iTaActivityVoteItemService.update(updateWrapper);
+        if (!update) {
+            throw new RuntimeException("投票失败, 请重试");
+        }
+
+        return true;
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.yunzhi.liyuanhui.service.impl;
+
+import com.yunzhi.liyuanhui.entity.TaAdvert;
+import com.yunzhi.liyuanhui.mapper.TaAdvertMapper;
+import com.yunzhi.liyuanhui.service.ITaAdvertService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 广告位  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-13
+ */
+@Service
+public class TaAdvertServiceImpl extends ServiceImpl<TaAdvertMapper, TaAdvert> implements ITaAdvertService {
+
+}

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

@@ -1,5 +1,6 @@
 package com.yunzhi.liyuanhui.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.liyuanhui.entity.TaPerson;
 import com.yunzhi.liyuanhui.mapper.TaPersonMapper;
 import com.yunzhi.liyuanhui.service.ITaPersonService;
@@ -17,4 +18,33 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> implements ITaPersonService {
 
+    @Override
+    public TaPerson getOrSavePerson(String openid) throws Exception {
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("openid", openid);
+        TaPerson person = this.getOne(queryWrapper);
+
+        // 如果找不到则新建一个
+        if (null == person) {
+            person = new TaPerson();
+            person.setOpenid(openid);
+            save(person);
+            // 返回最新内容
+            return this.getOne(queryWrapper);
+        }
+
+        return person;
+    }
+
+    @Override
+    public TaPerson updatePersonPhone(Integer personId, String phone) throws Exception {
+        TaPerson taPerson = this.getById(personId);
+        if (null == taPerson) {
+            throw new Exception("当前人员信息不存在");
+        }
+
+        taPerson.setPhone(phone);
+        updateById(taPerson);
+        return taPerson;
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.yunzhi.liyuanhui.service.impl;
+
+import com.yunzhi.liyuanhui.entity.TdGalleryType;
+import com.yunzhi.liyuanhui.mapper.TdGalleryTypeMapper;
+import com.yunzhi.liyuanhui.service.ITdGalleryTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 照片墙分类 生成照片墙的时候自动写入 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-14
+ */
+@Service
+public class TdGalleryTypeServiceImpl extends ServiceImpl<TdGalleryTypeMapper, TdGalleryType> implements ITdGalleryTypeService {
+
+}

src/main/resources/application.yml

@@ -9,7 +9,7 @@ interceptor:
   permission:
     enable: true
     include-paths: /**
-    exclude-paths: /login
+    exclude-paths: /login,/logout,/wx/login
 
 ###
 mybatis-plus:
@@ -30,8 +30,8 @@ aliyun:
 ###
 weixin:
   miniapp:
-    appid: wxd6f47a9bb3052175
-    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
+    appid: wxd9ee3a9480a4e544
+    secret: db947ddc5f6498b5963d7a43b84a8718
     token:
     aesKey:
     msgDataFormat: JSON

src/main/resources/mapper/TaAdvertMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.liyuanhui.mapper.TaAdvertMapper">
+
+</mapper>

src/main/resources/mapper/TdGalleryTypeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.liyuanhui.mapper.TdGalleryTypeMapper">
+
+</mapper>