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

pom.xml

@@ -162,6 +162,12 @@
 				<profiles.active>dev</profiles.active>
 			</properties>
 		</profile>
+		<profile>
+			<id>test</id>
+			<properties>
+				<profiles.active>test</profiles.active>
+			</properties>
+		</profile>
 		<profile>
 			<id>prod</id>
 			<properties>

src/main/java/com/yunzhi/marketing/common/CommConstant.java

@@ -268,6 +268,11 @@ public class CommConstant {
      * 报备
      * */
     public static final String ENTRY_VERIFY = "verify";
+
+    /**
+     * 渠道报备
+     */
+    public static final String ENTRY_CHANNEL_VERIFY = "channel_verify";
     //=================  客户入口类型 end =======================
 
     /**

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

@@ -52,7 +52,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
-@Api(value = "项目类型", tags = "项目类型")
+@Api(value = "xlk - 项目类型", tags = "xlk - 项目类型")
 public class TaRecommendCustomerController extends BaseController {
 
     @Autowired
@@ -82,6 +82,31 @@ public class TaRecommendCustomerController extends BaseController {
     @Autowired
     private ITaUserService iTaUserService;
 
+    /**
+     * 驻场的客户列表
+     *
+     * @param pageNumber
+     * @param pageSize
+     * @param keywords
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/marking/customers")
+    @ApiOperation(value = "wx-查询驻场的客户列表", notes = "wx-查询驻场的客户列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNumber", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "keywords", paramType = "query", value = "搜索关键字，目前仅支持姓名"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query", value = "楼盘id必填")
+    })
+    public ResponseBean getMarkingCustList(@RequestParam int pageNumber, @RequestParam int pageSize, String keywords,@RequestParam("buildingId") String buildingId, HttpServletRequest request) {
+        if (pageNumber < 0 || pageSize < 0) {
+            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String openid = getOpenId(request);
+        return taRecommendCustomerService.getMarkingCustList(openid, keywords, pageNumber, pageSize,buildingId);
+    }
 
     /**
      * 我的客户列表

src/main/java/com/yunzhi/marketing/entity/TaPolicy.java

@@ -106,4 +106,13 @@ public class TaPolicy implements Serializable {
      */
     private Integer pvNum;
 
+    /**
+     * 是否热点
+     */
+    private Integer isHot;
+
+    /**
+     * 副标题
+     */
+    private String subtitle;
 }

src/main/java/com/yunzhi/marketing/mapper/TaRecommendCustomerMapper.java

@@ -7,6 +7,7 @@ import com.yunzhi.marketing.entity.TaPersonBuilding;
 import com.yunzhi.marketing.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yunzhi.marketing.excel.*;
+import com.yunzhi.marketing.po.TaRecommendCustomerPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -302,4 +303,13 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @return
      */
     Map<String, Number> checkCustomerBy(@Param("orgId") Integer orgId, @Param("personId") String personId, @Param("consultBuildingIds") List<String> consultBuildingIds, @Param("buildingId") String buildingId);
+
+    /**
+     * 驻场客户列表
+     * @param page
+     * @param keywords
+     * @param buildingId
+     * @return
+     */
+    IPage<TaRecommendCustomerPO> getMarkingCustList(IPage<TaRecommendCustomerPO> page,@Param("keywords") String keywords,@Param("buildingId") String buildingId);
 }

src/main/java/com/yunzhi/marketing/po/TaRecommendCustomerPO.java

@@ -0,0 +1,19 @@
+package com.yunzhi.marketing.po;
+
+import lombok.Data;
+
+@Data
+public class TaRecommendCustomerPO {
+
+    private String id;
+
+    private String name;
+
+    private String phone;
+
+    private String picture;
+
+    private String sex;
+
+    private String type;
+}

src/main/java/com/yunzhi/marketing/service/ITaRecommendCustomerService.java

@@ -196,4 +196,15 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @return
      */
     ResponseBean channelReportCust(ChannelReportDTO channelReportDTO) throws Exception;
+
+    /**
+     * 获取驻场的客户列表
+     * @param openid
+     * @param keywords
+     * @param pageNumber
+     * @param pageSize
+     * @param buildingId
+     * @return
+     */
+    ResponseBean getMarkingCustList(String openid, String keywords, int pageNumber, int pageSize, String buildingId);
 }

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

@@ -19,6 +19,7 @@ import com.yunzhi.marketing.dto.ChannelReportDTO;
 import com.yunzhi.marketing.excel.AgentsRecommendCustomer;
 import com.yunzhi.marketing.excel.ExcelRecommendCustomer;
 import com.yunzhi.marketing.excel.ReporRecommendCustomer;
+import com.yunzhi.marketing.po.TaRecommendCustomerPO;
 import com.yunzhi.marketing.service.IMiniAppService;
 import com.yunzhi.marketing.service.ITaRecommendCustomerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -427,6 +428,39 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         return ResponseBean.success(channelCustomer);
     }
 
+    /**
+     * 获取驻场的客户列表
+     *
+     * @param openid
+     * @param keywords
+     * @param pageNumber
+     * @param pageSize
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public ResponseBean getMarkingCustList(String openid, String keywords, int pageNumber, int pageSize, String buildingId) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson taPerson = taPersons.get(0);
+
+        // 验证当前人员是否是驻场顾问
+        LambdaQueryWrapper<TaPersonBuilding> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(TaPersonBuilding::getPersonId,taPerson.getPersonId());
+        lambdaQueryWrapper.eq(TaPersonBuilding::getBuildingId,buildingId);
+        TaPersonBuilding taPersonBuilding = taPersonBuildingMapper.selectOne(lambdaQueryWrapper);
+        if (null == taPersonBuilding) {
+            return ResponseBean.error("你不是此楼盘的驻场顾问", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 查询出此楼盘下的职业顾问
+        IPage<TaRecommendCustomerPO> page = new Page<>(pageNumber,pageSize);
+        IPage<TaRecommendCustomerPO> result = taRecommendCustomerMapper.getMarkingCustList(page, keywords,buildingId);
+        return ResponseBean.success(result);
+    }
+
     private void fillSomeFieldsOfCustomer(TaRecommendCustomer customer, TaPerson recommender, LocalDateTime now) {
         customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
         customer.setStatus(CommConstant.CUSTOMER_REPORT);

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.dto.ChannelCustomerDTO;
+import com.yunzhi.marketing.xlk.dto.MarkingChannelCustomerDTO;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 import com.yunzhi.marketing.xlk.service.IChannelCustomerService;
 import io.swagger.annotations.Api;
@@ -76,6 +77,19 @@ public class ChannelCustomerController extends BaseController {
         return iChannelCustomerService.auditCustomer(id,channelCustomerDTO);
     }
 
+
+    /**
+     * 驻场 确认到访
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "wx-驻场确认到访", notes = "wx-驻场确认到访")
+    @RequestMapping(value="/wx/marking/channelCustomer",method= RequestMethod.PUT)
+    public ResponseBean channelCustomerUpdate(@RequestBody MarkingChannelCustomerDTO params){
+        return iChannelCustomerService.markingChannelCustomer(params);
+    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID

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

@@ -98,7 +98,7 @@ public class InstitutionController extends BaseController {
      * @return
      */
     @ApiOperation(value = "admin-组织机构列表查询", notes = "admin-组织机构列表查询")
-    @RequestMapping(value="/institution/save",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/institution/save",method= RequestMethod.POST)
     public ResponseBean institutionAdd(@RequestBody @Valid InstitutionDTO institutionDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -122,7 +122,7 @@ public class InstitutionController extends BaseController {
      */
     @ApiOperation(value = "admin-组织机构列表删除", notes = "admin-组织机构列表删除")
     @ResponseBody
-    @RequestMapping(value="/institution/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/institution/{id}", method= RequestMethod.DELETE)
     public ResponseBean institutionDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -142,7 +142,7 @@ public class InstitutionController extends BaseController {
      * @return
      */
     @ApiOperation(value = "admin-组织机构列表修改", notes = "admin-组织机构列表修改")
-    @RequestMapping(value="/institution/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/institution/{id}",method= RequestMethod.PUT)
     public ResponseBean institutionUpdate(@PathVariable String id,
                                           @RequestBody InstitutionDTO institutionDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -166,7 +166,7 @@ public class InstitutionController extends BaseController {
      * @param id  实体ID
      */
     @ApiOperation(value = "admin-组织机构列表查询详细", notes = "组织机构列表查询详细")
-    @RequestMapping(value="/institution/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/institution/{id}",method= RequestMethod.GET)
     public ResponseBean institutionGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {

src/main/java/com/yunzhi/marketing/xlk/dto/MarkingChannelCustomerDTO.java

@@ -0,0 +1,30 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 渠道报备客户表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_channel_customer")
+public class MarkingChannelCustomerDTO implements Serializable {
+
+    private String id;
+    /**
+     * customer / channel  一个代表业务客户 一个代表渠道推荐客户
+     */
+   private String type;
+
+}

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

@@ -3,6 +3,7 @@ package com.yunzhi.marketing.xlk.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.dto.ChannelCustomerDTO;
+import com.yunzhi.marketing.xlk.dto.MarkingChannelCustomerDTO;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 
 /**
@@ -22,4 +23,12 @@ public interface IChannelCustomerService extends IService<ChannelCustomer> {
      * @return
      */
     ResponseBean auditCustomer(Integer id, ChannelCustomerDTO channelCustomerDTO);
+
+    /**
+     * 驻场确认到访
+     * @param id
+     * @param params
+     * @return
+     */
+    ResponseBean markingChannelCustomer(MarkingChannelCustomerDTO params);
 }

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

@@ -3,17 +3,19 @@ package com.yunzhi.marketing.xlk.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.TaRecommendCustomer;
 import com.yunzhi.marketing.mapper.TaRecommendCustomerMapper;
 import com.yunzhi.marketing.xlk.dto.ChannelCustomerDTO;
+import com.yunzhi.marketing.xlk.dto.MarkingChannelCustomerDTO;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 import com.yunzhi.marketing.xlk.mapper.ChannelCustomerMapper;
 import com.yunzhi.marketing.xlk.service.IChannelCustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -53,16 +55,33 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TaRecommendCustomer::getPhone,customer.getPhone());
         queryWrapper.eq(TaRecommendCustomer::getBuildingId,customer.getBuildingId());
-        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
-        if (null == taRecommendCustomer) {
+        TaRecommendCustomer recommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
+        if (null == recommendCustomer) {
             // 审核通过
             customer.setStatus("2");
             channelCustomerMapper.updateById(customer);
+            // 进业务客户表
+            TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
+            taRecommendCustomer.setName(customer.getName());
+            taRecommendCustomer.setPicture(customer.getPicture());
+            taRecommendCustomer.setPhone(customer.getPhone());
+            taRecommendCustomer.setSex(customer.getSex());
+            taRecommendCustomer.setRecommendPerson(customer.getRecommendPerson());
+            taRecommendCustomer.setBuildingId(customer.getBuildingId());
+            taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
+            taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+            taRecommendCustomer.setCreateDate(LocalDateTime.now());
+            taRecommendCustomer.setReportDate(LocalDateTime.now());
+            taRecommendCustomer.setOrgId(customer.getOrgId());
+            taRecommendCustomer.setPersonId(customer.getPersonId());
+            taRecommendCustomer.setEntryType(CommConstant.ENTRY_CHANNEL_VERIFY);
+            taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
+            taRecommendCustomerMapper.insert(taRecommendCustomer);
             return ResponseBean.success("审核成功");
         }
 
-        if (StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant()) &&
-                (StringUtils.isEmpty(taRecommendCustomer.getRecommendPerson()) || taRecommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
+        if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
+                (StringUtils.isEmpty(recommendCustomer.getRecommendPerson()) || recommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
             // 审核通过
             customer.setStatus("2");
             channelCustomerMapper.updateById(customer);
@@ -71,4 +90,70 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
 
         return ResponseBean.error("此客户是私客或已被报备", ResponseBean.ERROR_UNAVAILABLE);
     }
+
+    /**
+     * 驻场确认到访
+     *
+     * @param id
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean markingChannelCustomer(MarkingChannelCustomerDTO params) {
+        // 渠道推荐的客户
+        if ("channel".equals(params.getType())) {
+            ChannelCustomer customer = channelCustomerMapper.selectById(params.getId());
+            // 审核通过 先查看在ta_recommend_customer 手机号是否存在
+            LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(TaRecommendCustomer::getPhone,customer.getPhone());
+            queryWrapper.eq(TaRecommendCustomer::getBuildingId,customer.getBuildingId());
+            TaRecommendCustomer recommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
+            if (null == recommendCustomer) {
+                // 审核通过
+                customer.setStatus("2");
+                channelCustomerMapper.updateById(customer);
+                // 进业务客户表
+                TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
+                taRecommendCustomer.setName(customer.getName());
+                taRecommendCustomer.setPicture(customer.getPicture());
+                taRecommendCustomer.setPhone(customer.getPhone());
+                taRecommendCustomer.setSex(customer.getSex());
+                taRecommendCustomer.setRecommendPerson(customer.getRecommendPerson());
+                taRecommendCustomer.setBuildingId(customer.getBuildingId());
+                taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
+                taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                taRecommendCustomer.setCreateDate(LocalDateTime.now());
+                taRecommendCustomer.setReportDate(LocalDateTime.now());
+                taRecommendCustomer.setOrgId(customer.getOrgId());
+                taRecommendCustomer.setPersonId(customer.getPersonId());
+                taRecommendCustomer.setEntryType(CommConstant.ENTRY_CHANNEL_VERIFY);
+                taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+                taRecommendCustomerMapper.insert(taRecommendCustomer);
+                return ResponseBean.success("审核成功");
+            }
+
+            if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
+                    (StringUtils.isEmpty(recommendCustomer.getRecommendPerson()) || recommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
+                // 审核通过
+                customer.setStatus("2");
+                channelCustomerMapper.updateById(customer);
+
+                // 修改状态为确认到访状态
+                recommendCustomer.setRecommendPerson(customer.getRecommendPerson());
+                recommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+                taRecommendCustomerMapper.updateById(recommendCustomer);
+                return ResponseBean.success("审核成功");
+            }
+        }else if ("customer".equals(params.getType())) {
+            // 置业顾问 经纪人推荐的客户
+            TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(params.getId());
+            taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+            taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+            taRecommendCustomerMapper.updateById(taRecommendCustomer);
+            return ResponseBean.success("审核成功");
+        }
+
+        return ResponseBean.error("此客户是私客或已被报备", ResponseBean.ERROR_UNAVAILABLE);
+    }
 }

src/main/resources/application-dev.yml

@@ -17,79 +17,9 @@ spring:
       max-file-size: 100MB
       max-request-size: 100MB
 
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wxd6f47a9bb3052175
-    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-  - name: notice
-    id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-    keywords: 4
-  - name: newCustomer
-    id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-    keywords: 4
-  - name: mainbiz
-    id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
-    keywords: 6
-ali:
-  accessKeyId: LTAI5tPxzUpTbCtSVoN3eiEC
-  accessKeySecret: gRqRuNe6vftgyyBA7fYSglWIoUHntP
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: xlk-assets
-    bucketURL: https://xlk-assets.oss-accelerate.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://101.200.84.17:8081/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: 营销云
-
-  visitor:
-    code: "0501"
-
-# 支付回调
-pay-notify: https://dev.fangdeal.cn/api/notify/
-#退款回调
-pay-refund: https://dev.fangdeal.cn/api/refund/
-
-#法大大服务器地址
-fadada:
-  appId: "403057"
-  appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
-  version: "2.0"
-  authServeHost: "http://test.api.fabigbig.com:8888/api/"
-  serveHost: "https://testapi08.fadada.com/api/"
-  companyNotify: "https://dev.fangdeal.cn/api/fadd/company"
-  authReturnUrl: "https://dev.fangdeal.cn/channel/#/eContract/seal/detail?id="
-  authNotifyUrl: "https://dev.fangdeal.cn/api/fadd/autoAuthCompanySeal"
-  signNotify: "https://dev.fangdeal.cn/api/fadd/sign"
-  redirectUrl: "https://dev.fangdeal.cn/other/redirect.html"
-# file path
-file:
-  path: /images/
+## 日志
+logging:
+  path: D:\
+  config: classpath:log/logback-spring.xml
+  level:
+    root: info

src/main/resources/application-prod.yml

@@ -4,12 +4,9 @@ spring:
   application:
     name: zhiyun
   datasource:
-    username: marketing-cloud
-    password: uVV0kEQLFGqx4#mV
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/marketing-cloud?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-#    username: marketing
-#    password: u@cSFJ5*kS9hGP7a
-#    url: jdbc:mysql://localhost:3306/marketing-cloud?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    username: marketing
+    password: u@cSFJ5*kS9hGP7a
+    url: jdbc:mysql://localhost:3306/marketing-cloud?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数
@@ -20,84 +17,9 @@ spring:
       max-file-size: 10MB
       max-request-size: 50MB
 
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wxd6f47a9bb3052175
-    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
-      keywords: 6
-ali:
-  accessKeyId: LTAI5tPxzUpTbCtSVoN3eiEC
-  accessKeySecret: gRqRuNe6vftgyyBA7fYSglWIoUHntP
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: xlk-assets
-    bucketURL: https://xlk-assets.oss-accelerate.aliyuncs.com
-
-# 手机短信服务
-sms:
-  # 先使用外网地址, 后期使用内网地址
-  url: http://101.200.84.17:8081/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: 橙蕉
-
-  visitor:
-    code: "0501"
-
 #日志配置
 logging:
+  path: /home/xlk/marketing-cloud/service/logs
   config: classpath:log/logback-spring.xml
-  debug: true
-
-# 支付回调
-pay-notify: https://wx.fangdeal.cn/api/notify/
-#退款回调
-pay-refund: https://wx.fangdeal.cn/api/refund/
-
-#法大大服务器地址
-fadada:
-  appId: "500261"
-  appSecret: "go9yihmg7abS2lIBZpZ2yLSW"
-  version: "2.0"
-  authServeHost: "https://textapi.fadada.com/api2/"
-  serveHost: "https://textapi.fadada.com/api2/"
-  companyNotify: "https://wx.fangdeal.cn/api/fadd/company"
-  authReturnUrl: "http://admin.fangdeal.cn/#/eContract/seal/detail?id="
-  authNotifyUrl: "https://wx.fangdeal.cn/api/fadd/autoAuthCompanySeal"
-  signNotify: "https://wx.fangdeal.cn/api/fadd/sign"
-  redirectUrl: "https://wx.fangdeal.cn/other/redirect.html"
-# file path
-file:
-  path: /images/
+  level:
+    root: info

src/main/resources/application-test.yml

@@ -0,0 +1,25 @@
+server:
+  port: 8567
+spring:
+  application:
+    name: marketing-cloud
+  datasource:
+    username: marketing-cloud
+    password: uVV0kEQLFGqx4#mV
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/marketing-cloud?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    initial-size: 10 # 初始化连接数
+    max-active: 20 # 最大连接数
+    min-idle: 8 # 最小空闲数
+    max-idle: 8 # 最大空闲数
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+
+## 日志
+logging:
+  path: /yunpan/dev/logs
+  config: classpath:log/logback-spring.xml
+  level:
+    root: info

src/main/resources/application.yml

@@ -1,3 +1,82 @@
+
+##mybatis-plus
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    call-setters-on-nulls: true
+  mapper-locations: classpath:mapper/**/*.xml
+wx:
+  miniapp:
+    appid:
+    secret:
+    token:
+    aesKey:
+    msgDataFormat: JSON
+  tpls:
+    - name: notice
+      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
+      keywords: 4
+    - name: newCustomer
+      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+      keywords: 4
+    - name: mainbiz
+      id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
+      keywords: 6
+ali:
+  accessKeyId: LTAI5tPxzUpTbCtSVoN3eiEC
+  accessKeySecret: gRqRuNe6vftgyyBA7fYSglWIoUHntP
+  oss:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: xlk-assets
+    bucketURL: https://xlk-assets.oss-accelerate.aliyuncs.com
+
+# file path
+file:
+  path: /images/
+
+# 手机短信服务
+sms:
+  url:
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
+
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign: 营销云
+
+  visitor:
+    code: "0501"
+
+# 支付回调
+pay-notify:
+#退款回调
+pay-refund:
+
+#法大大服务器地址
+fadada:
+  appId: ""
+  appSecret: ""
+  version: ""
+  authServeHost: ""
+  serveHost: ""
+  companyNotify: ""
+  authReturnUrl: ""
+  authNotifyUrl: ""
+  signNotify: ""
+  redirectUrl: ""
+
 ### spring
 spring:
   profiles:

src/main/resources/log/logback-spring.xml

@@ -1,114 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
-    <springProfile name="prod">
-        <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <!--引入默认的一些设置-->
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <!--定义日志文件的存储地址 从springboot配置文件中获取路径-->
+    <springProperty scope="context" name="LOG_HOME" source="logging.path"/>
+    <!--springboot配置文件中获取日志级别-->
+    <springProperty scope="context" name="LOG_LEVEL" source="logging.level.root"/>
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
 <!--        <property name="LOG_HOME" value="/home/xlk/marketing-cloud/service/logs" />-->
-        <property name="LOG_HOME" value="/yunpan/dev/logs" />
-        <!-- 控制台输出 -->
-        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            </encoder>
-        </appender>
-        <!-- 按照每天生成日志文件 -->
-        <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <!--日志文件输出的文件名-->
-                <FileNamePattern>${LOG_HOME}/marketing-%d{yyyy-MM-dd}.log</FileNamePattern>
-                <!--日志文件保留天数-->
-                <MaxHistory>30</MaxHistory>
-            </rollingPolicy>
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            </encoder>
-            <!--日志文件最大的大小-->
-            <!--        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
-            <!--            <MaxFileSize>10MB</MaxFileSize>-->
-            <!--        </triggeringPolicy>-->
-        </appender>
+<!--    <property name="LOG_HOME" value="/yunpan/dev/logs" />-->
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/marketing-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+        <!--日志文件最大的大小-->
+        <!--        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
+        <!--            <MaxFileSize>10MB</MaxFileSize>-->
+        <!--        </triggeringPolicy>-->
+    </appender>
+
+    <!-- 按照每天生成日志文件 -->
+    <appender name="MYSQL"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/marketing-%d{yyyy-MM-dd}-sql.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+        <!--日志文件最大的大小-->
+        <!--                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
+        <!--                    <MaxFileSize>1024MB</MaxFileSize>-->
+        <!--                </triggeringPolicy>-->
+    </appender>
 
-        <!-- 按照每天生成日志文件 -->
-        <appender name="MYSQL"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <!--日志文件输出的文件名-->
-                <FileNamePattern>${LOG_HOME}/marketing-%d{yyyy-MM-dd}-sql.log</FileNamePattern>
-                <!--日志文件保留天数-->
-                <MaxHistory>30</MaxHistory>
-            </rollingPolicy>
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            </encoder>
-            <!--日志文件最大的大小-->
-            <!--                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
-            <!--                    <MaxFileSize>1024MB</MaxFileSize>-->
-            <!--                </triggeringPolicy>-->
-        </appender>
+    <!--myibatis log configure-->
+    <logger name="com.yunzhi.marketing.mapper" level="DEBUG" additivity="false">
+        <appender-ref ref="MYSQL" />
+    </logger>
 
-        <!--myibatis log configure-->
-        <logger name="com.yunzhi.marketing.mapper" level="DEBUG" additivity="false">
+    <!--生产环境:打印控制台和输出到文件-->
+    <springProfile name="prod">
+        <root level="${LOG_LEVEL}">
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="FILE"/>
             <appender-ref ref="MYSQL" />
-        </logger>
+        </root>
     </springProfile>
 
+    <!--开发环境:打印控制台-->
     <springProfile name="dev">
-        <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-        <property name="LOG_HOME" value="/yunpan/dev/logs" />
-        <!-- 控制台输出 -->
-        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            </encoder>
-        </appender>
-        <!-- 按照每天生成日志文件 -->
-        <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <!--日志文件输出的文件名-->
-                <FileNamePattern>${LOG_HOME}/marketing-%d{yyyy-MM-dd}.log</FileNamePattern>
-                <!--日志文件保留天数-->
-                <MaxHistory>30</MaxHistory>
-            </rollingPolicy>
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            </encoder>
-            <!--日志文件最大的大小-->
-            <!--        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
-            <!--            <MaxFileSize>10MB</MaxFileSize>-->
-            <!--        </triggeringPolicy>-->
-        </appender>
-
-        <!-- 按照每天生成日志文件 -->
-        <appender name="MYSQL"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <!--日志文件输出的文件名-->
-                <FileNamePattern>${LOG_HOME}/marketing-%d{yyyy-MM-dd}-sql.log</FileNamePattern>
-                <!--日志文件保留天数-->
-                <MaxHistory>30</MaxHistory>
-            </rollingPolicy>
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            </encoder>
-            <!--日志文件最大的大小-->
-            <!--                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
-            <!--                    <MaxFileSize>1024MB</MaxFileSize>-->
-            <!--                </triggeringPolicy>-->
-        </appender>
+        <root level="${LOG_LEVEL}">
+            <appender-ref ref="STDOUT"/>
+        </root>
+    </springProfile>
 
-        <!--myibatis log configure-->
-        <logger name="com.yunzhi.marketing.mapper" level="DEBUG" additivity="false">
+    <!--测试环境:打印控制台-->
+    <springProfile name="test">
+        <root level="${LOG_LEVEL}">
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="FILE"/>
             <appender-ref ref="MYSQL" />
-        </logger>
+        </root>
     </springProfile>
 
-    <!-- 日志输出级别 -->
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE" />
-        <appender-ref ref="MYSQL" />
-    </root>
 </configuration>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -942,4 +942,35 @@ FROM
             AND t.person_id = #{personId}
             AND t.status > -1
     </select>
+    <select id="getMarkingCustList" resultType="com.yunzhi.marketing.po.TaRecommendCustomerPO">
+        SELECT
+            customer_id AS id,
+            name,
+            phone,
+            picture,
+            sex,
+            "customer" AS type
+        FROM
+            ta_recommend_customer
+        WHERE
+            building_id = #{buildingId}
+        <if test="keywords != null and keywords !=''">
+            and name like CONCAT('%',#{keywords}, '%')
+        </if>
+    UNION ALL
+        SELECT
+            channel_customer_id AS id,
+            NAME,
+            phone,
+            picture,
+            sex,
+            "channel" AS type
+        FROM
+            xlk_channel_customer
+        WHERE
+            building_id = #{buildingId}
+        <if test="keywords != null and keywords !=''">
+            and name like CONCAT('%',#{keywords}, '%')
+        </if>
+    </select>
 </mapper>