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

# Conflicts:
#	src/main/java/com/huiju/estateagents/controller/HelpInitiateRecordController.java

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

@@ -99,8 +99,8 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query", value = "城市"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query", value = "项目"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query", value = "标题"),
-            @ApiImplicitParam(dataTypeClass = Data.class, name = "startDate", paramType = "query", value = "活动开始时间"),
-            @ApiImplicitParam(dataTypeClass = Data.class, name = "endDate", paramType = "query", value = "活动结束时间"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "startDate", paramType = "query", value = "活动开始时间"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "endDate", paramType = "query", value = "活动结束时间"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "activityStatus", paramType = "query", value = "活动状态")
     })
     @RequestMapping(value = "admin/helpActivity/list", method = RequestMethod.GET)
@@ -109,8 +109,8 @@ public class HelpActivityController extends BaseController {
                                          @RequestParam(value = "cityId", required = false) Integer cityId,
                                          @RequestParam(value = "buildingId", required = false) String buildingId,
                                          @RequestParam(value = "title", required = false) String title,
-                                         @RequestParam(value = "startDate", required = false) Data startDate,
-                                         @RequestParam(value = "endDate", required = false) Data endDate,
+                                         @RequestParam(value = "startDate", required = false) String startDate,
+                                         @RequestParam(value = "endDate", required = false) String endDate,
                                          @RequestParam(value = "activityStatus", required = false) Integer activityStatus,
                                          HttpServletRequest request) {
         Integer orgId = getOrgId(request);

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

@@ -171,7 +171,7 @@ public class HelpInitiateRecordController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
-            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
         try {
@@ -198,10 +198,11 @@ public class HelpInitiateRecordController extends BaseController {
         Integer orgId = getOrgId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
-            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
         try {
+ 
             //查看是否发起过助力
             QueryWrapper<HelpInitiateRecord> helpInitiateRecordQueryWrapper = new QueryWrapper<>();
             helpInitiateRecordQueryWrapper.eq("help_activity_id",helpInitiateRecord.getHelpActivityId());
@@ -212,7 +213,9 @@ public class HelpInitiateRecordController extends BaseController {
                 responseBean.addSuccess(helpInitiateRecord);
                 return responseBean;
             }
-            helpInitiateRecord.setPersionId(person.getPersonId());
+ 
+            helpInitiateRecord.setPersonId(person.getPersonId());
+ 
             helpInitiateRecord.setCreateDate(LocalDateTime.now());
             helpInitiateRecord.setOrgId(orgId);
             helpInitiateRecord.setStatus(1);

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

@@ -200,11 +200,12 @@ public class TaShareRecordController extends BaseController {
         return responseBean;
     }
 
-    @RequestMapping(value="/admin/taShareRecord/verificate/{activityId}",method= RequestMethod.PUT)
-    public ResponseBean taShareVerificateRecord(@PathVariable Integer activityId, @RequestParam("verificateCode") String verificateCode){
+    @RequestMapping(value="/admin/taShareRecord/verificate",method= RequestMethod.PUT)
+    public ResponseBean taShareVerificateRecord(@RequestParam(value = "groupActivityId", required = false) Integer groupActivityId,
+                                                @RequestParam(value = "verifyCode", required = false) String verificateCode){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareRecordService.verifyCode(activityId, verificateCode);
+            responseBean = iTaShareRecordService.verifyCode(groupActivityId, verificateCode);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareVerificateRecord -=- {}",e.toString());
@@ -336,4 +337,5 @@ public class TaShareRecordController extends BaseController {
         }
         return responseBean;
     }
+
 }

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

@@ -56,7 +56,7 @@ public class HelpInitiateRecord implements Serializable {
     /**
      * 人员Id 人员自己
      */
-    private String persionId;
+    private String personId;
 
     /**
      * 人员姓名

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

@@ -30,5 +30,5 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @param orgId
      * @return
      */
-    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")Data startDate, @Param("endDate") Data endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId);
+    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")String startDate, @Param("endDate") String endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId);
 }

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

@@ -32,7 +32,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, Data startDate, Data endDate, Integer activityStatus, Integer orgId);
+    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId);
 
     /**
      * 活动助力添加

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

@@ -29,7 +29,6 @@ public interface ITaShareRecordService extends IService<TaShareRecord> {
     Integer getShareRecord(Integer recordId, Integer status);
     List<ShareRecordSuccessExport>  getShareRecordSuccessExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
     List<ShareRecordFailExport>  getShareRecordFailExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
-
 	/**
 	 * 分页获取微信端发起拼团记录
 	 * @param pageNum

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

@@ -45,7 +45,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     HelpRecordMapper helpRecordMapper;
 
     @Override
-    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, Data startDate, Data endDate, Integer activityStatus, Integer orgId) {
+    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<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
         IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, activityStatus, orgId);
@@ -127,6 +127,11 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     public ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, Integer verifyCode) {
         ResponseBean responseBean = new ResponseBean<>();
         HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecordInitiateId);
+        if (null ==verifyCode || "".equals(verifyCode)){
+            responseBean.addError("请输入核销码");
+            return responseBean;
+        }
+
         // 判断是否已核销
         if ("1".equals(helpInitiateRecord.getVerificationStatus())){
             responseBean.addSuccess("已核销");
@@ -138,7 +143,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
             helpInitiateRecordMapper.updateById(helpInitiateRecord);
             responseBean.addSuccess("成功");
         }else {
-            responseBean.addError("核销码错误");
+            responseBean.addError("核销码错误,请重新输入");
         }
         return responseBean;
     }

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

@@ -14,6 +14,7 @@ import com.huiju.estateagents.excel.ShareRecordFailExport;
 import com.huiju.estateagents.excel.ShareRecordSuccessExport;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
+import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
 import com.huiju.estateagents.po.TaShareRecordPO;
 import com.huiju.estateagents.service.ITaShareRecordService;
@@ -40,6 +41,8 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
     private TaShareActivityMapper activityMapper;
     @Autowired
     private TaShareRecordMapper taShareRecordMapper;
+    @Autowired
+    private TaShareChildRecordMapper taShareChildRecordMapper;
 
     @Override
     public IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId) {
@@ -91,15 +94,34 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         ResponseBean responseBean = new ResponseBean();
         QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("verification_code", verifyCode);
+        queryWrapper.eq("group_activity_id", activityId);
         TaShareRecord taShareRecord = taShareRecordMapper.selectOne(queryWrapper);
-        if (taShareRecord == null){
+
+        QueryWrapper<TaShareChildRecord> wrapper = new QueryWrapper<>();
+        wrapper.eq("verification_code", verifyCode);
+        wrapper.eq("group_activity_id", activityId);
+        TaShareChildRecord taShareChildRecord = taShareChildRecordMapper.selectOne(wrapper);
+
+        if (taShareRecord == null && taShareChildRecord == null){
             responseBean.addError("请输入正确的核销码");
             return responseBean;
         }
-        taShareRecord.setGroupActivityId(activityId);
-        taShareRecord.setVerificationStatus(1);
-        taShareRecordMapper.updateById(taShareRecord);
-        responseBean.addSuccess("核销成功");
+
+        if (taShareRecord != null){
+            taShareRecord.setGroupActivityId(activityId);
+            taShareRecord.setVerificationStatus(1);
+            taShareRecordMapper.updateById(taShareRecord);
+            responseBean.addSuccess("核销成功");
+        }
+
+        if (taShareChildRecord != null){
+            taShareChildRecord.setGroupActivityId(activityId);
+            taShareChildRecord.setVerificationStatus(1);
+            taShareChildRecordMapper.updateById(taShareChildRecord);
+            responseBean.addSuccess("核销成功");
+        }
+
+
         return responseBean;
     }
 

src/main/resources/mapper/HelpActivityMapper.xml

@@ -13,7 +13,11 @@
         <if test="title != null and title != ''">
             and title = #{title}
         </if>
-        <if test="startDate != null and endDate != null">
+        <if test="startDate != null and startDate != ''and startDate!='Invalid date'">
+         and date_format(start_date,'%Y-%m-%d') = date_format( #{startDate}, '%Y-%m-%d' )
+        </if>
+        <if test="endDate != null and endDate != ''and endDate!='Invalid date'">
+            and date_format(end_date,'%Y-%m-%d') = date_format( #{endDate}, '%Y-%m-%d' )
         </if>
         <if test="activityStatus != null and activityStatus != null">
             and activity_status = #{activityStatus}