feats

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

@@ -54,6 +54,7 @@ public class BkAccountRecordController extends BaseController {
     public ResponseBean bkAccountRecordList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                             @ApiParam("收支类型") @RequestParam(value ="chargeCode", required = false) String chargeCode,
+                                            @ApiParam("是否已付佣金") @RequestParam(value ="isPayed", required = false) Boolean isPayed,
                                             HttpServletRequest request) throws Exception{
 
         String personId = getPersonId(request);
@@ -61,6 +62,7 @@ public class BkAccountRecordController extends BaseController {
         QueryWrapper<BkAccountRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_id", personId);
         queryWrapper.eq(!StringUtils.isEmpty(chargeCode),"charge_code", chargeCode);
+        queryWrapper.gt(null != isPayed && isPayed, "charges", 0);
         queryWrapper.orderByDesc("create_date");
 
         IPage<BkAccountRecord> result = iBkAccountRecordService.page(pg, queryWrapper);

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

@@ -3,6 +3,7 @@ package com.yunzhi.marketing.xlk.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yunzhi.marketing.xlk.entity.CustomerPreparatory;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CustomerPreparatoryMapper extends BaseMapper<CustomerPreparatory> {
 
+    CustomerPreparatory getByCustomerId(@Param("customerId") String customerId, @Param("buildingId") String buildingId);
 }

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

@@ -441,6 +441,13 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         }
         customerPreparatory.setOrgId(taRecommendCustomer.getOrgId());
         customerPreparatory.setCustomerId(taRecommendCustomer.getCustomerId());
+
+        // 校验是否已存在记录
+        CustomerPreparatory origin = customerPreparatoryMapper.getByCustomerId(customerPreparatory.getCustomerId(), customerPreparatory.getBuildingId());
+        if (origin != null && StringUtils.isEmpty(customerPreparatory.getCustomerPreparatoryId())) {
+            customerPreparatory.setCustomerPreparatoryId(origin.getCustomerPreparatoryId());
+        }
+
         if (StringUtils.isEmpty(customerPreparatory.getCustomerPreparatoryId())) {
             customerPreparatoryMapper.insert(customerPreparatory);
         } else {

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

@@ -2,4 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.marketing.xlk.mapper.CustomerPreparatoryMapper">
 
+    <select id="getByCustomerId" resultType="com.yunzhi.marketing.xlk.entity.CustomerPreparatory">
+        SELECT
+            *
+        FROM
+            `xlk_customer_preparatory` t
+        WHERE
+            t.customer_id = #{customerId}
+          AND t.building_id = #{buildingId}
+    </select>
 </mapper>