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

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

@@ -200,6 +200,8 @@ public class HelpActivityController extends BaseController {
     public ResponseBean helpActivityUpdate(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
+        Integer cityId = iTaBuildingService.getCityById( helpActivity.getBuildingId());
+        helpActivity.setCityId(cityId);
         helpActivity.setHelpActivityId(helpActivity.getHelpActivityId());
         taHelpActivityService.helpActivityUpdate(helpActivity);
         return responseBean;

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

@@ -114,6 +114,7 @@ public class MiniAppController extends BaseController {
             miniResp.put("openid", session.getOpenid());
             miniResp.put("sessionKey", session.getSessionKey());
             miniResp.put("unionid", session.getUnionid());
+            miniResp.put("name",miniapp.getName());
 
             //如果是分享进来且没有进入过小程序，给分享人发放积分
             QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
@@ -247,7 +248,7 @@ public class MiniAppController extends BaseController {
     public ResponseBean info(@RequestBody String paramStr, HttpServletRequest request) {
         String appid = request.getHeader("appid");
         TaPerson person = null;
-
+        TaMiniapp miniapp = taMiniappService.getById(appid);
         if (null == paramStr || "".equals(paramStr.trim()) || "{}".equals(paramStr.trim())) {
             String openid = getOpenId(request);
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -291,6 +292,7 @@ public class MiniAppController extends BaseController {
         Map<String, Object> result = new HashMap<>();
         result.put("person", person);
         result.put("extraInfo", extraInfo);
+        result.put("miniApp",miniapp);
 
         return ResponseBean.success(result);
     }

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

@@ -308,6 +308,7 @@ public class TaBuildingDynamicController extends BaseController {
                enlist.setIsCheckin(CommConstant.STATUS_NORMAL);
                if(taActivityDynamicEnlistMapper.updateById(enlist)>0){
                    if (tempIsCheckin.intValue() == CommConstant.STATUS_UNACCALIMED.intValue()){
+                       enlist.setEnlistId(Integer.valueOf(enlistId));
                        applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
                        Integer rulePoints = taPointsRecordsService.getRulePoints(CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN, getOrgId(request));
                        enlist.setAddPoints(rulePoints);

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

@@ -165,6 +165,7 @@ public class TaPersonController extends BaseController {
             person.setPersonType(CommConstant.PERSON_ESTATE_CHANNEL);
             QueryWrapper<TaChannel> queryWrapper = new QueryWrapper();
             queryWrapper.eq("channel_code",channelCode);
+            queryWrapper.eq("org_id",orgId);
             TaChannel channel = taChannelService.getOne(queryWrapper);
             if (null == channel){
                 return ResponseBean.error("渠道码不存在",ResponseBean.ERROR_UNAVAILABLE);
@@ -557,6 +558,7 @@ public class TaPersonController extends BaseController {
             if(CommConstant.PERSON_ESTATE_CHANNEL.equals(personType)){
                 QueryWrapper<TaChannel>channelQueryWrapper = new QueryWrapper<>();
                 channelQueryWrapper.eq("channel_code",channelCode);
+                channelQueryWrapper.eq("org_id",getOrgId(request));
                 QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
                 List<TaChannel> channel = taChannelService.list(channelQueryWrapper);
                 if(channel.size()>0){

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

@@ -187,6 +187,8 @@ public class TaShareActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
+            Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
+            taShareActivity.setCityId(cityId);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {

src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.job;
 
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.center.sysUser.controller.SysUserController;
+import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,6 +12,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
+
 /**
  * @author admin
  * @Title: JudglActivityTimeJob
@@ -52,7 +55,9 @@ public class JudglActivityTimeJob extends BaseController {
     private void configureTasks() {
 
         //未开始活动更新为已开始
-        Integer count = iTaBuildingDynamicService.updateUnStartActivity();
+        String time = DateUtils.cutSecond(LocalDateTime.now());
+        Integer count = iTaBuildingDynamicService.updateUnStartActivity(time);
+        System.out.println("count" + count);
         logger.debug("JudglActivityTimeJob",count);
         //进行中活动更新为已结束
         iTaBuildingDynamicService.updateProcessingActivity();

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

@@ -75,7 +75,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
     /**
      * 更新未开始的活动
      */
-    Integer updateUnStartActivity();
+    Integer updateUnStartActivity(@Param("curTime") String curTime);
 
     /**
      * 更新结束的活动

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

@@ -90,7 +90,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
     /**
      * 开始未进行的活动
      */
-    Integer updateUnStartActivity();
+    Integer updateUnStartActivity(String time);
 
     /**
      * 结束过期的活动

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

@@ -332,8 +332,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public Integer updateUnStartActivity() {
-        return buildingDynamicMapper.updateUnStartActivity();
+    public Integer updateUnStartActivity(String curTime) {
+        return buildingDynamicMapper.updateUnStartActivity(curTime);
     }
 
     @Override

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

@@ -171,6 +171,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			add("user="+taActivityDynamicEnlist.getPersonId());
+			add("targetId="+taActivityDynamicEnlist.getEnlistId().toString());
 		}};
 		String changeParams = String.join("&", params);
 		boolean hasJoined = isPointsRecordsExist(taActivityDynamicEnlist.getPersonId(), changeType, changeParams);

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -99,7 +99,7 @@
         update ta_building_dynamic
         set activity_status = 0
         where
-        NOW() >= enlist_start and  NOW() <= enlist_end and activity_status = 1
+        #{curTime} >= enlist_start and  #{curTime} <= enlist_end and activity_status = 1
     </update>
 
     <update id="updateProcessingActivity">