Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

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

@@ -212,6 +212,71 @@ public class TaBuildingDynamicController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 活动详情
+     * @param dynamicId
+     * @return
+     */
+    @ApiOperation(value = "微信端查询活报名动详情", notes = "微信端查询活报名动详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "dynamicId", paramType = "path",value = "活动ID")
+    })
+    @RequestMapping(value = "/wx/buildingDynamiceEnlistInfo/{dynamicId}", method = RequestMethod.GET)
+    public ResponseBean iBuildingDynamicEnlistInfo(@PathVariable(value = "dynamicId") String dynamicId,
+                                             HttpServletRequest request){
+        ResponseBean  responseBean = new ResponseBean();
+                String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        Integer orgId = getOrgId(request);
+        QueryWrapper<TaActivityDynamicEnlist>enlistQueryWrapper = new QueryWrapper<>();
+        enlistQueryWrapper.eq("dynamic_id",dynamicId);
+        enlistQueryWrapper.eq("person_id",person.getPersonId());
+        enlistQueryWrapper.eq("org_id",orgId);
+        TaActivityDynamicEnlist enlist = taActivityDynamicEnlistMapper.selectOne(enlistQueryWrapper);
+        TaBuildingDynamic buildingDynamic = iBuildingDynamicService.getById(dynamicId);
+        Map<String,Object>data = new HashMap<>();
+        data.put("enlist",enlist);
+        data.put("dynamic",buildingDynamic);
+        data.put("person",person);
+        responseBean.addSuccess(data);
+        return responseBean;
+    }
+
+
+    /**
+     * 活动签到
+     * @param enlistId
+     * @return
+     */
+    @ApiOperation(value = "微信端活动签到", notes = "微信端活动签到")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "enlistId", paramType = "path",value = "活动报名ID")
+    })
+    @RequestMapping(value = "/wx/buildingDynamicCheckin/{enlistId}", method = RequestMethod.PUT)
+    public ResponseBean iBuildingDynamicCheckin(@PathVariable(value = "enlistId") String enlistId,
+                                             HttpServletRequest request){
+        ResponseBean  responseBean =new ResponseBean();
+       TaActivityDynamicEnlist enlist = taActivityDynamicEnlistMapper.selectById(enlistId);
+       try{
+           if(null != enlist){
+               enlist.setIsCheckin(CommConstant.STATUS_NORMAL);
+               if(taActivityDynamicEnlistMapper.updateById(enlist)>0){
+                   responseBean.addSuccess("签到成功");
+               }else {
+                   responseBean.addError("签到失败");
+               }
+           }
+       }catch (Exception e){
+           e.printStackTrace();
+           responseBean.addError("签到异常");
+       }
+        return responseBean;
+    }
+
     /**
      * 添加活动报名
      * @param taActivityDynamicEnlist
@@ -269,6 +334,7 @@ public class TaBuildingDynamicController extends BaseController {
 
         taActivityDynamicEnlist.setPersonId(person.getPersonId());
         taActivityDynamicEnlist.setOrgId(orgId);
+        taActivityDynamicEnlist.setIsCheckin(CommConstant.STATUS_UNACCALIMED);
         ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist, orgId);
         return responseBean;
     }

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

@@ -144,6 +144,32 @@ public class TaDocumentVerifyController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 微信查询对象
+     * @return
+     */
+    @RequestMapping(value="/wx/documentVerify",method= RequestMethod.GET)
+    public ResponseBean wxDocumentVerifyUpdate(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String personId = getPersonId(request);
+        Integer orgId = getOrgId(request);
+        QueryWrapper<TaDocumentVerify> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", personId);
+        queryWrapper.eq("org_id", orgId);
+        TaDocumentVerify verify = iTaDocumentVerifyService.getOne(queryWrapper);
+        if (null != verify) {
+            QueryWrapper<TaDocumentImg> documentImgQueryWrapper = new QueryWrapper<>();
+            documentImgQueryWrapper.eq("document_verify_id", verify.getDocumentVerifyId());
+            documentImgQueryWrapper.eq("person_id", verify.getPersonId());
+            documentImgQueryWrapper.eq("org_id", orgId);
+            List<TaDocumentImg> documentImgList = documentImgService.list(documentImgQueryWrapper);
+            verify.setImgList(documentImgList);
+        }
+
+        responseBean.addSuccess(verify);
+        return responseBean;
+    }
+
     /**
      * 微信修改对象
      * @param id  实体ID

src/main/java/com/huiju/estateagents/entity/TaShareActivity.java

@@ -65,11 +65,6 @@ public class TaShareActivity implements Serializable {
      */
     private Integer groupBuyPeople;
 
-    /**
-     * 参与人数
-     */
-    private Integer joinPeople;
-
     /**
      * 所需积分
      */

src/main/java/com/huiju/estateagents/entity/TaShareRecord.java

@@ -60,6 +60,11 @@ public class TaShareRecord implements Serializable {
      */
     private String avatarurl;
 
+    /**
+     * 参与人数
+     */
+    private Integer joinPeople;
+
     /**
      * 拼团时间
      */

src/main/java/com/huiju/estateagents/po/TaShareRecordPO.java

@@ -16,5 +16,4 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class TaShareRecordPO extends TaShareRecord {
     private Integer groupBuyPeople;
-    private Integer joinPeople;
 }

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

@@ -70,7 +70,7 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
 		//是否助力成功
-		if (null != helpActivity.getEnlistNum() && helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
+		if (null != helpInitiateRecord.getEnlistNum() && helpInitiateRecord.getEnlistNum() >= helpActivity.getPersonNum()){
 			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){

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

@@ -60,12 +60,14 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
             TaPerson taPerson = taPersonMapper.getById(taShareChildRecord.getPersonId());
             TaShareActivity taShareActivity = activityMapper.selectTaShareActivityById(taShareChildRecord.getGroupActivityId());
 
+            TaShareRecord record = tashareRecordmapper.selectById(taShareChildRecord.getRecordId());
+
             if (taPerson.getPoints() == null || taPerson.getPoints() < taShareActivity.getIntegral()){
                 responseBean.addError("积分不足");
                 return responseBean;
             }
             //判断参团人数是否已满
-            if (taShareActivity.getGroupBuyPeople().equals(taShareActivity.getJoinPeople())){
+            if (taShareActivity.getGroupBuyPeople().equals(record.getJoinPeople())){
                 TaShareRecord taShareRecord = new TaShareRecord();
                 taShareRecord.setStatus(0);
                 taShareRecord.setRecordId(taShareChildRecord.getRecordId());
@@ -126,7 +128,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         
         //查看是否拼团成功
         TaShareActivity taShareActivity = activityMapper.selectById(taShareChildRecord.getGroupActivityId());
-        if (taShareActivity.getJoinPeople() >= taShareActivity.getGroupBuyPeople()){
+        if (taShareRecord.getJoinPeople() >= taShareActivity.getGroupBuyPeople()){
             return ResponseBean.error("拼团失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         if (taShareActivity.getEndTime().isBefore(LocalDateTime.now())){
@@ -150,7 +152,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         }
         
         //反更新人数
-        taShareActivity.setJoinPeople(taShareActivity.getJoinPeople()+1);
+        taShareRecord.setJoinPeople(taShareRecord.getJoinPeople()+1);
         activityMapper.updateById(taShareActivity);
     
         //成为团员
@@ -158,7 +160,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         taShareChildRecord.setStatus(CommConstant.STATUS_NORMAL);
         taShareChildRecord.setPersonId(person.getPersonId());
         taShareChildRecordMapper.insert(taShareChildRecord);
-        if (taShareActivity.getJoinPeople().equals(taShareActivity.getGroupBuyPeople())){
+        if (taShareRecord.getJoinPeople().equals(taShareActivity.getGroupBuyPeople())){
             //发送微信模板消息所有人都发送
             sendWxMessage(taShareRecord,orgId,taShareActivity);
             

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

@@ -197,6 +197,7 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         //扣取积分,更新参团人数
         person.setPoints(person.getPoints() - taShareActivity.getIntegral());
         taPersonMapper.updateById(person);
+        taShareRecord.setJoinPeople(1);
         //保存拼团团长数据
         taShareRecord.setOrgId(orgId);
         taShareRecord.setPersonId(person.getPersonId());