yumeng преди 1 година
родител
ревизия
0227bc6158

+ 10 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/JyOrderList.java

@@ -120,6 +120,7 @@ public class JyOrderList
     /** 结算服务费收入 */
     @Excel(name = "结算服务费收入")
     private Long totalRegimentalSettleAmount;
+    private Long mcnPromotionAmount;
 
     /** 订单时间 */
     @Excel(name = "订单时间")
@@ -347,6 +348,14 @@ public class JyOrderList
         this.totalRegimentalSettleAmount = totalRegimentalSettleAmount;
     }
 
+    public Long getMcnPromotionAmount() {
+        return mcnPromotionAmount;
+    }
+
+    public void setMcnPromotionAmount(Long mcnPromotionAmount) {
+        this.mcnPromotionAmount = mcnPromotionAmount;
+    }
+
     public Long getStatDate() {
         return statDate;
     }
@@ -393,6 +402,7 @@ public class JyOrderList
                 ", commissionRate=" + commissionRate +
                 ", regimentalPromotionAmount=" + regimentalPromotionAmount +
                 ", totalRegimentalSettleAmount=" + totalRegimentalSettleAmount +
+                ", mcnPromotionAmount=" + mcnPromotionAmount +
                 ", statDate=" + statDate +
                 ", statHour=" + statHour +
                 '}';

+ 0 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/JiaoYangFenXiaoMapper.java

@@ -10,7 +10,6 @@ import java.util.List;
 public interface JiaoYangFenXiaoMapper {
     List<JSONObject> getCookie();
 
-
     void replace(@Param("adds") List<JyOrderList> adds);
 
     void replaceClipCooperation(@Param("adds") List<JyClipCooperation> adds);

+ 4 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/JiaoYangFenXiaoMapper.xml

@@ -31,7 +31,8 @@
         total_regimental_settle_amount,
         stat_date,
         stat_hour,
-        commission_rate
+        commission_rate,
+        mcn_promotion_amount
         )
         values
         <foreach collection="adds" item="add" separator=",">
@@ -64,7 +65,8 @@
             #{add.totalRegimentalSettleAmount},
             #{add.statDate},
             #{add.statHour},
-            #{add.commissionRate}
+            #{add.commissionRate},
+            #{add.mcnPromotionAmount}
             )
         </foreach>
 

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/JiaoYangFenXiaoServiceImpl.java

@@ -111,6 +111,7 @@ public class JiaoYangFenXiaoServiceImpl implements IJiaoYangFenXiaoService {
             order.setTotalRegimentalSettleAmount(jsonObject.getLong("totalRegimentalSettleAmount"));
             order.setStatDate(DateUtils.tempToLongDate(jsonObject.getLong("orderCreateTime")));
             order.setStatHour(DateUtils.getHour(jsonObject.getLong("orderCreateTime")));
+            order.setMcnPromotionAmount(jsonObject.getLong("mcnPromotionAmount"));
             orders.add(order);
         }
         jiaoYangFenXiaoMapper.replace(orders);