feats

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

@@ -588,7 +588,8 @@ public class TaBuildingDynamicController extends BaseController {
         if (dynamic.getType().equals("look")) {
             LambdaQueryWrapper<TaBuildingDynamic> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(TaBuildingDynamic::getStatus,1);
-            lambdaQueryWrapper.eq(TaBuildingDynamic::getBuildingId,dynamic.getBuildingId());
+            lambdaQueryWrapper.eq(TaBuildingDynamic::getType,"look");
+            lambdaQueryWrapper.eq(TaBuildingDynamic::getBuilding,dynamic.getBuildingId());
             List<TaBuildingDynamic> list = iBuildingDynamicService.list(lambdaQueryWrapper);
             if (list.size() > 0){
                 responseBean.addError("相同的项目看房团只能发布一个");

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

@@ -60,9 +60,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 +72,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 +84,18 @@ 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){
+        return iBrandService.getWxBrandList(cityId,brandName,getOrgId(request));
+    }
+
     /**
      * 保存对象
      * @param brandDTO 实体对象

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

@@ -1,8 +1,10 @@
 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;
 
 /**
  * <p>
@@ -15,4 +17,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BrandMapper extends BaseMapper<Brand> {
 
+    /**
+     * 获取品牌开发商列表
+     * @param cityId
+     * @param brandName
+     * @return
+     */
+    ResponseBean getWxBrandList(Integer cityId, String brandName,Integer orgId);
 }

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

@@ -1,5 +1,6 @@
 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;
 
@@ -13,4 +14,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBrandService extends IService<Brand> {
 
+    /**
+     * 获取微信端的品牌开发商
+     * @param cityId
+     * @param brandName
+     * @return
+     */
+    ResponseBean getWxBrandList(Integer cityId, String brandName, Integer orgId);
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -17,4 +18,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class BrandServiceImpl extends ServiceImpl<BrandMapper, Brand> implements IBrandService {
 
+    /**
+     * 获取微信端的品牌开发商
+     *
+     * @param cityId
+     * @param brandName
+     * @return
+     */
+    @Override
+    public ResponseBean getWxBrandList(Integer cityId, String brandName,Integer orgId) {
+        return this.baseMapper.getWxBrandList(cityId, brandName,orgId);
+    }
 }

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.base.ResponseBean">
+        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 cityId != ''">
+                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>