feats

src/main/java/com/yunzhi/marketing/broker/vo/BrokerSummery.java

@@ -41,4 +41,7 @@ public class BrokerSummery {
 
     @ApiModelProperty("总佣金")
     private Integer totalCommission;
+
+    @ApiModelProperty("总推荐金额")
+    private Integer referralFee;
 }

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

@@ -218,6 +218,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                     changeNotice.setCustomerName(customer.getName());
                     changeNotice.setNoticeType(CommConstant.NOTICE_TYPE_STATUS_CHANGE);
                     changeNotice.setContent("状态 到访");
+                    bkNoticeMapper.insert(changeNotice);
                 }
             }
             customerVisit.setRealtyConsultant(params.getRealtyConsultant());
@@ -422,6 +423,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 changeNotice.setCustomerName(customer.getName());
                 changeNotice.setNoticeType(CommConstant.NOTICE_TYPE_STATUS_CHANGE);
                 changeNotice.setContent("状态 认筹");
+                bkNoticeMapper.insert(changeNotice);
             }
         }
 
@@ -656,9 +658,14 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         return i == null ? 0 : i;
     }
 
-    private void processCommission(MarkingSignatoryCustomerDTO params, ChannelCustomer customer, TaPerson recommendPerson, String bizType, TaBuilding taBuilding) {
+    private void processCommission(MarkingSignatoryCustomerDTO params, ChannelCustomer customer, TaPerson recommendPerson, String bizType, TaBuilding taBuilding) throws Exception {
         if (null == recommendPerson) return;
 
+        // 校验数据, 总佣金 - 已结 < 当前结算
+        if (intIfNvl(params.getTotalCommission()) - intIfNvl(params.getSettledCommission()) < intIfNvl(params.getCurrentCommission())) {
+            throw new Exception("结算佣金填写错误");
+        }
+
         // 为了防止数据有改动, 比如更新操作
         // 那么需要把原来的值减掉,再使用新的值
         Integer totalCommission = intIfNvl(recommendPerson.getTotalCommission()) -
@@ -699,7 +706,8 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         }
 
         // 生成成交喜报
-        BkNotice bkNotice = bkNoticeMapper.getByPerson(CommConstant.NOTICE_TYPE_DEAL, recommendPerson.getName(), customer.getCustomerId());
+        BkNotice bkNotice = bkNoticeMapper.getByPerson(CommConstant.NOTICE_TYPE_DEAL, recommendPerson.getPersonId(), customer.getCustomerId());
+        String content = String.format("佣金 %.2f 元", (float) intIfNvl(params.getTotalCommission()) / 100 );
         if (null == bkNotice) {
             bkNotice = new BkNotice();
             bkNotice.setOrgId(taBuilding.getOrgId().toString());
@@ -712,8 +720,11 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             bkNotice.setCustomerName(customer.getName());
             // 佣金消息
             bkNotice.setNoticeType(CommConstant.NOTICE_TYPE_DEAL);
-            bkNotice.setContent(String.format("佣金 %.2f 元", (float) intIfNvl(params.getTotalCommission()) / 100 ));
+            bkNotice.setContent(content);
             bkNoticeMapper.insert(bkNotice);
+        } else {
+            bkNotice.setContent(content);
+            bkNoticeMapper.updateById(bkNotice);
         }
     }
 

src/main/resources/mapper/BkAccountRecordMapper.xml

@@ -21,7 +21,7 @@
             bk_account_record t
         WHERE
             t.channel_customer_id = #{channelCustomerId}
-            AND t.charge_code != #{chargeCode}
+            AND t.charge_code = #{chargeCode}
             AND t.`status` > -1
     </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -759,7 +759,9 @@ FROM
                     ta_person a
                 WHERE
                     a.person_type = #{personType}
-                  AND a.`status` > - 1
+                  AND a.`status` > - 1
+                GROUP BY
+                    a.recommend_person
             ) m ON m.recommend_agent = t.person_id
         WHERE t.person_type = #{personType}
           AND t.`status` > -1
@@ -799,7 +801,9 @@ FROM
                     ta_person a
                 WHERE
                     a.person_type = #{personType}
-                  AND a.`status` > - 1
+                  AND a.`status` > - 1
+                GROUP BY
+                    a.recommend_person
             ) m ON m.recommend_agent = t.person_id
         WHERE
             t.person_id = #{personId}