* 小程序变更

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cp/CpsMeetingUsrController.java

@@ -123,13 +123,13 @@ public class CpsMeetingUsrController extends BaseController {
     }
 
     @Log(title = "与会人员报名", businessType = BusinessType.INSERT)
-    @PostMapping(value = "/regist/{src}")
-    public AjaxResult usrRegist(@RequestBody CpsUsrApply cpsUsrApply, @PathVariable("src") String src) throws ExecutionException, InterruptedException {
-        if (MeetingType.MEETING.getCode().equals(src)) {
+    @PostMapping(value = "/regist/{type}")
+    public AjaxResult usrRegist(@RequestBody CpsUsrApply cpsUsrApply, @PathVariable("type") String type) throws ExecutionException, InterruptedException {
+        if (MeetingType.MEETING.getCode().equals(type)) {
             cpsMeetingUsrService.usrMeetingRegister(cpsUsrApply);
             return AjaxResult.success();
         }
-        cpsMeetingUsrService.usrThemeConferenceRegister(cpsUsrApply);
+        cpsMeetingUsrService.usrThemeConferenceRegister(cpsUsrApply,type);
         return AjaxResult.success();
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/ICpsMeetingUsrService.java

@@ -68,7 +68,7 @@ public interface ICpsMeetingUsrService {
 
     CpsMeetingUsr getWeChatUser(WeChatUser user);
 
-    void usrThemeConferenceRegister(CpsUsrApply user);
+    void usrThemeConferenceRegister(CpsUsrApply user, String type);
 
     void usrMeetingRegister(CpsUsrApply user) throws ExecutionException, InterruptedException;
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CpsMeetingUsrServiceImpl.java

@@ -1,6 +1,5 @@
 package com.ruoyi.system.service.impl;
 
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.domain.model.WeChatUser;
 import com.ruoyi.common.enums.MeetingType;
@@ -142,19 +141,20 @@ public class CpsMeetingUsrServiceImpl implements ICpsMeetingUsrService {
     }
 
     @Override
-    public void usrThemeConferenceRegister(CpsUsrApply user) {
+    public void usrThemeConferenceRegister(CpsUsrApply user, String type) {
         List<CpsUsrApply> cpsUsrApplies = cpsUsrApplyMapper.selectCpsUsrApplyList(new CpsUsrApply() {{
             setTel(user.getTel());
-            setApplyType(user.getApplyType());
+            setApplyType(type);
             setReviewState(ReviewStatus.PASS.getCode());
         }});
         if (CollectionUtils.isNotEmpty(cpsUsrApplies)) {
             throw new ServiceException("该手机号已经报名，请勿反复报名");
         }
         user.setReviewState(ReviewStatus.WAIT.getCode());
+        user.setApplyType(type);
         user.setReviewMsg("");
-        SysUser user1 = SecurityUtils.getLoginUser().getUser();
-        user.setUpdateBy(user1.getUserName());
+        WeChatUser loginUser = (WeChatUser)SecurityUtils.getLoginUser();
+        user.setUpdateBy(loginUser.getOpenid());
         cpsUsrApplyMapper.insertCpsUsrApplyOrUpdate(user);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CpsUsrApplyServiceImpl.java

@@ -46,7 +46,16 @@ public class CpsUsrApplyServiceImpl implements ICpsUsrApplyService {
     @Override
     public CpsUsrApply selectCpsUsrApplyByTel() {
         WeChatUser loginUser = (WeChatUser) SecurityUtils.getLoginUser();
-        return cpsUsrApplyMapper.selectCpsUsrApplyByTel(loginUser.getTel(), MeetingType.MEETING.getCode());
+        CpsUsrApply cpsUsrApply = cpsUsrApplyMapper.selectCpsUsrApplyByTel(loginUser.getTel(), MeetingType.MEETING.getCode());
+        if (ObjectUtils.isEmpty(cpsUsrApply)) {
+            return null;
+        }
+        if (ObjectUtils.isEmpty(cpsUsrApply.getContentId())) {
+            return cpsUsrApply;
+        }
+        CpsContentInfo cpsContentInfo = cpsContentInfoMapper.selectCpsContentInfoById(cpsUsrApply.getContentId());
+        cpsUsrApply.setContent(cpsContentInfo);
+        return cpsUsrApply;
     }
 
     @Override