fix

netflix-dao/src/main/resources/mapper/UserDistributeBusinessRateMapper.xml

@@ -13,15 +13,37 @@
     </insert>
 
     <insert id="insertOrUpdateBusinessGoodsSkuRate">
-        insert into
-        user_distribute_business_rate(`business_id`,`goods_id`,`sku_id`,`first_order_rate`,`renew_order_rate`,`created_time`,`update_time`)
+        insert into user_distribute_business_rate
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            `business_id`,`goods_id`,`sku_id`,
+            <if test="firstOrderRate != null">
+                `first_order_rate`,
+            </if>
+            <if test="renewOrderRate != null">
+                `renew_order_rate`,
+            </if>
+            `created_time`,`update_time`
+        </trim>
         values
         <foreach collection="list" item="item" separator=",">
-            (#{item},#{goodsId},#{skuId},#{firstOrderRate},#{renewOrderRate},now(),now())
+            (#{item},#{goodsId},#{skuId},
+            <if test="firstOrderRate != null">
+                #{firstOrderRate},
+            </if>
+            <if test="renewOrderRate != null">
+                #{renewOrderRate},
+            </if>
+            now(),now())
         </foreach>
         ON DUPLICATE KEY UPDATE
-        first_order_rate = VALUES(first_order_rate),
-        renew_order_rate = VALUES(renew_order_rate)
+        <trim suffixOverrides=",">
+            <if test="firstOrderRate != null">
+                first_order_rate = VALUES(first_order_rate),
+            </if>
+            <if test="renewOrderRate != null">
+                renew_order_rate = VALUES(renew_order_rate)
+            </if>
+        </trim>
     </insert>
 
     <select id="selectNoThisGoodsDistribute" resultType="java.lang.Long">

netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -973,8 +973,8 @@ public class DistributeController {
 			}
 			UserDistributeBusinessGeneralRate dbGeneralRate = businessGeneralRateMapper.selectById(data.getId());
 			if (dbGeneralRate != null) {
-				Integer firstOrderRate_new = dbGeneralRate.getFirstOrderRate();
-				Integer renewOrderRate_new = dbGeneralRate.getRenewOrderRate();
+				Integer firstOrderRate_new = null;
+				Integer renewOrderRate_new = null;
 				AtomicBoolean is_change = new AtomicBoolean(false);
 				//需要更新首单比例
 				if (data.getFirstOrderRate() != null && dbGeneralRate.getFirstOrderRate() != data.getFirstOrderRate()) {