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

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -19,10 +19,7 @@ import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
-import com.huiju.estateagents.service.ITaBuildingReportService;
-import com.huiju.estateagents.service.ITaPersonService;
-import com.huiju.estateagents.service.ITaRecommendCustomerService;
-import com.huiju.estateagents.service.ITdReportService;
+import com.huiju.estateagents.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -88,6 +85,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 	@Autowired
     private ITaRecommendCustomerService iTaRecommendCustomerService;
+
+	@Autowired
+	private ISysOrgParamsService iSysOrgParamsService;
 	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
@@ -172,6 +172,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			throw new Exception("生成用户信息失败");
 		}
 
+		// 导入系统参数
+		iSysOrgParamsService.importParamsFromTemplate(taOrg.getOrgId());
+
 		return taUser;
 	}
 

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

@@ -49,6 +49,7 @@ public class TaCustomImgController extends BaseController {
             //使用分页插件
 		    IPage<TaCustomImg> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", getOrgId(request));
             queryWrapper.orderByDesc("create_time");
 
             IPage<TaCustomImg> result = iTaCustomImgService.page(pg, queryWrapper);

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

@@ -13,5 +13,7 @@ import com.huiju.estateagents.entity.SysOrgParams;
  * @since 2019-08-01
  */
 public interface ISysOrgParamsService extends IService<SysOrgParams> {
+    SysOrgParams getParamByCode(String paramCode, Integer orgId);
 
+    boolean importParamsFromTemplate(Integer orgId);
 }

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

@@ -92,7 +92,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         };
 
         if (((Boolean) true).equals(tpl.getIsSubscribe())) {
-            String[] data = new String[] { name, content, DateUtils.cutSecond(dt) };
+            String[] data = new String[] { name, phone, content, DateUtils.cutSecond(dt) };
             ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
             if (res.getCode() != ResponseBean.CODE_SUCCESS) {
                 // 使用短信发送

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

@@ -1,11 +1,16 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.SysOrgParams;
 import com.huiju.estateagents.mapper.SysOrgParamsMapper;
 import com.huiju.estateagents.service.ISysOrgParamsService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 组织参数配置表  服务实现类
@@ -16,5 +21,54 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SysOrgParamsServiceImpl extends ServiceImpl<SysOrgParamsMapper, SysOrgParams> implements ISysOrgParamsService {
+    @Autowired
+    SysOrgParamsMapper sysOrgParamsMapper;
+
+    @Override
+    public SysOrgParams getParamByCode(String paramCode, Integer orgId) {
+        QueryWrapper<SysOrgParams> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq("param_code", paramCode);
+        queryWrapper.last("limit 1");
+
+        return sysOrgParamsMapper.selectOne(queryWrapper);
+    }
+
+    /**
+     * 从模板中导入系统参数, 支持多次导入
+     * 已经导入的不会再次导入
+     * @param orgId
+     * @return
+     */
+    @Override
+    public boolean importParamsFromTemplate(Integer orgId) {
+        // 查询模板列表, org 为 0 代表为模板数据
+        QueryWrapper<SysOrgParams> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", 0);
+
+        List<SysOrgParams> tpls = sysOrgParamsMapper.selectList(queryWrapper);
+        List<SysOrgParams> willSave = new ArrayList<>();
+
+        for(SysOrgParams param: tpls) {
+            QueryWrapper<SysOrgParams> query = new QueryWrapper<>();
+            query.eq("org_id", orgId);
+            query.eq("param_code", param.getParamCode());
+
+            // 使用 count 查询是否该参数已经存在
+            // 如果存在, 则不处理
+            int count = this.count(query);
+
+            if (count == 0) {
+                param.setParamId(null);
+                param.setOrgId(orgId);
+                willSave.add(param);
+            }
+        }
+
+        if (willSave.size() > 0) {
+            return this.saveBatch(willSave);
+        }
 
+        return true;
+    }
 }

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

@@ -290,7 +290,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
-        boolean isMainMoreThanTenFlag = countIsMainBuilding(building);
+        boolean isMainMoreThanTenFlag = countIsMainBuilding(building, orgId);
         if (!isMainMoreThanTenFlag){
             responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
             return responseBean;
@@ -404,7 +404,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
-        boolean isMainMoreThanTenFlag = countIsMainBuilding(building);
+        boolean isMainMoreThanTenFlag = countIsMainBuilding(building, orgId);
         if (!isMainMoreThanTenFlag){
             responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
             return responseBean;
@@ -838,7 +838,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
      * @param taBuilding
      * @return
      */
-    public boolean countIsMainBuilding(TaBuilding taBuilding) {
+    public boolean countIsMainBuilding(TaBuilding taBuilding, Integer orgId) {
         if (taBuilding.getIsMain() != 1){
             return true;
         }
@@ -846,7 +846,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         taBuildingQueryWrapper.eq("city_id", taBuilding.getCityId());
         taBuildingQueryWrapper.eq("is_main", 1);
         taBuildingQueryWrapper.eq("status", 1);
-        taBuildingQueryWrapper.eq("org_id", taBuilding.getOrgId());
+        taBuildingQueryWrapper.eq("org_id", orgId);
         if (taBuilding.getBuildingId() != null){
             taBuildingQueryWrapper.ne("building_id", taBuilding.getBuildingId());
         }

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

@@ -214,7 +214,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         //发送给发起者
         TaPerson taPerson = taPersonMapper.selectById(taShareRecord.getPersonId());
         if (null != taPerson){
-            miniAppService.sendHelpMessage(taPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
+            miniAppService.sendGroupMessage(taPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
         }
         
         //批量发送给助力者
@@ -226,7 +226,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         shareChildRecordList.forEach(e -> {
             TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
             if (null != toTaPerson){
-                miniAppService.sendHelpMessage(toTaPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
+                miniAppService.sendGroupMessage(toTaPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
             }
         });
     }