feats

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

@@ -27,7 +27,7 @@ public class BkAccountRecord implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "流水ID")
-    @TableId(value = "rec_id", type = IdType.INPUT)
+    @TableId(value = "rec_id", type = IdType.UUID)
     private String recId;
 
     @ApiModelProperty(value = "报备ID")

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

@@ -667,7 +667,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             bkNotice.setCustomerName(customer.getName());
             // 佣金消息
             bkNotice.setNoticeType(CommConstant.NOTICE_TYPE_DEAL);
-            bkNotice.setContent(String.format("佣金 %d", params.getTotalCommission()));
+            bkNotice.setContent(String.format("佣金 %.2f 元", (float) intIfNvl(params.getTotalCommission()) / 100 ));
             bkNoticeMapper.insert(bkNotice);
         }
     }

src/main/resources/mapper/BkAgentrRuleMapper.xml

@@ -22,9 +22,9 @@
             *
         FROM
             bk_agent_rule t
-        WHERE
-            t.city_id = #{cityId}
-            AND t.`status` > -1
+        WHERE t.`status` > -1
+<!--             t.city_id = #{cityId}  -->
+<!--             AND t.`status` &gt; -1  -->
         ORDER BY
             t.create_date DESC
             LIMIT 1