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

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.4.2</version>
+	<version>v3.4.4</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

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

@@ -14,17 +14,8 @@ import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaMiniapp;
-import com.huiju.estateagents.entity.TaMiniappTemplate;
-import com.huiju.estateagents.entity.TaOrg;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonBuilding;
-import com.huiju.estateagents.mapper.TaMiniappMapper;
-import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
-import com.huiju.estateagents.mapper.TaOrgMapper;
-import com.huiju.estateagents.mapper.TaPersonBuildingMapper;
-import com.huiju.estateagents.mapper.TaPersonMapper;
-import org.checkerframework.checker.units.qual.A;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -66,6 +57,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	
 	@Autowired
 	private TaUserRoleMapper taUserRoleMapper;
+
+	@Autowired
+	private TdPointsRulesMapper tdPointsRulesMapper;
 	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
@@ -103,6 +97,18 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			throw new Exception("生成用户公司信息失败");
 		}
 
+		// 插入积分, 默认全部 1 积分
+		List<TdPointsRules> pointsRules = tdPointsRulesMapper.getTPLRules();
+		if (pointsRules != null) {
+			for (int i = 0; i < pointsRules.size(); i ++) {
+				TdPointsRules rule = pointsRules.get(i);
+				rule.setOrgId(taOrg.getOrgId());
+				rule.setStatus(CommConstant.STATUS_NORMAL);
+				rule.setPointsAmount(1);	// 默认1积分
+				tdPointsRulesMapper.insert(rule);
+			}
+		}
+
 		taUser.setOrgId(taOrg.getOrgId());
 		taUser.setIsAdmin(true);
 		taUser.setLoginPassword(MD5Utils.md5(taUser.getLoginPassword()));

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

@@ -6,6 +6,7 @@ import com.huiju.estateagents.common.AliOSSUtils;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.SMSUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.service.ITdMiniappTemplateTypeService;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -23,6 +24,9 @@ public class CommonController {
     @Autowired
     SMSUtils smsUtils;
 
+    @Autowired
+    ITdMiniappTemplateTypeService iTdMiniappTemplateTypeService;
+
     /**
      * 图片上传
      * @param multipartFile
@@ -74,6 +78,11 @@ public class CommonController {
         }
     }
 
+    @GetMapping("/center/dict/templateType")
+    public ResponseBean getAllTplTypes() {
+        return ResponseBean.success(iTdMiniappTemplateTypeService.getAllTypes());
+    }
+
     @GetMapping("/wx/awesome/dict/{typeFor}")
     public ResponseBean dicts(@PathVariable String typeFor) {
 

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

@@ -197,7 +197,6 @@ public class MiniAppController extends BaseController {
                     taSharePersonFrom.setIsFirstTime(true);
                 }
                 taSharePersonFromService.save(taSharePersonFrom);
-
             }
 
             taPerson.setPassword(null);

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

@@ -134,7 +134,7 @@ public class TaPersonController extends BaseController {
             taPersonService.updateById(person);
             responseBean.addSuccess(person);
         }else {
-            responseBean.addError("手机号不存在。");
+            responseBean.addError("该置业顾问不存在。");
         }
         return responseBean;
     }

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

@@ -0,0 +1,27 @@
+package com.huiju.estateagents.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdMiniappTemplateType  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId(value = "code", type = IdType.INPUT)
+    private String code;
+
+    private String name;
+    private String remark;
+    private LocalDateTime createDate;
+}

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

@@ -0,0 +1,9 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TdMiniappTemplateType;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TdMiniappTemplateTypeMapper extends BaseMapper<TdMiniappTemplateType> {
+}

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TdPointsRules;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 积分获取规则字典表  Mapper 接口
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TdPointsRulesMapper extends BaseMapper<TdPointsRules> {
 
+    List<TdPointsRules> getTPLRules();
 }

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

@@ -0,0 +1,10 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TdMiniappTemplateType;
+
+import java.util.List;
+
+public interface ITdMiniappTemplateTypeService extends IService<TdMiniappTemplateType> {
+    public List<TdMiniappTemplateType> getAllTypes();
+}

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

@@ -87,8 +87,22 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         Page<TaBuilding> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        List<TaBuilding> building = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
-        page.setRecords(building);
+
+        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
+
+        if (null != buildings) {
+            for(TaBuilding taBuilding: buildings) {
+                //查询当前图片
+                QueryWrapper<TaBuildingImg> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("building_id", taBuilding.getBuildingId());
+                queryWrapper.eq("img_type", "banner");
+                queryWrapper.orderByAsc("create_date");
+                List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(queryWrapper);
+                taBuilding.setBuildingImg(buildingImg);
+            }
+        }
+
+        page.setRecords(buildings);
 
         return ResponseBean.success(page);
     }

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

@@ -0,0 +1,20 @@
+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.TdMiniappTemplateType;
+import com.huiju.estateagents.mapper.TdMiniappTemplateTypeMapper;
+import com.huiju.estateagents.service.ITdMiniappTemplateTypeService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TdMiniappTemplateTypeServiceImpl extends ServiceImpl<TdMiniappTemplateTypeMapper, TdMiniappTemplateType> implements ITdMiniappTemplateTypeService {
+    @Override
+    public List<TdMiniappTemplateType> getAllTypes() {
+        QueryWrapper<TdMiniappTemplateType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByAsc("create_date");
+        return this.list(queryWrapper);
+    }
+}

src/main/resources/mapper/TdMiniappTemplateTypeMapper.xml

@@ -0,0 +1,5 @@
+<?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.TdMiniappTemplateTypeMapper">
+
+</mapper>

src/main/resources/mapper/TdPointsRulesMapper.xml

@@ -1,5 +1,7 @@
 <?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.TdPointsRulesMapper">
-
+    <select id="getTPLRules" resultType="com.huiju.estateagents.entity.TdPointsRules">
+        select * from td_points_rules where org_id = -1
+    </select>
 </mapper>