合并

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -104,6 +104,16 @@ public class CommConstant {
      */
     public final static String POINTS_CHANGE_RECOMMEND_CUSTOMER = "recommend-customer";
 
+    /**
+     * 活动核销
+     */
+    public final static String POINTS_CHANGE_ACTIVITY_VERIFICATION = "activity_verification";
+
+    /**
+     * 资料审核
+     */
+    public final static String POINTS_CHANGE_DOCUMENT_VERIFY = "document_verify";
+
 
     /**
      * 小程序默认首页
@@ -265,6 +275,16 @@ public class CommConstant {
      */
     public static final Integer POINTS_RULE_SIGNUP_AGENT = 4;
 
+    /**
+     * 活动核销送积分规则
+     */
+    public static final Integer POINTS_RULE_ACTIVITY_VERIFICATION = 6;
+
+    /**
+     * 资料审核送积分规则
+     */
+    public static final Integer POINTS_RULE_DOCUMENT_VERIFY = 7;
+
     /**
      * 平台积分
      */

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

@@ -158,12 +158,12 @@ public class HelpInitiateRecordController extends BaseController {
     
     /**
      * 微信端分页查询我发起的助力活动
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @return
      */
     @RequestMapping(value="/wx/helpInitiateRecord",method= RequestMethod.GET)
-    public ResponseBean wxhelpInitiateRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean wxhelpInitiateRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNumber,
                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                  HttpServletRequest request){
         String openid = getOpenId(request);
@@ -176,7 +176,7 @@ public class HelpInitiateRecordController extends BaseController {
         TaPerson person = taPersons.get(0);
         try {
             //分页获取数据
-            responseBean = taHelpInitiateRecordService.getInitiateRecord(pageNum, pageSize,orgId,person.getPersonId());
+            responseBean = taHelpInitiateRecordService.getInitiateRecord(pageNumber, pageSize,orgId,person.getPersonId());
         }catch (Exception e){
             e.printStackTrace();
             logger.error("helpInitiateRecordList -=- {}",e.toString());
@@ -208,9 +208,10 @@ public class HelpInitiateRecordController extends BaseController {
             helpInitiateRecordQueryWrapper.eq("help_activity_id",helpInitiateRecord.getHelpActivityId());
             helpInitiateRecordQueryWrapper.eq("org_id",orgId);
             helpInitiateRecordQueryWrapper.eq("person_id",person.getPersonId());
+            helpInitiateRecordQueryWrapper.ne("status",-1);
             HelpInitiateRecord recordServiceOne = taHelpInitiateRecordService.getOne(helpInitiateRecordQueryWrapper);
             if (null != recordServiceOne){
-                responseBean.addSuccess(helpInitiateRecord);
+                responseBean.addSuccess(recordServiceOne);
                 return responseBean;
             }
  

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

@@ -5,13 +5,28 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaApartmentImg;
+import com.huiju.estateagents.entity.TaDocumentImg;
 import com.huiju.estateagents.entity.TaDocumentVerify;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.event.EventBus;
+import com.huiju.estateagents.service.ITaDocumentImgService;
 import com.huiju.estateagents.service.ITaDocumentVerifyService;
+import com.huiju.estateagents.service.ITaPersonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
     * 资料审核  前端控制器
@@ -21,7 +36,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2019-10-23
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaDocumentVerifyController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaDocumentVerifyController.class);
@@ -29,6 +44,15 @@ public class TaDocumentVerifyController extends BaseController {
     @Autowired
     public ITaDocumentVerifyService iTaDocumentVerifyService;
 
+    @Autowired
+    public ITaPersonService taPersonService;
+
+    @Autowired
+    public ITaDocumentImgService documentImgService;
+
+
+    @Autowired
+    private ApplicationContext applicationContext;
 
     /**
      * 分页查询列表
@@ -36,17 +60,15 @@ public class TaDocumentVerifyController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/documentVerify",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/documentVerify",method= RequestMethod.GET)
     public ResponseBean documentVerifyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           @RequestParam(value ="name",required = false) String name,
+                                           @RequestParam(value ="tel",required = false) String tel,
+                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            //使用分页插件
-		    IPage<TaDocumentVerify> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaDocumentVerify> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaDocumentVerify> result = iTaDocumentVerifyService.page(pg, queryWrapper);
+            IPage<TaDocumentVerify> result = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,name,tel,getOrgId(request));
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -58,15 +80,37 @@ public class TaDocumentVerifyController extends BaseController {
 
     /**
      * 保存对象
-     * @param documentVerify 实体对象
+     * @param list List<TaDocumentImg>
      * @return
      */
-    @RequestMapping(value="/documentVerify",method= RequestMethod.POST)
-    public ResponseBean documentVerifyAdd(@RequestBody TaDocumentVerify documentVerify){
+    @RequestMapping(value="/wx/documentVerify",method= RequestMethod.POST)
+    public ResponseBean wxDocumentVerifyAdd(List<TaDocumentImg>list, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        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);
+        TaDocumentVerify documentVerify = new TaDocumentVerify();
+        documentVerify.setCreateDate(LocalDateTime.now());
+        documentVerify.setOrgId(orgId);
+        documentVerify.setPersonId(person.getPersonId());
+        documentVerify.setStatus(CommConstant.STATUS_NORMAL);
+        documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
         try {
             if (iTaDocumentVerifyService.save(documentVerify)){
+                for(int i =0; i<list.size();i++){
+                    list.get(i).setCreateDate(LocalDateTime.now());
+                    list.get(i).setDocumentVerifyId(documentVerify.getDocumentVerifyId());
+                    list.get(i).setOrgId(orgId);
+                    list.get(i).setPersonId(person.getPersonId());
+                }
+                documentImgService.saveBatch(list);
+                documentVerify.setImgList(list);
                 responseBean.addSuccess(documentVerify);
+
             }else {
                 responseBean.addError("fail");
             }
@@ -100,18 +144,73 @@ public class TaDocumentVerifyController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 微信修改对象
+     * @param id  实体ID
+     * @param list List<TaDocumentImg>
+     * @return
+     */
+    @RequestMapping(value="/wx/documentVerify/{id}",method= RequestMethod.PUT)
+    public ResponseBean wxDocumentVerifyUpdate(@PathVariable Integer id,
+                                               List<TaDocumentImg>list,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        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);
+        TaDocumentVerify documentVerify = iTaDocumentVerifyService.getById(id);
+        documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
+        try {
+            if (iTaDocumentVerifyService.updateById(documentVerify)){
+                QueryWrapper<TaDocumentImg>queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("document_verify_id",documentVerify.getDocumentVerifyId());
+                documentImgService.remove(queryWrapper);
+                for(int i =0; i<list.size();i++){
+                    list.get(i).setCreateDate(LocalDateTime.now());
+                    list.get(i).setDocumentVerifyId(documentVerify.getDocumentVerifyId());
+                    list.get(i).setOrgId(orgId);
+                    list.get(i).setPersonId(person.getPersonId());
+                }
+                documentImgService.saveBatch(list);
+                documentVerify.setImgList(list);
+                responseBean.addSuccess(documentVerify);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 修改对象
      * @param id  实体ID
      * @param documentVerify 实体对象
      * @return
      */
-    @RequestMapping(value="/documentVerify/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/documentVerify/{id}",method= RequestMethod.PUT)
     public ResponseBean documentVerifyUpdate(@PathVariable Integer id,
-                                        @RequestBody TaDocumentVerify documentVerify){
+                                             @RequestBody TaDocumentVerify documentVerify){
         ResponseBean responseBean = new ResponseBean();
         try {
+            documentVerify.setDocumentVerifyId(id);
             if (iTaDocumentVerifyService.updateById(documentVerify)){
+
+                if (null != documentVerify.getVerifyStatus() && documentVerify.getVerifyStatus().intValue() == 1) {
+                    // 活动核销加积分
+                    TaDocumentVerify verify = iTaDocumentVerifyService.getById(documentVerify.getDocumentVerifyId());
+
+                    // 资料审核加积分
+                    applicationContext.publishEvent(new EventBus(verify, EventBus.EventType.DocumentVerify,verify.getOrgId()));
+
+                }
+
                 responseBean.addSuccess(documentVerify);
             }else {
                 responseBean.addError("fail");
@@ -132,7 +231,13 @@ public class TaDocumentVerifyController extends BaseController {
     public ResponseBean documentVerifyGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaDocumentVerifyService.getById(id));
+            TaDocumentVerify documentVerify = iTaDocumentVerifyService.getById(id);
+            QueryWrapper<TaDocumentImg>imgList = new QueryWrapper<>();
+            imgList.eq("document_verify_id",documentVerify.getDocumentVerifyId());
+            imgList.orderByAsc("sort");
+            List<TaDocumentImg>list = documentImgService.list(imgList);
+            documentVerify.setImgList(list);
+            responseBean.addSuccess(documentVerify);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("documentVerifyDelete -=- {}",e.toString());

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

@@ -287,12 +287,12 @@ public class TaShareRecordController extends BaseController {
     }
     /**
      * 微信端分页获取团长记录
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @return
      */
     @RequestMapping(value="/wx/taShareRecord",method= RequestMethod.GET)
-    public ResponseBean wxShareRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean wxShareRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNumber,
                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                  HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -304,7 +304,7 @@ public class TaShareRecordController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
         try {
-            responseBean = iTaShareRecordService.getShareRecordList(pageNum, pageSize, orgId, person);
+            responseBean = iTaShareRecordService.getShareRecordList(pageNumber, pageSize, orgId, person);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareRecordList -=- {}",e.toString());

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

@@ -1,6 +1,8 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -27,7 +29,8 @@ public class HelpRecord implements Serializable {
     /**
      * ID
      */
-    private String helpRecordId;
+    @TableId(value = "help_record_id", type = IdType.AUTO)
+    private Integer helpRecordId;
 
     /**
      * 创建时间

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

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,6 +29,7 @@ public class TaDocumentImg implements Serializable {
     /**
      * 编号
      */
+    @TableId(value = "document_img_id", type = IdType.AUTO)
     private Integer documentImgId;
 
     /**

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -9,6 +10,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -55,12 +57,23 @@ public class TaDocumentVerify implements Serializable {
     /**
      * 状态
      */
-    private String status;
+    private Integer status;
 
     /**
      * 审核状态 0未审核  1审核通过  2审核不通过
      */
     private Integer verifyStatus;
 
+    @TableField(exist = false)
+    private List<TaDocumentImg> imgList;
+
+    @TableField(exist = false)
+    private String name;
+
+    @TableField(exist = false)
+    private String tel;
+
+
+
 
 }

src/main/java/com/huiju/estateagents/event/EventBus.java

@@ -33,7 +33,13 @@ public class EventBus extends ApplicationEvent {
 		SignUpAgent(4),
 
 		// 没有限制的 分享海报加积分
-		SharePosterAll(5);
+		SharePosterAll(5),
+
+		// 活动核销签到
+		ActivityVerificationSign(6),
+
+		// 资料审核成功
+		DocumentVerify(6);
 
 		private Integer type;
 

src/main/java/com/huiju/estateagents/event/EventLisenter.java

@@ -1,9 +1,6 @@
 package com.huiju.estateagents.event;
 
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonSign;
-import com.huiju.estateagents.entity.TaRecommendCustomer;
-import com.huiju.estateagents.entity.TaShare;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.ITaPointsRecordsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +41,15 @@ public class EventLisenter {
 			case SharePosterAll:
 				getSharePointsAll((String) event.getSource(), event.getOrgId());
 				break;
+
+			// 活动核销签到
+			case ActivityVerificationSign:
+				getActivityVerificationSign((HelpInitiateRecord) event.getSource(), event.getOrgId());
+				break;
+			// 资料审核成功
+			case DocumentVerify:
+				getDocumentVerify((TaDocumentVerify) event.getSource(), event.getOrgId());
+				break;
 			default:
 				break;
 		}
@@ -67,4 +73,18 @@ public class EventLisenter {
 
 	// 推荐客户送积分
 	private void getRecommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId) { taPointsRecordsService.recommendCustPoints(taRecommendCustomer, orgId); }
+
+	/**
+	 * 活动核销成功送积分
+	 */
+	private void getActivityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId) {
+		taPointsRecordsService.activityVerificationSign(helpInitiateRecord, orgId);
+	}
+
+	/**
+	 * 资料审核成功送积分
+	 */
+	private void getDocumentVerify(TaDocumentVerify taDocumentVerify, Integer orgId) {
+		taPointsRecordsService.documentVerify(taDocumentVerify, orgId);
+	}
 }

src/main/java/com/huiju/estateagents/mapper/TaDocumentVerifyMapper.java

@@ -1,8 +1,10 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaDocumentVerify;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaDocumentVerifyMapper extends BaseMapper<TaDocumentVerify> {
 
+    IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("name") String name, @Param("tel") String tel,@Param("orgId")Integer orgId);
+
 }

src/main/java/com/huiju/estateagents/service/ITaDocumentVerifyService.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaDocumentVerify;
 
@@ -13,4 +14,6 @@ import com.huiju.estateagents.entity.TaDocumentVerify;
  */
 public interface ITaDocumentVerifyService extends IService<TaDocumentVerify> {
 
+    IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String name,String tel,Integer orgId);
+
 }

src/main/java/com/huiju/estateagents/service/ITaPointsRecordsService.java

@@ -14,12 +14,16 @@ import com.huiju.estateagents.entity.*;
  */
 public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 
+	// 分享赚积分
 	void sharePoints(TaShare taShare, Integer orgId);
 
+	// 签到赚积分
 	void checkinPoints(TaPersonSign taPersonSign, Integer orgId);
 
+	// 注册送积分
 	void signUpPoints(TaPerson taPerson, Integer orgId);
 
+	// 推荐客户送积分
 	void recommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId);
 
 	void consumeGoodsPoints(TaGoods taGoods, Integer orgId);
@@ -31,4 +35,18 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 	 * @param recommenderId
 	 */
     void sharePosterAll(String recommenderId, Integer orgId);
+
+	/**
+	 * 资料审核送积分
+	 * @param taDocumentVerify
+	 * @param orgId
+	 */
+	void documentVerify(TaDocumentVerify taDocumentVerify, Integer orgId);
+
+	/**
+	 * 活动核销送积分
+	 * @param helpInitiateRecord
+	 * @param orgId
+	 */
+	void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId);
 }

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

@@ -9,6 +9,7 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import com.huiju.estateagents.excel.HelpRecordExport;
@@ -18,6 +19,7 @@ import com.huiju.estateagents.mapper.HelpRecordMapper;
 import com.huiju.estateagents.service.IHelpActivityService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
 import javax.xml.crypto.Data;
@@ -45,6 +47,9 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     @Autowired
     HelpRecordMapper helpRecordMapper;
 
+    @Autowired
+    ApplicationContext applicationContext;
+
     @Override
     public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId) {
         ResponseBean responseBean = new ResponseBean<>();
@@ -142,6 +147,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
         if (verifyCode.equals(Integer.valueOf(helpInitiateRecord.getVerification()))){
             helpInitiateRecord.setVerificationStatus(1);
             helpInitiateRecordMapper.updateById(helpInitiateRecord);
+
+            // 活动核销加积分
+            applicationContext.publishEvent(new EventBus(helpInitiateRecord, EventBus.EventType.ActivityVerificationSign,helpInitiateRecord.getOrgId()));
+
             responseBean.addSuccess("成功");
         }else {
             responseBean.addError("核销码错误,请重新输入");

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

@@ -13,11 +13,15 @@ import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
 import com.huiju.estateagents.service.IHelpRecordService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -28,6 +32,7 @@ import java.util.List;
  * @since 2019-10-17
  */
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRecord> implements IHelpRecordService {
 	
 	@Autowired
@@ -57,7 +62,7 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
 		//是否助力成功
-		if (helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
+		if (null != helpActivity.getEnlistNum() && helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
 			return ResponseBean.error("已经助力成功", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
@@ -69,8 +74,8 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		QueryWrapper<HelpRecord> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("org_id",orgId);
 		queryWrapper.eq("help_activity_id",helpRecord.getHelpActivityId());
-		queryWrapper.eq("persion_id",person.getPersonId());
-		if (null != helpNum && helpNum >= 0){
+		queryWrapper.eq("person_id",person.getPersonId());
+		if (null != helpNum && helpNum > 0){
 			//查看这个人是否助力过，和助力了几次
 			List<HelpRecord> helpRecords = helpRecordMapper.selectList(queryWrapper);
 			if (helpRecords.size() >= helpNum){
@@ -84,6 +89,9 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 			return ResponseBean.error("您已经助力过了,无需重复助力", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		//反更新在入库
+		if (null == helpActivity.getEnlistNum()){
+			helpActivity.setEnlistNum(0);
+		}
 		helpActivity.setEnlistNum(helpActivity.getEnlistNum()+1);
 		helpActivityMapper.updateById(helpActivity);
 		//插入数据
@@ -99,9 +107,15 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 			helpInitiateRecord.setSucceedDate(LocalDateTime.now());
 			helpInitiateRecord.setStatus(0);
 		}
+		if (null == helpInitiateRecord.getEnlistNum()){
+			helpInitiateRecord.setEnlistNum(0);
+		}
 		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
 		helpInitiateRecordMapper.updateById(helpInitiateRecord);
-		return ResponseBean.success(helpInitiateRecord);
+		Map<String,Object> map = new HashMap<>();
+		map.put("helpRecord",helpRecord);
+		map.put("helpInitiateRecord",helpInitiateRecord);
+		return ResponseBean.success(map);
 	}
 
 }

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

@@ -1,11 +1,21 @@
 package com.huiju.estateagents.service.impl;
 
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaDocumentImg;
 import com.huiju.estateagents.entity.TaDocumentVerify;
+import com.huiju.estateagents.mapper.TaDocumentImgMapper;
 import com.huiju.estateagents.mapper.TaDocumentVerifyMapper;
 import com.huiju.estateagents.service.ITaDocumentVerifyService;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 资料审核  服务实现类
@@ -17,4 +27,37 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaDocumentVerifyServiceImpl extends ServiceImpl<TaDocumentVerifyMapper, TaDocumentVerify> implements ITaDocumentVerifyService {
 
+    @Autowired
+    TaDocumentVerifyMapper documentVerifyMapper;
+    @Autowired
+    TaDocumentImgMapper taDocumentImgMapper;
+
+    @Override
+    public IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum, Integer pageSize, String name, String tel,Integer orgId){
+        IPage<TaDocumentVerify>page = new Page<>(pageNum,pageSize);
+        IPage<TaDocumentVerify> data = documentVerifyMapper.getDocumentVerifyList(page,name,tel,orgId);
+        List<Integer> idList = new ArrayList<>();
+        for (int i = 0; i<data.getRecords().size();i++){
+            idList.add(data.getRecords().get(i).getDocumentVerifyId());
+        }
+
+        if (CollectionUtils.isNotEmpty(idList)) {
+            QueryWrapper<TaDocumentImg>imgQueryWrapper = new QueryWrapper<>();
+            imgQueryWrapper.in("document_verify_id",idList);
+            imgQueryWrapper.eq("org_id",orgId);
+            List<TaDocumentImg>allImgList = taDocumentImgMapper.selectList(imgQueryWrapper);
+            for (int i = 0;i<data.getRecords().size();i++){
+                List<TaDocumentImg>imgList = new ArrayList<>();
+                for(int j = 0; j<allImgList.size();j++){
+                    if(data.getRecords().get(i).getDocumentVerifyId().equals(allImgList.get(j).getDocumentVerifyId())){
+                        imgList.add(allImgList.get(j));
+                    }
+                }
+                data.getRecords().get(i).setImgList(imgList);
+            }
+        }
+
+        return data;
+    }
+
 }

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

@@ -313,4 +313,61 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 	}
 
 
+	@Override
+	public void documentVerify(TaDocumentVerify taDocumentVerify, Integer orgId) {
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_DOCUMENT_VERIFY);
+		if (pointsAmount == 0) {
+			return;
+		}
+
+		//
+		String changeType = CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY;
+
+		// 已经领取过的不会再次领取
+		String[] params = {
+				"shareId="+String.valueOf(taDocumentVerify.getDocumentVerifyId()),
+				"openUser="+taDocumentVerify.getPersonId()
+		};
+		String changeParams = String.join("&", params);
+		boolean hasJoined = isPointsRecordsExist(taDocumentVerify.getPersonId(), changeType, changeParams);
+		if (hasJoined) {
+			return;
+		}
+
+		// 发放积分
+		TaPerson person = taPersonMapper.selectById(taDocumentVerify.getPersonId());
+		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
+			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
+		}
+	}
+
+	@Override
+	public void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId) {
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_ACTIVITY_VERIFICATION);
+		if (pointsAmount == 0) {
+			return;
+		}
+
+		//
+		String changeType = CommConstant.POINTS_CHANGE_ACTIVITY_VERIFICATION;
+
+		// 已经领取过的不会再次领取
+		String[] params = {
+				"shareId="+String.valueOf(helpInitiateRecord.getHelpRecordInitiateId()),
+				"openUser="+helpInitiateRecord.getPersonId()
+		};
+		String changeParams = String.join("&", params);
+		boolean hasJoined = isPointsRecordsExist(helpInitiateRecord.getPersonId(), changeType, changeParams);
+		if (hasJoined) {
+			return;
+		}
+
+		// 发放积分
+		TaPerson person = taPersonMapper.selectById(helpInitiateRecord.getPersonId());
+		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
+			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
+		}
+	}
 }

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -87,6 +87,6 @@
         LEFT JOIN ta_help_activity a ON t.help_activity_id = a.help_activity_id
     WHERE
         t.org_id = #{orgId}
-        AND t.persion_id = #{personId}
+        AND t.person_id = #{personId}
     </select>
 </mapper>

src/main/resources/mapper/TaDocumentVerifyMapper.xml

@@ -1,5 +1,23 @@
 <?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.huiju.estateagents.mapper.TaDocumentVerifyMapper">
+    <select id="getDocumentVerifyList" resultType="com.huiju.estateagents.entity.TaDocumentVerify">
+    SELECT
+	a.* ,
+	IFNULL(b.name,b.nickname) as name,
+    IFNULL(b.tel,b.phone) as tel
+    FROM
+	ta_document_verify a
+	LEFT JOIN ta_person b ON a.person_id = b.person_id
+	where a.status = 1
+	and a.org_id = #{orgId}
+	    <if test="name != '' and name !=null">
+            and IFNULL(b.name,b.nickname) like CONCAT('%',#{name}, '%')
+         </if>
+        <if test="tel != '' and tel !=null">
+            and IFNULL(b.tel,b.phone) = #{tel}
+        </if>
+        order by a.create_date desc
+    </select>
 
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -18,6 +18,7 @@
         WHERE
             t.person_type = #{personType}
         AND t.status = #{status}
+        and u.status != 9
         and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and p.building_id = #{buildingId}