feats

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

@@ -5,6 +5,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.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +21,8 @@ import com.yunzhi.marketing.broker.service.IBkAccountRecordService;
 import com.yunzhi.marketing.broker.entity.BkAccountRecord;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 经纪人佣金流水 前端控制器
@@ -31,7 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Api(tags = "经纪人佣金流水")
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class BkAccountRecordController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(BkAccountRecordController.class);
@@ -46,17 +49,22 @@ public class BkAccountRecordController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/bkAccountRecord",method= RequestMethod.GET)
+    @RequestMapping(value="/wx/bkAccountRecord",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean bkAccountRecordList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @ApiParam("收支类型") @RequestParam(value ="chargeCode", required = false) String chargeCode,
+                                            HttpServletRequest request) throws Exception{
 
-		    IPage<BkAccountRecord> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<BkAccountRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        String personId = getPersonId(request);
+        IPage<BkAccountRecord> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<BkAccountRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", personId);
+        queryWrapper.eq(!StringUtils.isEmpty(chargeCode),"charge_code", chargeCode);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<BkAccountRecord> result = iBkAccountRecordService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<BkAccountRecord> result = iBkAccountRecordService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**

src/main/java/com/yunzhi/marketing/broker/controller/BkInviteRecordController.java

@@ -1,15 +1,52 @@
 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.broker.entity.BkInviteRecord;
 import com.yunzhi.marketing.broker.service.IBkInviteRecordService;
+import com.yunzhi.marketing.common.StringUtils;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 @Api(tags = "经济人邀请记录对象功能接口")
 @RestController
-@RequestMapping("/")
-public class BkInviteRecordController {
+@RequestMapping("/api")
+public class BkInviteRecordController extends BaseController {
     @Autowired
     private IBkInviteRecordService bkInviteRecordService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/bkInviteRecord",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean bkInviteRecordList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           @ApiParam("是否已付佣金") @RequestParam(value ="isPayed", required = false) Boolean isPayed,
+                                           HttpServletRequest request) throws Exception{
+
+        String personId = getPersonId(request);
+        IPage<BkInviteRecord> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<BkInviteRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", personId);
+        queryWrapper.gt(null != isPayed && isPayed, "referral_fee", 0);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<BkInviteRecord> result = bkInviteRecordService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
 }

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

@@ -387,4 +387,7 @@ public class TaPerson implements Serializable {
 
     @ApiModelProperty("待结算佣金")
     private Integer unsettledCommission;
+
+    @ApiModelProperty("推荐佣金")
+    private Integer referralFee;
 }

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

@@ -196,12 +196,29 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         // 渠道推荐的客户
         if ("report".equals(params.getType())) {
             ChannelCustomer customer = channelCustomerMapper.selectById(params.getId());
+            TaBuilding building = taBuildingMapper.selectById(customer.getBuildingId());
 
             customerVisit.setBuildingId(customer.getBuildingId());
             customerVisit.setRecommendPerson(customer.getRecommendPerson());
             TaPerson recommendPerson = taPersonMapper.getById(customer.getRecommendPerson());
             if (null != recommendPerson) {
                 customerVisit.setRecommendName(recommendPerson.getName());
+
+                boolean isBroker = CommConstant.PERSON_BROKER.equals(customer.getRecommendPersonType());
+                if (isBroker) {
+                    // 生成节点变更通知
+                    BkNotice changeNotice = new BkNotice();
+                    changeNotice.setOrgId(building.getOrgId().toString());
+                    changeNotice.setInstitutionId(building.getInstitutionId());
+                    changeNotice.setBuildingId(building.getBuildingId());
+                    changeNotice.setBuildingName(building.getBuildingName());
+                    changeNotice.setPersonId(recommendPerson.getPersonId());
+                    changeNotice.setPersonName(StringUtils.ifNull(recommendPerson.getName(), recommendPerson.getNickname()));
+                    changeNotice.setCustomerId(customer.getCustomerId());
+                    changeNotice.setCustomerName(customer.getName());
+                    changeNotice.setNoticeType(CommConstant.NOTICE_TYPE_STATUS_CHANGE);
+                    changeNotice.setContent("状态 到访");
+                }
             }
             customerVisit.setRealtyConsultant(params.getRealtyConsultant());
             TaPerson channelPerson = taPersonMapper.getById(params.getRealtyConsultant());
@@ -216,7 +233,6 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             queryWrapper.eq(TaRecommendCustomer::getBuildingId,customer.getBuildingId());
             TaRecommendCustomer recommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
             if (null == recommendCustomer) {
-                TaBuilding building = taBuildingMapper.selectById(customer.getBuildingId());
                 // 进业务客户表
                 TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
                 taRecommendCustomer.setName(customerVisit.getName());
@@ -267,6 +283,8 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             } else {
                 return ResponseBean.error("该客户已到访", ResponseBean.ERROR_UNAVAILABLE);
             }
+
+
         }else if ("customer".equals(params.getType())) {
             // 置业顾问 经纪人推荐的客户
             TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(params.getId());
@@ -370,21 +388,50 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         taRecommendCustomer.setRealtyConsultant(customerPreparatory.getRealtyConsultant());
         taRecommendCustomerMapper.updateById(taRecommendCustomer);
 
+        TaBuilding taBuilding = taBuildingMapper.selectById(taRecommendCustomer.getBuildingId());
+        if (taBuilding == null) {
+            return ResponseBean.error("校验客户及楼盘信息异常", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        customerPreparatory.setBuildingId(taRecommendCustomer.getBuildingId());
+
+        // 推荐人
+        customerPreparatory.setRecommendPerson(taRecommendCustomer.getRecommendPerson());
+        TaPerson recommendPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
+        if (null != recommendPerson) {
+            customerPreparatory.setRecommendName(recommendPerson.getName());
+        }
+
         LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
         channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getCustomerId,params.getCustomerId());
         ChannelCustomer customer = channelCustomerMapper.selectOne(channelCustomerLambdaQueryWrapper);
         if (null != customer) {
             customer.setPreparatoryDate(LocalDateTime.now());
             channelCustomerMapper.updateById(customer);
+
+            boolean isBroker = CommConstant.PERSON_BROKER.equals(customer.getRecommendPersonType());
+            if (isBroker) {
+                // 生成节点变更通知
+                BkNotice changeNotice = new BkNotice();
+                changeNotice.setOrgId(taBuilding.getOrgId().toString());
+                changeNotice.setInstitutionId(taBuilding.getInstitutionId());
+                changeNotice.setBuildingId(taBuilding.getBuildingId());
+                changeNotice.setBuildingName(taBuilding.getBuildingName());
+                changeNotice.setPersonId(recommendPerson.getPersonId());
+                changeNotice.setPersonName(StringUtils.ifNull(recommendPerson.getName(), recommendPerson.getNickname()));
+                changeNotice.setCustomerId(customer.getCustomerId());
+                changeNotice.setCustomerName(customer.getName());
+                changeNotice.setNoticeType(CommConstant.NOTICE_TYPE_STATUS_CHANGE);
+                changeNotice.setContent("状态 认筹");
+            }
         }
 
         customerPreparatory.setCreateDate(LocalDateTime.now());
-        customerPreparatory.setBuildingId(taRecommendCustomer.getBuildingId());
-        customerPreparatory.setRecommendPerson(taRecommendCustomer.getRecommendPerson());
-        TaPerson recommendPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
-        if (null != recommendPerson) {
-            customerPreparatory.setRealtyConsultantName(recommendPerson.getName());
-        }
+//        customerPreparatory.setBuildingId(taRecommendCustomer.getBuildingId());
+//        customerPreparatory.setRecommendPerson(taRecommendCustomer.getRecommendPerson());
+//        TaPerson recommendPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
+//        if (null != recommendPerson) {
+//            customerPreparatory.setRealtyConsultantName(recommendPerson.getName());
+//        }
         customerPreparatory.setRealtyConsultant(taRecommendCustomer.getRealtyConsultant());
         TaPerson channelPerson = taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
         if (null != channelPerson) {
@@ -394,7 +441,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         customerPreparatory.setCustomerId(taRecommendCustomer.getCustomerId());
         if (StringUtils.isEmpty(customerPreparatory.getCustomerPreparatoryId())) {
             customerPreparatoryMapper.insert(customerPreparatory);
-        }else {
+        } else {
             customerPreparatoryMapper.updateById(customerPreparatory);
         }
 
@@ -571,6 +618,19 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 if (null != params.getTotalCommission() && params.getTotalCommission() > 0) {
                     processCommission(params, customer, recommendPerson, bizType, taBuilding);
                 }
+                // 生成节点变更通知
+                BkNotice changeNotice = new BkNotice();
+                changeNotice.setOrgId(taBuilding.getOrgId().toString());
+                changeNotice.setInstitutionId(taBuilding.getInstitutionId());
+                changeNotice.setBuildingId(taBuilding.getBuildingId());
+                changeNotice.setBuildingName(taBuilding.getBuildingName());
+                changeNotice.setPersonId(recommendPerson.getPersonId());
+                changeNotice.setPersonName(StringUtils.ifNull(recommendPerson.getName(), recommendPerson.getNickname()));
+                changeNotice.setCustomerId(customer.getCustomerId());
+                changeNotice.setCustomerName(customer.getName());
+                changeNotice.setNoticeType(CommConstant.NOTICE_TYPE_STATUS_CHANGE);
+                changeNotice.setContent(String.format("状态 %s", getStatusDesc(bizType)));
+                bkNoticeMapper.insert(changeNotice);
             }
 
             channelCustomerMapper.updateById(customer);
@@ -638,21 +698,6 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             bkAccountRecordMapper.insert(bkAccountRecord);
         }
 
-        // 生成节点变更通知
-        BkNotice changeNotice = new BkNotice();
-        changeNotice.setOrgId(taBuilding.getOrgId().toString());
-        changeNotice.setInstitutionId(taBuilding.getInstitutionId());
-        changeNotice.setBuildingId(taBuilding.getBuildingId());
-        changeNotice.setBuildingName(taBuilding.getBuildingName());
-        changeNotice.setPersonId(recommendPerson.getPersonId());
-        changeNotice.setPersonName(StringUtils.ifNull(recommendPerson.getName(), recommendPerson.getNickname()));
-        changeNotice.setCustomerId(customer.getCustomerId());
-        changeNotice.setCustomerName(customer.getName());
-        changeNotice.setNoticeType(CommConstant.NOTICE_TYPE_STATUS_CHANGE);
-        changeNotice.setContent(String.format("状态 %s", getStatusDesc(bizType)));
-        bkNoticeMapper.insert(changeNotice);
-
-
         // 生成成交喜报
         BkNotice bkNotice = bkNoticeMapper.getByPerson(CommConstant.NOTICE_TYPE_DEAL, recommendPerson.getName(), customer.getCustomerId());
         if (null == bkNotice) {
@@ -696,9 +741,11 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         BkAgentRule agentRule = bkAgentRuleMapper.getByCity(taBuilding.getCityId());
         if (null == agentRule) return;
 
+        // 记录明细
         bkInviteRecord.setReferralFee(agentRule.getReferralFee());
         bkInviteRecordMapper.updateById(bkInviteRecord);
-
+        // 累积总额
+        taPersonMapper.setFieldIncrement(personId, "referral_fee", agentRule.getReferralFee());
     }
 
     private String getStatusDesc(String bizType) {