Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>marketing</artifactId>
-	<version>v1.0.7</version>
+	<version>v1.0.12</version>
 	<name>marketing-cloud</name>
 	<description>新联康营销云</description>
 

src/main/java/com/yunzhi/marketing/controller/TaBuildingDynamicController.java

@@ -588,6 +588,7 @@ public class TaBuildingDynamicController extends BaseController {
         if (dynamic.getType().equals("look")) {
             LambdaQueryWrapper<TaBuildingDynamic> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(TaBuildingDynamic::getStatus,1);
+            lambdaQueryWrapper.eq(TaBuildingDynamic::getType,"look");
             lambdaQueryWrapper.eq(TaBuildingDynamic::getBuilding,dynamic.getBuildingId());
             List<TaBuildingDynamic> list = iBuildingDynamicService.list(lambdaQueryWrapper);
             if (list.size() > 0){

src/main/java/com/yunzhi/marketing/controller/TaPolicyController.java

@@ -85,7 +85,6 @@ public class TaPolicyController extends BaseController {
             queryWrapper.orderByDesc("weight", "create_date");
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.eq("org_id", getOrgId(request));
-            queryWrapper.in("institution_id",getInstitutionIds(request));
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
             List<TaPolicy> records = result.getRecords();

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingServiceImpl.java

@@ -621,13 +621,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             tdCityMapper.updateById(city);
         }
 
+        // 新联康不需要这个逻辑了
         //新建项目以后自动授权给当前用户
-        TaUser taUser = taUserMapper.selectById(userId);
-        TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
-        taPersonBuilding.setBuildingId(building.getBuildingId());
-        taPersonBuilding.setUserId(taUser.getUserId());
-        taPersonBuilding.setCreateDate(LocalDateTime.now());
-        taPersonBuildingMapper.insert(taPersonBuilding);
+//        TaUser taUser = taUserMapper.selectById(userId);
+//        TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+//        taPersonBuilding.setBuildingId(building.getBuildingId());
+//        taPersonBuilding.setUserId(taUser.getUserId());
+//        taPersonBuilding.setCreateDate(LocalDateTime.now());
+//        taPersonBuildingMapper.insert(taPersonBuilding);
 
         // 项目主图
         String imgStr = object.getString("img");

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -1526,7 +1526,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         // 4.校验公客是否已经是分配项目下的私客
         QueryWrapper<TaRecommendCustomer> customerQueryWrapper2 = new QueryWrapper<>();
         customerQueryWrapper2.eq("org_id", orgId);
-        customerQueryWrapper2.eq("person_id", customerInfo.getPersonId());
+//        customerQueryWrapper2.eq("person_id", customerInfo.getPersonId());
+        customerQueryWrapper2.eq("phone", customerInfo.getPhone());
         customerQueryWrapper2.eq("building_id", taPersonBuilding.getBuildingId());
         customerQueryWrapper2.eq("status", CommConstant.CUSTOMER_REPORT);
         customerQueryWrapper2.eq("verify_status", CommConstant.VERIFY_AGREE);
@@ -1539,19 +1540,19 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
 
         // 5.无buildingId，新增一条私客数据
-        TaPerson taPerson = taPersonMapper.getById(customerInfo.getPersonId());
-        if (taPerson == null) {
-            logger.info("公客分配置业顾问 taPerson为空");
-            responseBean.addError("分配客户失败");
-            return responseBean;
-        }
+//        TaPerson taPerson = taPersonMapper.getById(customerInfo.getPersonId());
+//        if (taPerson == null) {
+//            logger.info("公客分配置业顾问 taPerson为空");
+//            responseBean.addError("分配客户失败");
+//            return responseBean;
+//        }
 
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
         taRecommendCustomer.setOrgId(orgId);
-        taRecommendCustomer.setName(taPerson.getNickname());
-        taRecommendCustomer.setPicture(taPerson.getAvatarurl());
-        taRecommendCustomer.setPhone(taPerson.getPhone());
-        taRecommendCustomer.setSex(null == taPerson.getGender() ? null : ("1".equals(taPerson.getGender()) ? 1 : 2));
+        taRecommendCustomer.setName(customerInfo.getName());
+        taRecommendCustomer.setPicture(customerInfo.getAvatarurl());
+        taRecommendCustomer.setPhone(customerInfo.getPhone());
+        taRecommendCustomer.setSex(null == customerInfo.getSex() ? null : ("1".equals(customerInfo.getSex()) ? 1 : 2));
         taRecommendCustomer.setRealtyConsultant(taUser.getUserId());
         taRecommendCustomer.setBuildingId(taPersonBuilding.getBuildingId());
         TaBuilding building = taBuildingMapper.selectById(taPersonBuilding.getBuildingId());
@@ -1559,13 +1560,13 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setReportRecommendStatus(CommConstant.VERIFY_AGREE);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
-        taRecommendCustomer.setPersonId(taPerson.getPersonId());
+        taRecommendCustomer.setPersonId(customerInfo.getPersonId());
         taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
         taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
-        taRecommendCustomer.setPersonId(taPerson.getPersonId());
-        taRecommendCustomer.setRecommendPerson(taPerson.getRecommendPerson());
-
+        taRecommendCustomer.setPersonId(customerInfo.getPersonId());
+        taRecommendCustomer.setRecommendPerson(customerInfo.getRecommendPerson());
+        taRecommendCustomer.setInstitutionId(customerInfo.getInstitutionId());
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
         if (row < 1) {
             responseBean.addError("分配客户失败");

src/main/java/com/yunzhi/marketing/xlk/controller/BrandController.java

@@ -29,7 +29,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -60,9 +62,8 @@ public class BrandController extends BaseController {
      * @return
      */
     @ApiOperation(value = "admin-品牌开发商表列表", notes = "admin-品牌开发商表列表")
-    @RequestMapping(value="/{plat}/brand",method= RequestMethod.GET)
-    public ResponseBean brandList(@PathVariable String plat,
-                                  @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    @RequestMapping(value="/admin/brand",method= RequestMethod.GET)
+    public ResponseBean brandList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                   @RequestParam(value ="brandName",required = false) String brandName,
                                   @RequestHeader("authorization") String token,HttpServletRequest request){
@@ -73,7 +74,7 @@ public class BrandController extends BaseController {
             LambdaQueryWrapper<Brand> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(Brand::getOrgId,getOrgId(request));
             queryWrapper.like(!StringUtils.isEmpty(brandName),Brand::getBrandName,brandName);
-            queryWrapper.orderByDesc(Brand::getCreatedTime);
+            queryWrapper.orderByAsc(Brand::getIndexLetter);
 
             IPage<Brand> result = iBrandService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -85,6 +86,23 @@ public class BrandController extends BaseController {
         return responseBean;
     }
 
+    /**
+     *
+     * @return
+     */
+    @ApiOperation(value = "wx-品牌开发商表列表", notes = "wx-品牌开发商表列表")
+    @RequestMapping(value="/wx/brand",method= RequestMethod.GET)
+    public ResponseBean wxBrandList(@RequestParam(value ="brandName",required = false) String brandName,
+                                  @RequestParam(value ="cityId",required = false) Integer cityId,
+                                  @RequestHeader("authorization") String token,HttpServletRequest request){
+        List<Brand> brandList = iBrandService.getWxBrandList(cityId, brandName, getOrgId(request));
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("records", brandList);
+
+        return ResponseBean.success(result);
+    }
+
     /**
      * 保存对象
      * @param brandDTO 实体对象

src/main/java/com/yunzhi/marketing/xlk/mapper/BrandMapper.java

@@ -1,8 +1,12 @@
 package com.yunzhi.marketing.xlk.mapper;
 
+import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.entity.Brand;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +19,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BrandMapper extends BaseMapper<Brand> {
 
+    /**
+     * 获取品牌开发商列表
+     * @param cityId
+     * @param brandName
+     * @return
+     */
+    List<Brand> getWxBrandList(Integer cityId, String brandName, Integer orgId);
 }

src/main/java/com/yunzhi/marketing/xlk/service/IBrandService.java

@@ -1,8 +1,11 @@
 package com.yunzhi.marketing.xlk.service;
 
+import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.entity.Brand;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 品牌开发商表  服务类
@@ -13,4 +16,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBrandService extends IService<Brand> {
 
+    /**
+     * 获取微信端的品牌开发商
+     * @param cityId
+     * @param brandName
+     * @return
+     */
+    List<Brand> getWxBrandList(Integer cityId, String brandName, Integer orgId);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/BrandServiceImpl.java

@@ -1,11 +1,14 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
+import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.entity.Brand;
 import com.yunzhi.marketing.xlk.mapper.BrandMapper;
 import com.yunzhi.marketing.xlk.service.IBrandService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 品牌开发商表  服务实现类
@@ -17,4 +20,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class BrandServiceImpl extends ServiceImpl<BrandMapper, Brand> implements IBrandService {
 
+    /**
+     * 获取微信端的品牌开发商
+     *
+     * @param cityId
+     * @param brandName
+     * @return
+     */
+    @Override
+    public List<Brand> getWxBrandList(Integer cityId, String brandName,Integer orgId) {
+        return this.baseMapper.getWxBrandList(cityId, brandName, orgId);
+    }
 }

src/main/resources/application.yml

@@ -28,7 +28,7 @@ ali:
   oss:
     endpoint: oss-cn-shanghai.aliyuncs.com
     bucketName: xlk-assets
-    bucketURL: https://xlk-assets.oss-accelerate.aliyuncs.com
+    bucketURL: https://xlk-assets.oss-cn-shanghai.aliyuncs.com
 
 # file path
 file:

src/main/resources/mapper/xlk/BrandMapper.xml

@@ -2,4 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.marketing.xlk.mapper.BrandMapper">
 
+    <select id="getWxBrandList" resultType="com.yunzhi.marketing.xlk.entity.Brand">
+        SELECT
+            b.*
+        FROM
+            xlk_brand b
+            INNER JOIN (
+            SELECT
+                t.building_id,
+                t.brand_id
+            FROM
+                ta_building t
+            WHERE
+                t.org_id = #{orgId}
+            <if test="cityId != null">
+                AND t.city_id = #{cityId}
+            </if>
+            GROUP BY
+                t.brand_id
+            ) c ON b.brand_id = c.brand_id
+        WHERE
+            b.ORG_ID = #{orgId}
+        <if test="brandName != null and brandName != ''">
+            and b.brand_name like CONCAT('%', #{brandName}, '%')
+        </if>
+        ORDER BY b.Index_letter
+    </select>
 </mapper>