feats

src/main/java/com/yunzhi/marketing/Application.java

@@ -4,11 +4,13 @@ import com.yunzhi.marketing.websocket.ChatServer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import javax.annotation.PostConstruct;
 import java.util.TimeZone;
 
 @SpringBootApplication
+@EnableTransactionManagement
 public class Application {
 
 	@PostConstruct

src/main/java/com/yunzhi/marketing/borker/controller/BkAccountRecordController.java → src/main/java/com/yunzhi/marketing/broker/controller/BkAccountRecordController.java

@@ -1,4 +1,4 @@
-package com.yunzhi.marketing.borker.controller;
+package com.yunzhi.marketing.broker.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import com.yunzhi.marketing.borker.service.IBkAccountRecordService;
-import com.yunzhi.marketing.borker.entity.BkAccountRecord;
+import com.yunzhi.marketing.broker.service.IBkAccountRecordService;
+import com.yunzhi.marketing.broker.entity.BkAccountRecord;
 import org.springframework.web.bind.annotation.RestController;
 
 /**

src/main/java/com/yunzhi/marketing/borker/controller/BkAgentRuleController.java → src/main/java/com/yunzhi/marketing/broker/controller/BkAgentRuleController.java

@@ -1,15 +1,9 @@
-package com.yunzhi.marketing.borker.controller;
+package com.yunzhi.marketing.broker.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
-import com.yunzhi.marketing.borker.entity.BkAgentRule;
-import com.yunzhi.marketing.borker.entity.BkAgreement;
-import com.yunzhi.marketing.borker.service.IBkAgentRuleService;
-import com.yunzhi.marketing.borker.service.IBkAgreementService;
-import com.yunzhi.marketing.common.CommConstant;
+import com.yunzhi.marketing.broker.entity.BkAgentRule;
+import com.yunzhi.marketing.broker.service.IBkAgentRuleService;
 import com.yunzhi.marketing.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/yunzhi/marketing/borker/controller/BkAgreementController.java → src/main/java/com/yunzhi/marketing/broker/controller/BkAgreementController.java

@@ -1,4 +1,4 @@
-package com.yunzhi.marketing.borker.controller;
+package com.yunzhi.marketing.broker.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,8 +18,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import com.yunzhi.marketing.borker.service.IBkAgreementService;
-import com.yunzhi.marketing.borker.entity.BkAgreement;
+import com.yunzhi.marketing.broker.service.IBkAgreementService;
+import com.yunzhi.marketing.broker.entity.BkAgreement;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/yunzhi/marketing/borker/controller/BkBankCardController.java → src/main/java/com/yunzhi/marketing/broker/controller/BkBankCardController.java

@@ -1,4 +1,4 @@
-package com.yunzhi.marketing.borker.controller;
+package com.yunzhi.marketing.broker.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
-import com.yunzhi.marketing.entity.TaPerson;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -18,8 +17,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import com.yunzhi.marketing.borker.service.IBkBankCardService;
-import com.yunzhi.marketing.borker.entity.BkBankCard;
+import com.yunzhi.marketing.broker.service.IBkBankCardService;
+import com.yunzhi.marketing.broker.entity.BkBankCard;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/yunzhi/marketing/borker/controller/BkFirstScreenController.java → src/main/java/com/yunzhi/marketing/broker/controller/BkFirstScreenController.java

@@ -1,4 +1,4 @@
-package com.yunzhi.marketing.borker.controller;
+package com.yunzhi.marketing.broker.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,8 +18,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import com.yunzhi.marketing.borker.service.IBkFirstScreenService;
-import com.yunzhi.marketing.borker.entity.BkFirstScreen;
+import com.yunzhi.marketing.broker.service.IBkFirstScreenService;
+import com.yunzhi.marketing.broker.entity.BkFirstScreen;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/yunzhi/marketing/borker/controller/BkNoticeController.java → src/main/java/com/yunzhi/marketing/broker/controller/BkNoticeController.java

@@ -1,4 +1,4 @@
-package com.yunzhi.marketing.borker.controller;
+package com.yunzhi.marketing.broker.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,12 +13,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import com.yunzhi.marketing.borker.service.IBkNoticeService;
-import com.yunzhi.marketing.borker.entity.BkNotice;
+import com.yunzhi.marketing.broker.service.IBkNoticeService;
+import com.yunzhi.marketing.broker.entity.BkNotice;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/yunzhi/marketing/borker/controller/BorkerController.java → src/main/java/com/yunzhi/marketing/broker/controller/BrokerController.java

@@ -1,13 +1,12 @@
-package com.yunzhi.marketing.borker.controller;
+package com.yunzhi.marketing.broker.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
-import com.yunzhi.marketing.borker.entity.BkBankCard;
-import com.yunzhi.marketing.borker.service.IBkBankCardService;
-import com.yunzhi.marketing.borker.vo.BorkerSummery;
-import com.yunzhi.marketing.borker.vo.BorkerVO;
+import com.yunzhi.marketing.broker.service.IBkBankCardService;
+import com.yunzhi.marketing.broker.vo.BrokerSummery;
+import com.yunzhi.marketing.broker.vo.BrokerVO;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.TaPerson;
@@ -24,15 +23,15 @@ import javax.servlet.http.HttpServletRequest;
 @Api(tags = "全民经纪人(新联康)")
 @RestController
 @RequestMapping("/api")
-public class BorkerController  extends BaseController {
+public class BrokerController extends BaseController {
 
     @Autowired
     IBkBankCardService iBkBankCardService;
 
 
-    @RequestMapping(value="/admin/borker",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/broker",method= RequestMethod.GET)
     @ApiOperation(value="经纪人列表", notes = "经纪人列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean getBorkerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean getBrokerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                       @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
                                       @ApiParam("姓名") @RequestParam(value ="name", required = false) String name,
@@ -40,49 +39,49 @@ public class BorkerController  extends BaseController {
                                       @ApiParam("排序规则") @RequestParam(value ="sortOrder", defaultValue = "DESC") String sortOrder,
                                       @ApiParam("排序字段") @RequestParam(value ="sortField", defaultValue = "create_date") String sortField) throws Exception {
 
-        IPage<BorkerVO> page = new Page<>(pageNum, pageSize);
-        IPage<BorkerVO> result = iTaPersonService.getBorkerPage(page, name, phone, recommendPersonName, sortOrder, sortField);
+        IPage<BrokerVO> page = new Page<>(pageNum, pageSize);
+        IPage<BrokerVO> result = iTaPersonService.getBrokerPage(page, name, phone, recommendPersonName, sortOrder, sortField);
         return ResponseBean.success(result);
     }
 
 
-    @RequestMapping(value="/wx/borker",method= RequestMethod.GET)
+    @RequestMapping(value="/wx/broker",method= RequestMethod.GET)
     @ApiOperation(value="小程序端经纪人列表", notes = "小程序端经纪人列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean getWxBorkerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean getWxBrokerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                         HttpServletRequest request) throws Exception {
         // 我推荐的经纪人列表
         String personId = getPersonId(request);
 
-        IPage<BorkerSummery> page = new Page<>(pageNum, pageSize);
-        IPage<BorkerSummery> result = iTaPersonService.getWxBorkerPage(page, personId);
+        IPage<BrokerSummery> page = new Page<>(pageNum, pageSize);
+        IPage<BrokerSummery> result = iTaPersonService.getWxBrokerPage(page, personId);
         return ResponseBean.success(result);
     }
 
-    @RequestMapping(value="/wx/borker/rank",method= RequestMethod.GET)
+    @RequestMapping(value="/wx/broker/rank",method= RequestMethod.GET)
     @ApiOperation(value="小程序端经纪人榜单", notes = "小程序端经纪人榜单", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean getWxBorkerRank(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean getWxBrokerRank(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                         @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @ApiParam(value = "榜单类型", allowableValues = "person,money") @RequestParam(value ="rankType") String rankType,
                                         HttpServletRequest request) throws Exception {
-        IPage<BorkerSummery> page = new Page<>(pageNum, pageSize);
-        IPage<BorkerSummery> result = iTaPersonService.getWxBorkerRankPage(page, rankType);
+        IPage<BrokerSummery> page = new Page<>(pageNum, pageSize);
+        IPage<BrokerSummery> result = iTaPersonService.getWxBrokerRankPage(page, rankType);
         return ResponseBean.success(result);
     }
 
 
-    @RequestMapping(value="/wx/bindBorker",method= RequestMethod.PUT)
+    @RequestMapping(value="/wx/bindBroker",method= RequestMethod.PUT)
     @ApiOperation(value="成为经纪人", notes = "成为经纪人", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean bindBorker(@ApiParam("经纪人信息") @RequestBody BorkerVO borkerVO,
+    public ResponseBean bindBroker(@ApiParam("经纪人信息") @RequestBody BrokerVO brokerVO,
                                    HttpServletRequest request) throws Exception {
         String personId = getPersonId(request);
 
-        borkerVO.setPersonId(personId);
-        borkerVO.setPersonType(CommConstant.PERSON_BORKER);
+        brokerVO.setPersonId(personId);
+        brokerVO.setPersonType(CommConstant.PERSON_BROKER);
 
         TaPerson taPerson = new TaPerson();
 
-        BeanUtils.copyProperties(borkerVO, taPerson, "bankCardList");
+        BeanUtils.copyProperties(brokerVO, taPerson, "bankCardList");
         taPerson.setTotalCommission(null);
         taPerson.setSettledCommission(null);
         taPerson.setUnsettledCommission(null);
@@ -91,13 +90,13 @@ public class BorkerController  extends BaseController {
         if (!iTaPersonService.updateById(taPerson)) {
 
             // 如果是有人推荐的, 那么需要给予推荐人一定的奖励
-            if (!StringUtils.isEmpty(borkerVO.getRecommendAgent())) {
+            if (!StringUtils.isEmpty(brokerVO.getRecommendAgent())) {
                 // TODO
             }
 
             return ResponseBean.error("操作失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        return ResponseBean.success(borkerVO);
+        return ResponseBean.success(brokerVO);
     }
 }

src/main/java/com/yunzhi/marketing/borker/entity/BkAccountRecord.java → src/main/java/com/yunzhi/marketing/broker/entity/BkAccountRecord.java

@@ -1,4 +1,4 @@
-package com.yunzhi.marketing.borker.entity;
+package com.yunzhi.marketing.broker.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
@@ -42,6 +42,9 @@ public class BkAccountRecord implements Serializable {
     @ApiModelProperty(value = "楼盘名称")
     private String buildingName;
 
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+
     @ApiModelProperty(value = "佣金;单位分")
     private Integer charges;
 

src/main/java/com/yunzhi/marketing/borker/entity/BkAgentRule.java → src/main/java/com/yunzhi/marketing/broker/entity/BkAgentRule.java

@@ -1,4 +1,4 @@
-package com.yunzhi.marketing.borker.entity;
+package com.yunzhi.marketing.broker.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/yunzhi/marketing/borker/entity/BkAgreement.java → src/main/java/com/yunzhi/marketing/broker/entity/BkAgreement.java

@@ -1,4 +1,4 @@
-package com.yunzhi.marketing.borker.entity;
+package com.yunzhi.marketing.broker.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;

src/main/java/com/yunzhi/marketing/borker/entity/BkBankCard.java → src/main/java/com/yunzhi/marketing/broker/entity/BkBankCard.java

@@ -1,4 +1,4 @@
-package com.yunzhi.marketing.borker.entity;
+package com.yunzhi.marketing.broker.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/yunzhi/marketing/borker/entity/BkFirstScreen.java → src/main/java/com/yunzhi/marketing/broker/entity/BkFirstScreen.java

@@ -1,4 +1,4 @@
-package com.yunzhi.marketing.borker.entity;
+package com.yunzhi.marketing.broker.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;

src/main/java/com/yunzhi/marketing/borker/entity/BkNotice.java → src/main/java/com/yunzhi/marketing/broker/entity/BkNotice.java

@@ -1,4 +1,4 @@
-package com.yunzhi.marketing.borker.entity;
+package com.yunzhi.marketing.broker.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;

src/main/java/com/yunzhi/marketing/borker/mapper/BkAccountRecordMapper.java → src/main/java/com/yunzhi/marketing/broker/mapper/BkAccountRecordMapper.java

@@ -1,6 +1,6 @@
-package com.yunzhi.marketing.borker.mapper;
+package com.yunzhi.marketing.broker.mapper;
 
-import com.yunzhi.marketing.borker.entity.BkAccountRecord;
+import com.yunzhi.marketing.broker.entity.BkAccountRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/yunzhi/marketing/borker/mapper/BkAgentRuleMapper.java → src/main/java/com/yunzhi/marketing/broker/mapper/BkAgentRuleMapper.java

@@ -1,7 +1,7 @@
-package com.yunzhi.marketing.borker.mapper;
+package com.yunzhi.marketing.broker.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yunzhi.marketing.borker.entity.BkAgentRule;
+import com.yunzhi.marketing.broker.entity.BkAgentRule;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/yunzhi/marketing/borker/mapper/BkAgreementMapper.java → src/main/java/com/yunzhi/marketing/broker/mapper/BkAgreementMapper.java

@@ -1,6 +1,6 @@
-package com.yunzhi.marketing.borker.mapper;
+package com.yunzhi.marketing.broker.mapper;
 
-import com.yunzhi.marketing.borker.entity.BkAgreement;
+import com.yunzhi.marketing.broker.entity.BkAgreement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/yunzhi/marketing/borker/mapper/BkBankCardMapper.java → src/main/java/com/yunzhi/marketing/broker/mapper/BkBankCardMapper.java

@@ -1,6 +1,6 @@
-package com.yunzhi.marketing.borker.mapper;
+package com.yunzhi.marketing.broker.mapper;
 
-import com.yunzhi.marketing.borker.entity.BkBankCard;
+import com.yunzhi.marketing.broker.entity.BkBankCard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -18,5 +18,5 @@ import java.util.List;
 @Mapper
 public interface BkBankCardMapper extends BaseMapper<BkBankCard> {
 
-    List<BkBankCard> getListByBorker(@Param("personId") String personId);
+    List<BkBankCard> getListByBroker(@Param("personId") String personId);
 }

src/main/java/com/yunzhi/marketing/borker/mapper/BkFirstScreenMapper.java → src/main/java/com/yunzhi/marketing/broker/mapper/BkFirstScreenMapper.java

@@ -1,6 +1,6 @@
-package com.yunzhi.marketing.borker.mapper;
+package com.yunzhi.marketing.broker.mapper;
 
-import com.yunzhi.marketing.borker.entity.BkFirstScreen;
+import com.yunzhi.marketing.broker.entity.BkFirstScreen;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/yunzhi/marketing/borker/mapper/BkNoticeMapper.java → src/main/java/com/yunzhi/marketing/broker/mapper/BkNoticeMapper.java

@@ -1,6 +1,6 @@
-package com.yunzhi.marketing.borker.mapper;
+package com.yunzhi.marketing.broker.mapper;
 
-import com.yunzhi.marketing.borker.entity.BkNotice;
+import com.yunzhi.marketing.broker.entity.BkNotice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/yunzhi/marketing/borker/service/IBkAccountRecordService.java → src/main/java/com/yunzhi/marketing/broker/service/IBkAccountRecordService.java

@@ -1,6 +1,6 @@
-package com.yunzhi.marketing.borker.service;
+package com.yunzhi.marketing.broker.service;
 
-import com.yunzhi.marketing.borker.entity.BkAccountRecord;
+import com.yunzhi.marketing.broker.entity.BkAccountRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -12,5 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-07-26
  */
 public interface IBkAccountRecordService extends IService<BkAccountRecord> {
-
+    boolean recordCommission();
 }

src/main/java/com/yunzhi/marketing/borker/service/IBkAgentRuleService.java → src/main/java/com/yunzhi/marketing/broker/service/IBkAgentRuleService.java

@@ -1,7 +1,7 @@
-package com.yunzhi.marketing.borker.service;
+package com.yunzhi.marketing.broker.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yunzhi.marketing.borker.entity.BkAgentRule;
+import com.yunzhi.marketing.broker.entity.BkAgentRule;
 
 /**
  * <p>

src/main/java/com/yunzhi/marketing/borker/service/IBkAgreementService.java → src/main/java/com/yunzhi/marketing/broker/service/IBkAgreementService.java

@@ -1,6 +1,6 @@
-package com.yunzhi.marketing.borker.service;
+package com.yunzhi.marketing.broker.service;
 
-import com.yunzhi.marketing.borker.entity.BkAgreement;
+import com.yunzhi.marketing.broker.entity.BkAgreement;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/yunzhi/marketing/borker/service/IBkBankCardService.java → src/main/java/com/yunzhi/marketing/broker/service/IBkBankCardService.java

@@ -1,6 +1,6 @@
-package com.yunzhi.marketing.borker.service;
+package com.yunzhi.marketing.broker.service;
 
-import com.yunzhi.marketing.borker.entity.BkBankCard;
+import com.yunzhi.marketing.broker.entity.BkBankCard;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.List;
  */
 public interface IBkBankCardService extends IService<BkBankCard> {
 
-    List<BkBankCard> getListByBorker(String personId);
+    List<BkBankCard> getListByBroker(String personId);
 
     boolean mergeList(String personId, List<BkBankCard> bankCardList);
 }

src/main/java/com/yunzhi/marketing/borker/service/IBkFirstScreenService.java → src/main/java/com/yunzhi/marketing/broker/service/IBkFirstScreenService.java

@@ -1,6 +1,6 @@
-package com.yunzhi.marketing.borker.service;
+package com.yunzhi.marketing.broker.service;
 
-import com.yunzhi.marketing.borker.entity.BkFirstScreen;
+import com.yunzhi.marketing.broker.entity.BkFirstScreen;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/yunzhi/marketing/borker/service/IBkNoticeService.java → src/main/java/com/yunzhi/marketing/broker/service/IBkNoticeService.java

@@ -1,6 +1,6 @@
-package com.yunzhi.marketing.borker.service;
+package com.yunzhi.marketing.broker.service;
 
-import com.yunzhi.marketing.borker.entity.BkNotice;
+import com.yunzhi.marketing.broker.entity.BkNotice;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/yunzhi/marketing/borker/service/impl/BkAccountRecordServiceImpl.java → src/main/java/com/yunzhi/marketing/broker/service/impl/BkAccountRecordServiceImpl.java

@@ -1,8 +1,8 @@
-package com.yunzhi.marketing.borker.service.impl;
+package com.yunzhi.marketing.broker.service.impl;
 
-import com.yunzhi.marketing.borker.entity.BkAccountRecord;
-import com.yunzhi.marketing.borker.mapper.BkAccountRecordMapper;
-import com.yunzhi.marketing.borker.service.IBkAccountRecordService;
+import com.yunzhi.marketing.broker.entity.BkAccountRecord;
+import com.yunzhi.marketing.broker.mapper.BkAccountRecordMapper;
+import com.yunzhi.marketing.broker.service.IBkAccountRecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -17,4 +17,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class BkAccountRecordServiceImpl extends ServiceImpl<BkAccountRecordMapper, BkAccountRecord> implements IBkAccountRecordService {
 
+    @Override
+    public boolean recordCommission() {
+        return false;
+    }
 }

src/main/java/com/yunzhi/marketing/borker/service/impl/BkAgentRuleServiceImpl.java → src/main/java/com/yunzhi/marketing/broker/service/impl/BkAgentRuleServiceImpl.java

@@ -1,9 +1,9 @@
-package com.yunzhi.marketing.borker.service.impl;
+package com.yunzhi.marketing.broker.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yunzhi.marketing.borker.entity.BkAgentRule;
-import com.yunzhi.marketing.borker.mapper.BkAgentRuleMapper;
-import com.yunzhi.marketing.borker.service.IBkAgentRuleService;
+import com.yunzhi.marketing.broker.entity.BkAgentRule;
+import com.yunzhi.marketing.broker.mapper.BkAgentRuleMapper;
+import com.yunzhi.marketing.broker.service.IBkAgentRuleService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/yunzhi/marketing/borker/service/impl/BkAgreementServiceImpl.java → src/main/java/com/yunzhi/marketing/broker/service/impl/BkAgreementServiceImpl.java

@@ -1,10 +1,10 @@
-package com.yunzhi.marketing.borker.service.impl;
+package com.yunzhi.marketing.broker.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.yunzhi.marketing.borker.entity.BkAgreement;
-import com.yunzhi.marketing.borker.mapper.BkAgreementMapper;
-import com.yunzhi.marketing.borker.service.IBkAgreementService;
+import com.yunzhi.marketing.broker.entity.BkAgreement;
+import com.yunzhi.marketing.broker.mapper.BkAgreementMapper;
+import com.yunzhi.marketing.broker.service.IBkAgreementService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.common.CommConstant;
 import org.springframework.stereotype.Service;

src/main/java/com/yunzhi/marketing/borker/service/impl/BkBankCardServiceImpl.java → src/main/java/com/yunzhi/marketing/broker/service/impl/BkBankCardServiceImpl.java

@@ -1,8 +1,8 @@
-package com.yunzhi.marketing.borker.service.impl;
+package com.yunzhi.marketing.broker.service.impl;
 
-import com.yunzhi.marketing.borker.entity.BkBankCard;
-import com.yunzhi.marketing.borker.mapper.BkBankCardMapper;
-import com.yunzhi.marketing.borker.service.IBkBankCardService;
+import com.yunzhi.marketing.broker.entity.BkBankCard;
+import com.yunzhi.marketing.broker.mapper.BkBankCardMapper;
+import com.yunzhi.marketing.broker.service.IBkBankCardService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.DateUtils;
@@ -23,8 +23,8 @@ import java.util.List;
 public class BkBankCardServiceImpl extends ServiceImpl<BkBankCardMapper, BkBankCard> implements IBkBankCardService {
 
     @Override
-    public List<BkBankCard> getListByBorker(String personId) {
-        return baseMapper.getListByBorker(personId);
+    public List<BkBankCard> getListByBroker(String personId) {
+        return baseMapper.getListByBroker(personId);
     }
 
     @Override

src/main/java/com/yunzhi/marketing/borker/service/impl/BkFirstScreenServiceImpl.java → src/main/java/com/yunzhi/marketing/broker/service/impl/BkFirstScreenServiceImpl.java

@@ -1,8 +1,8 @@
-package com.yunzhi.marketing.borker.service.impl;
+package com.yunzhi.marketing.broker.service.impl;
 
-import com.yunzhi.marketing.borker.entity.BkFirstScreen;
-import com.yunzhi.marketing.borker.mapper.BkFirstScreenMapper;
-import com.yunzhi.marketing.borker.service.IBkFirstScreenService;
+import com.yunzhi.marketing.broker.entity.BkFirstScreen;
+import com.yunzhi.marketing.broker.mapper.BkFirstScreenMapper;
+import com.yunzhi.marketing.broker.service.IBkFirstScreenService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

src/main/java/com/yunzhi/marketing/borker/service/impl/BkNoticeServiceImpl.java → src/main/java/com/yunzhi/marketing/broker/service/impl/BkNoticeServiceImpl.java

@@ -1,8 +1,8 @@
-package com.yunzhi.marketing.borker.service.impl;
+package com.yunzhi.marketing.broker.service.impl;
 
-import com.yunzhi.marketing.borker.entity.BkNotice;
-import com.yunzhi.marketing.borker.mapper.BkNoticeMapper;
-import com.yunzhi.marketing.borker.service.IBkNoticeService;
+import com.yunzhi.marketing.broker.entity.BkNotice;
+import com.yunzhi.marketing.broker.mapper.BkNoticeMapper;
+import com.yunzhi.marketing.broker.service.IBkNoticeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

src/main/java/com/yunzhi/marketing/borker/vo/BorkerSummery.java → src/main/java/com/yunzhi/marketing/broker/vo/BrokerSummery.java

@@ -1,20 +1,17 @@
-package com.yunzhi.marketing.borker.vo;
+package com.yunzhi.marketing.broker.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.yunzhi.marketing.borker.entity.BkBankCard;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.util.List;
-
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="BorkerSummery", description="全民经纪人概要")
-public class BorkerSummery {
+@ApiModel(value="BrokerSummery", description="全民经纪人概要")
+public class BrokerSummery {
 
     @ApiModelProperty("人员ID")
     private String personId;
@@ -40,7 +37,7 @@ public class BorkerSummery {
 
     @TableField(exist = false)
     @ApiModelProperty("经纪人数")
-    Integer borkerNum;
+    Integer brokerNum;
 
     @ApiModelProperty("总佣金")
     private Integer totalCommission;

src/main/java/com/yunzhi/marketing/borker/vo/BorkerVO.java → src/main/java/com/yunzhi/marketing/broker/vo/BrokerVO.java

@@ -1,7 +1,7 @@
-package com.yunzhi.marketing.borker.vo;
+package com.yunzhi.marketing.broker.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.yunzhi.marketing.borker.entity.BkBankCard;
+import com.yunzhi.marketing.broker.entity.BkBankCard;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,8 +14,8 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="BorkerVO", description="全民经纪人")
-public class BorkerVO {
+@ApiModel(value="BrokerVO", description="全民经纪人")
+public class BrokerVO {
 
     @ApiModelProperty("人员ID")
     private String personId;

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

@@ -36,7 +36,7 @@ public class CommConstant {
     /**
      * 人员类型: 全民经纪人(新联家)
      */
-    public final static String PERSON_BORKER = "borker";
+    public final static String PERSON_BROKER = "broker";
 
 
     public final static Integer STATUS_READY = 0;

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

@@ -7,8 +7,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
-import com.yunzhi.marketing.borker.entity.BkBankCard;
-import com.yunzhi.marketing.borker.service.IBkBankCardService;
+import com.yunzhi.marketing.broker.entity.BkBankCard;
+import com.yunzhi.marketing.broker.service.IBkBankCardService;
 import com.yunzhi.marketing.center.sysUser.service.ISysTokenService;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
 import com.yunzhi.marketing.center.taUser.service.ITaUserService;
@@ -404,8 +404,8 @@ public class MiniAppController extends BaseController {
             result.put("city", tdCity);
 
             // 如果是新联康全民经纪人
-            if (CommConstant.PERSON_BORKER.equals(taPerson.getPersonType())) {
-                List<BkBankCard> bankCardList = iBkBankCardService.getListByBorker(taPerson.getPersonId());
+            if (CommConstant.PERSON_BROKER.equals(taPerson.getPersonType())) {
+                List<BkBankCard> bankCardList = iBkBankCardService.getListByBroker(taPerson.getPersonId());
                 result.put("bankCardList", bankCardList);
             }
 

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
-import com.yunzhi.marketing.borker.service.IBkAgreementService;
+import com.yunzhi.marketing.broker.service.IBkAgreementService;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.*;
@@ -349,7 +349,7 @@ public class TaBuildingController extends BaseController {
 //            @RequestParam(required = false) Integer maxPrice, // 最高价格
 //            @RequestParam(required = false) Double minBuildingArea, // 最小面积
 //            @RequestParam(required = false) Double maxBuildingArea, // 最大面积
-            @RequestParam(required = false) Boolean isBorker,   // 是否开启全民经纪人
+            @RequestParam(required = false) Boolean isBroker,   // 是否开启全民经纪人
             HttpServletRequest request
     ) {
         Integer orgId = getOrgId(request);
@@ -386,7 +386,7 @@ public class TaBuildingController extends BaseController {
                 isRecentOpening,
                 isCommerce,
                 marketStatus,
-                isBorker,
+                isBroker,
                 orderBy);
     }
 
@@ -539,8 +539,8 @@ public class TaBuildingController extends BaseController {
     }
 
     @ApiOperation(value = "admin - 开启全民经纪人", notes = "admin - 开启全民经纪人")
-    @PutMapping(value = "/admin/building/{id}/borker")
-    public  ResponseBean switchBorker(@ApiParam("楼盘ID") @PathVariable String id,
+    @PutMapping(value = "/admin/building/{id}/broker")
+    public  ResponseBean switchBroker(@ApiParam("楼盘ID") @PathVariable String id,
                                       @ApiParam(value = "是否开启", allowableValues = "true,false") @RequestParam Boolean on,
                                       HttpServletRequest request) throws Exception {
         TaBuilding taBuilding = taBuildingService.getById(id);
@@ -550,7 +550,7 @@ public class TaBuildingController extends BaseController {
 
         iBkAgreementService.switchByBuilding(id, on);
 
-        taBuilding.setIsBorker(on);
+        taBuilding.setIsBroker(on);
         taBuildingService.updateById(taBuilding);
         return ResponseBean.success("success");
     }

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

@@ -385,7 +385,7 @@ public class TaBuilding implements Serializable {
     private Integer isRecentOpening ;
 
     // 是否开启全民经纪人
-    private Boolean isBorker;
+    private Boolean isBroker;
 
     /**
      * 项目亮点封面

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

@@ -86,7 +86,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
                                          @Param("isRecentOpening") Boolean isRecentOpening,
                                          @Param("isCommerce") Boolean isCommerce,
                                          @Param("marketStatus") String marketStatus,
-                                         @Param("isBorker") Boolean isBorker,
+                                         @Param("isBroker") Boolean isBroker,
                                          @Param("orderBy") String orderBy,
                                          @Param("buildingAreaLisr") List<String> buildingAreaLisr);
 

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

@@ -3,8 +3,8 @@ package com.yunzhi.marketing.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.marketing.borker.vo.BorkerSummery;
-import com.yunzhi.marketing.borker.vo.BorkerVO;
+import com.yunzhi.marketing.broker.vo.BrokerSummery;
+import com.yunzhi.marketing.broker.vo.BrokerVO;
 import com.yunzhi.marketing.entity.TaBuildingDynamic;
 import com.yunzhi.marketing.entity.TaChannel;
 import com.yunzhi.marketing.entity.TaPerson;
@@ -267,7 +267,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     TaPerson getByPhone(@Param("phone") String phone);
 
-    IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page,
+    IPage<BrokerVO> getBrokerPage(IPage<BrokerVO> page,
                                   @Param("personType") String personType,
                                   @Param("name") String name,
                                   @Param("phone") String phone,
@@ -275,9 +275,9 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
                                   @Param("sortOrder") String sortOrder,
                                   @Param("sortField") String sortField);
 
-    IPage<BorkerSummery> getWxBorkerPage(IPage<BorkerSummery> page,
+    IPage<BrokerSummery> getWxBrokerPage(IPage<BrokerSummery> page,
                                          @Param("personType") String personType,
                                          @Param("recommendAgent") String recommendAgent);
 
-    IPage<BorkerSummery> getWxBorkerRankPage(IPage<BorkerSummery> page, @Param("personType") String personBorker, @Param("recommendAgent") String rankType);
+    IPage<BrokerSummery> getWxBrokerRankPage(IPage<BrokerSummery> page, @Param("personType") String personBroker, @Param("recommendAgent") String rankType);
 }

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

@@ -137,7 +137,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
             Boolean isRecentOpening,
             Boolean isCommerce,
             String marketStatus,
-            Boolean isBorker,
+            Boolean isBroker,
             String orderBy);
 
     /**

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

@@ -3,8 +3,8 @@ package com.yunzhi.marketing.service;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.base.ResponseBean;
-import com.yunzhi.marketing.borker.vo.BorkerSummery;
-import com.yunzhi.marketing.borker.vo.BorkerVO;
+import com.yunzhi.marketing.broker.vo.BrokerSummery;
+import com.yunzhi.marketing.broker.vo.BrokerVO;
 import com.yunzhi.marketing.center.taUser.entity.TaUserVO;
 import com.yunzhi.marketing.dto.PersonMarketingDTO;
 import com.yunzhi.marketing.entity.TaCustomerFrom;
@@ -133,9 +133,9 @@ public interface ITaPersonService extends IService<TaPerson> {
      */
     ResponseBean marketing(PersonMarketingDTO marketingDTO, String openid);
 
-    IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page, String name, String phone, String recommendPersonName, String sortOrder, String sortField);
+    IPage<BrokerVO> getBrokerPage(IPage<BrokerVO> page, String name, String phone, String recommendPersonName, String sortOrder, String sortField);
 
-    IPage<BorkerSummery> getWxBorkerPage(IPage<BorkerSummery> page, String personId);
+    IPage<BrokerSummery> getWxBrokerPage(IPage<BrokerSummery> page, String personId);
 
-    IPage<BorkerSummery> getWxBorkerRankPage(IPage<BorkerSummery> page, String rankType);
+    IPage<BrokerSummery> getWxBrokerRankPage(IPage<BrokerSummery> page, String rankType);
 }

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

@@ -872,7 +872,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             Boolean isRecentOpening,
             Boolean isCommerce,
             String marketStatus,
-            Boolean isBorker,
+            Boolean isBroker,
             String orderBy) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
@@ -933,7 +933,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                 isRecentOpening,
                 isCommerce,
                 marketStatus,
-                isBorker,
+                isBroker,
                 orderBy,
                 buildingAreaLisr);
 

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

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.ResponseBean;
-import com.yunzhi.marketing.borker.vo.BorkerSummery;
-import com.yunzhi.marketing.borker.vo.BorkerVO;
+import com.yunzhi.marketing.broker.vo.BrokerSummery;
+import com.yunzhi.marketing.broker.vo.BrokerVO;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
 import com.yunzhi.marketing.center.taUser.entity.TaUserVO;
 import com.yunzhi.marketing.center.taUser.mapper.TaUserMapper;
@@ -1348,17 +1348,17 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public IPage<BorkerVO> getBorkerPage(IPage<BorkerVO> page, String name, String phone, String recommendPersonName, String sortOrder, String sortField) {
-        return baseMapper.getBorkerPage(page, CommConstant.PERSON_BORKER, name, phone, recommendPersonName, sortOrder, sortField);
+    public IPage<BrokerVO> getBrokerPage(IPage<BrokerVO> page, String name, String phone, String recommendPersonName, String sortOrder, String sortField) {
+        return baseMapper.getBrokerPage(page, CommConstant.PERSON_BROKER, name, phone, recommendPersonName, sortOrder, sortField);
     }
 
     @Override
-    public IPage<BorkerSummery> getWxBorkerPage(IPage<BorkerSummery> page, String personId) {
-        return baseMapper.getWxBorkerPage(page, CommConstant.PERSON_BORKER, personId);
+    public IPage<BrokerSummery> getWxBrokerPage(IPage<BrokerSummery> page, String personId) {
+        return baseMapper.getWxBrokerPage(page, CommConstant.PERSON_BROKER, personId);
     }
 
     @Override
-    public IPage<BorkerSummery> getWxBorkerRankPage(IPage<BorkerSummery> page, String rankType) {
-        return baseMapper.getWxBorkerRankPage(page, CommConstant.PERSON_BORKER, rankType);
+    public IPage<BrokerSummery> getWxBrokerRankPage(IPage<BrokerSummery> page, String rankType) {
+        return baseMapper.getWxBrokerRankPage(page, CommConstant.PERSON_BROKER, rankType);
     }
 }

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

@@ -668,13 +668,13 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
         // 如果是全民经纪人
-        if (CommConstant.PERSON_BORKER.equals(person.getPersonType())) {
+        if (CommConstant.PERSON_BROKER.equals(person.getPersonType())) {
             TaBuilding taBuilding = taBuildingMapper.selectById(buildingId);
             if (null == taBuilding || CommConstant.STATUS_DELETE.equals(taBuilding.getStatus())) {
                 return ResponseBean.error("推荐楼盘不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
             }
 
-            if (null == taBuilding.getIsBorker() || !taBuilding.getIsBorker()) {
+            if (null == taBuilding.getIsBroker() || !taBuilding.getIsBroker()) {
                 return ResponseBean.error("推荐楼盘未开启经纪人推荐", ResponseBean.ERROR_ILLEGAL_PARAMS);
             }
 

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.DateUtils;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.TaBuilding;
@@ -29,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -153,27 +155,44 @@ public class ChannelCustomerController extends BaseController {
     /**
      * 驻场 结佣
      *
-     * @param
+     * @param bizType commission 结佣, signatory 签约
      * @return
      */
     @ApiOperation(value = "森哥看这里-wx-驻场确认结佣", notes = "森哥看这里-wx-驻场确认结佣")
-    @RequestMapping(value="/{plat}/marking/commission",method= RequestMethod.PUT)
-    public ResponseBean commissionCustomer(@RequestBody MarkingCommissionCustomerDTO params){
-        return iChannelCustomerService.commissionCustomer(params);
-    }
+    @RequestMapping(value="/{plat}/marking/{bizType}",method= RequestMethod.PUT)
+    public ResponseBean commissionCustomer(@RequestParam String bizType,
+                                           @RequestBody MarkingSignatoryCustomerDTO params) throws Exception {
+        List<String> whiteList = Arrays.asList("commission", "signatory");
+        if (!whiteList.contains(bizType)) {
+            return ResponseBean.error("404接口不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
 
-    /**
-     * 驻场 确认签约
-     *
-     * @param
-     * @return
-     */
-    @ApiOperation(value = "森哥看这里-wx-驻场确认签约", notes = "森哥看这里-wx-驻场确认签约")
-    @RequestMapping(value="/{plat}/marking/signatory",method= RequestMethod.PUT)
-    public ResponseBean signatoryCustomer(@RequestBody MarkingSignatoryCustomerDTO params){
-        return iChannelCustomerService.signatoryCustomer(params);
+        Integer bizStatus = null;
+        if ("commission".equals(bizType)) {
+            bizStatus = CommConstant.CUSTOMER_COMMISSION;
+        } else if ("signatory".equals(bizType)) {
+            bizStatus = CommConstant.CUSTOMER_SIGNED;
+        }
+
+//        return iChannelCustomerService.commissionCustomer(params);
+        iChannelCustomerService.updateBizNode(params, bizStatus, bizType);
+        return ResponseBean.success("操作成功");
     }
 
+//    /**
+//     * 驻场 确认签约
+//     *
+//     * @param
+//     * @return
+//     */
+//    @ApiOperation(value = "森哥看这里-wx-驻场确认签约", notes = "森哥看这里-wx-驻场确认签约")
+//    @RequestMapping(value="/{plat}/marking/signatory",method= RequestMethod.PUT)
+//    public ResponseBean signatoryCustomer(@RequestBody MarkingSignatoryCustomerDTO params) throws Exception {
+////        return iChannelCustomerService.signatoryCustomer(params);
+//        iChannelCustomerService.updateBizNode(params, CommConstant.CUSTOMER_SIGNED, "signatory");
+//        return ResponseBean.success("操作成功");
+//    }
+
 
     /**
      * 驻场 无效报备

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

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.xlk.dto;
 
 import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data

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

@@ -27,4 +27,13 @@ public class MarkingSignatoryCustomerDTO implements Serializable {
      * 认筹
      */
    private CustomerSignatory customerSignatory;
+
+    /** 总佣金 **/
+    private Integer totalCommission;
+
+    /** 已结算佣金 **/
+    private Integer settledCommission;
+
+    /** 待结算佣金 **/
+    private Integer unsettledCommission;
 }

src/main/java/com/yunzhi/marketing/xlk/entity/ChannelCustomer.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -23,6 +25,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
+@ApiModel(value="ChannelCustomer对象", description="渠道报备")
 @TableName("xlk_channel_customer")
 public class ChannelCustomer implements Serializable {
 
@@ -133,6 +136,16 @@ public class ChannelCustomer implements Serializable {
      */
     private String remark;
 
+
+    @ApiModelProperty("总佣金")
+    private Integer totalCommission;
+
+    @ApiModelProperty("已结算佣金")
+    private Integer settledCommission;
+
+    @ApiModelProperty("待结算佣金")
+    private Integer unsettledCommission;
+
     /**
      * 推荐人姓名
      */

src/main/java/com/yunzhi/marketing/xlk/entity/CustomerSignatory.java

@@ -116,4 +116,9 @@ public class CustomerSignatory implements Serializable {
     private String type ;
 
     private String channelCustomerId;
+
+    /**
+     * 佣金金额
+     */
+    private Integer brokerage;
 }

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

@@ -84,4 +84,13 @@ public interface IChannelCustomerService extends IService<ChannelCustomer> {
     ResponseBean getCustomersIRecommended(int pageNumber, int pageSize, RecommendCustomerDTO recommendCustomerDTO);
 
     ChannelCustomer getMoreInfoById(String id);
+
+    /**
+     * 变更交易节点
+     * @param params
+     * @param bizStatus
+     * @param bizType
+     * @throws Exception
+     */
+    void updateBizNode(MarkingSignatoryCustomerDTO params, Integer bizStatus, String bizType) throws Exception;
 }

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

@@ -492,4 +492,74 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
     public ChannelCustomer getMoreInfoById(String id) {
         return channelCustomerMapper.getMoreInfoById(id);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateBizNode(MarkingSignatoryCustomerDTO params, Integer bizStatus, String bizType) throws Exception {
+        LocalDateTime now = LocalDateTime.now();
+        CustomerSignatory customerSignatory = params.getCustomerSignatory();
+        customerSignatory.setCreateDate(now);
+        customerSignatory.setType(bizType);
+        customerSignatory.setCustomerId(params.getCustomerId());
+
+        // 以最新数据为准, 更新客户信息
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(customerSignatory.getCustomerId());
+        if (!StringUtils.isEmpty(customerSignatory.getRealtyConsultant())) {
+            taRecommendCustomer.setRealtyConsultant(customerSignatory.getRealtyConsultant());
+        } else {
+            customerSignatory.setRealtyConsultant(taRecommendCustomer.getRealtyConsultant());
+        }
+        taRecommendCustomer.setStatus(bizStatus);
+        taRecommendCustomerMapper.updateById(taRecommendCustomer);
+
+        // 更新报备记录
+        LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getCustomerId,params.getCustomerId());
+        ChannelCustomer customer = channelCustomerMapper.selectOne(channelCustomerLambdaQueryWrapper);
+        if (null != customer) {
+            if (CommConstant.CUSTOMER_SIGNED.equals(bizStatus)) {
+                customer.setSignedDate(now);
+            } else if (CommConstant.CUSTOMER_COMMISSION.equals(bizStatus)) {
+                customer.setCommissionDate(now);
+            }
+
+            if (StringUtils.isEmpty(customer.getRealtyConsultant())) {
+                customer.setRealtyConsultant(customerSignatory.getRealtyConsultant());
+            }
+
+            channelCustomerMapper.updateById(customer);
+
+            // 全民经纪人佣金处理
+            boolean isBroker = CommConstant.PERSON_BROKER.equals(customer.getRecommendPersonType());
+            if (isBroker) {
+                
+            }
+        }
+
+        // 推荐人
+        customerSignatory.setRecommendPerson(taRecommendCustomer.getRecommendPerson());
+        TaPerson recommendPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
+        if (null != recommendPerson) {
+            customerSignatory.setRecommendName(recommendPerson.getName());
+        }
+
+        // 职业顾问-接待人
+        if (!StringUtils.isEmpty(customerSignatory.getRealtyConsultant())) {
+            TaPerson realtyConsultant = taPersonMapper.getById(customerSignatory.getRealtyConsultant());
+            if (null != realtyConsultant) {
+                customerSignatory.setRealtyConsultantName(realtyConsultant.getName());
+            }
+        }
+
+        //
+        customerSignatory.setOrgId(taRecommendCustomer.getOrgId());
+        customerSignatory.setBuildingId(taRecommendCustomer.getBuildingId());
+
+        // 更新
+        if (StringUtils.isEmpty(customerSignatory.getCustomerSignatoryId())){
+            customerSignatoryMapper.insert(customerSignatory);
+        } else {
+            customerSignatoryMapper.updateById(customerSignatory);
+        }
+    }
 }

src/main/resources/mapper/BkAccountRecordMapper.xml

@@ -1,5 +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.yunzhi.marketing.borker.mapper.BkAccountRecordMapper">
+<mapper namespace="com.yunzhi.marketing.broker.mapper.BkAccountRecordMapper">
 
 </mapper>

src/main/resources/mapper/BkAgentrRuleMapper.xml

@@ -1,8 +1,8 @@
 <?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.yunzhi.marketing.borker.mapper.BkAgentRuleMapper">
+<mapper namespace="com.yunzhi.marketing.broker.mapper.BkAgentRuleMapper">
 
-    <select id="getByOrgId" resultType="com.yunzhi.marketing.borker.entity.BkAgentRule">
+    <select id="getByOrgId" resultType="com.yunzhi.marketing.broker.entity.BkAgentRule">
         SELECT
             *
         FROM

src/main/resources/mapper/BkAgreementMapper.xml

@@ -1,5 +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.yunzhi.marketing.borker.mapper.BkAgreementMapper">
+<mapper namespace="com.yunzhi.marketing.broker.mapper.BkAgreementMapper">
 
 </mapper>

src/main/resources/mapper/BkBankCardMapper.xml

@@ -1,8 +1,8 @@
 <?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.yunzhi.marketing.borker.mapper.BkBankCardMapper">
+<mapper namespace="com.yunzhi.marketing.broker.mapper.BkBankCardMapper">
 
-    <select id="getListByBorker" resultType="com.yunzhi.marketing.borker.entity.BkBankCard">
+    <select id="getListByBroker" resultType="com.yunzhi.marketing.broker.entity.BkBankCard">
         SELECT
             *
         FROM

src/main/resources/mapper/BkFirstScreenMapper.xml

@@ -1,5 +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.yunzhi.marketing.borker.mapper.BkFirstScreenMapper">
+<mapper namespace="com.yunzhi.marketing.broker.mapper.BkFirstScreenMapper">
 
 </mapper>

src/main/resources/mapper/BkNoticeMapper.xml

@@ -1,5 +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.yunzhi.marketing.borker.mapper.BkNoticeMapper">
+<mapper namespace="com.yunzhi.marketing.broker.mapper.BkNoticeMapper">
 
 </mapper>

src/main/resources/mapper/TaBuildingMapper.xml

@@ -135,8 +135,8 @@
                 <if test="isCommerce != null and isCommerce">
                     AND is_commerce = 1
                 </if>
-                <if test="isBorker != null and isBorker">
-                    AND is_borker = 1
+                <if test="isBroker != null and isBroker">
+                    AND is_broker = 1
                 </if>
                 <if test="isRecentOpening != null and isRecentOpening">
                     AND is_recent_opening = 1

src/main/resources/mapper/TaPersonMapper.xml

@@ -658,7 +658,7 @@ FROM
             t.phone = #{phone}
           AND t.`status` > -1
     </select>
-    <select id="getBorkerPage" resultType="com.yunzhi.marketing.borker.vo.BorkerVO">
+    <select id="getBrokerPage" resultType="com.yunzhi.marketing.broker.vo.BrokerVO">
         SELECT
             t.*,
             IFNULL(m.`name`, m.nickname) AS recommend_person_name,
@@ -696,11 +696,11 @@ FROM
             </if>
             ${sortOrder}
     </select>
-    <select id="getWxBorkerPage" resultType="com.yunzhi.marketing.borker.vo.BorkerSummery">
+    <select id="getWxBrokerPage" resultType="com.yunzhi.marketing.broker.vo.BrokerSummery">
         SELECT
             t.*,
             s.customer_num,
-            m.borker_num
+            m.broker_num
         FROM
             ta_person t
                 LEFT JOIN (
@@ -718,7 +718,7 @@ FROM
                 LEFT JOIN (
                 SELECT
                     a.recommend_agent,
-                    count( 1 ) AS borker_num
+                    count( 1 ) AS broker_num
                 FROM
                     ta_person a
                 WHERE
@@ -732,11 +732,11 @@ FROM
         ORDER BY
             t.create_date DESC
     </select>
-    <select id="getWxBorkerRankPage" resultType="com.yunzhi.marketing.borker.vo.BorkerSummery">
+    <select id="getWxBrokerRankPage" resultType="com.yunzhi.marketing.broker.vo.BrokerSummery">
         SELECT
             t.*,
             s.customer_num,
-            m.borker_num
+            m.broker_num
         FROM
             ta_person t
                 LEFT JOIN (
@@ -754,7 +754,7 @@ FROM
                 LEFT JOIN (
                 SELECT
                     a.recommend_agent,
-                    count( 1 ) AS borker_num
+                    count( 1 ) AS broker_num
                 FROM
                     ta_person a
                 WHERE
@@ -765,7 +765,7 @@ FROM
           AND t.`status` &gt; -1
         <if test="rankType == 'person'">
             ORDER BY
-            m.borker_num DESC
+            m.broker_num DESC
         </if>
         <if test="rankType == 'money'">
             ORDER BY