yumeng há 1 ano atrás
pai
commit
0778d654c4

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

@@ -121,6 +121,7 @@ public class JyOrderList
     @Excel(name = "结算服务费收入")
     private Long totalRegimentalSettleAmount;
     private Long mcnPromotionAmount;
+    private Long mcnSettlementAmount;
 
     /** 订单时间 */
     @Excel(name = "订单时间")
@@ -356,6 +357,14 @@ public class JyOrderList
         this.mcnPromotionAmount = mcnPromotionAmount;
     }
 
+    public Long getMcnSettlementAmount() {
+        return mcnSettlementAmount;
+    }
+
+    public void setMcnSettlementAmount(Long mcnSettlementAmount) {
+        this.mcnSettlementAmount = mcnSettlementAmount;
+    }
+
     public Long getStatDate() {
         return statDate;
     }
@@ -403,6 +412,7 @@ public class JyOrderList
                 ", regimentalPromotionAmount=" + regimentalPromotionAmount +
                 ", totalRegimentalSettleAmount=" + totalRegimentalSettleAmount +
                 ", mcnPromotionAmount=" + mcnPromotionAmount +
+                ", mcnSettlementAmount=" + mcnSettlementAmount +
                 ", statDate=" + statDate +
                 ", statHour=" + statHour +
                 '}';

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

@@ -32,7 +32,8 @@
         stat_date,
         stat_hour,
         commission_rate,
-        mcn_promotion_amount
+        mcn_promotion_amount,
+        mcn_settlement_amount
         )
         values
         <foreach collection="adds" item="add" separator=",">
@@ -66,7 +67,8 @@
             #{add.statDate},
             #{add.statHour},
             #{add.commissionRate},
-            #{add.mcnPromotionAmount}
+            #{add.mcnPromotionAmount},
+            #{add.mcnSettlementAmount}
             )
         </foreach>
 

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

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