Merge #42 into master from pingkang

Merge branch 'master' of codeup.aliyun.com:60c06368dbbed34fe0f0c263/job/hr_job-...

* pingkang: (2 commits)
  聚星增加字段
  Merge branch 'master' of codeup.aliyun.com:60c06368dbbed34fe0f0c263/job/hr_job-...

Signed-off-by: 黄平康 <accounts_6361eaad7b63b44dd7833e63@mail.teambition.com>
Merged-by: 黄平康 <accounts_6361eaad7b63b44dd7833e63@mail.teambition.com>

CR-link: https://codeup.aliyun.com/60c06368dbbed34fe0f0c263/job/hr_job-kuaishou/change/42

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/entity/KuaiShouAdSocialOrder.java

@@ -47,6 +47,6 @@ public class KuaiShouAdSocialOrder implements Serializable {
     private Long activationNum;
     private Long comment;
     private Long payNum;
-
-
+    private Long excitationConsumption;
+    private Long awardAmount;
 }

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/entity/KuaiShouAdSocialOrderDailyData.java

@@ -32,6 +32,7 @@ public class KuaiShouAdSocialOrderDailyData implements Serializable {
     private Integer play5s;
     private Integer play3s;
     private Integer shareNum;
+    private Long excitationConsumption;
 
 
 }

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/mapper/xml/KuaiShouAdSocialMapper.xml

@@ -46,7 +46,7 @@
         app_download, star_release_time, conversion_num, play_5s, order_type,
         play_3s, star_name, amount, form_submission_num, play_3s_rate,
         audit_reject_reason, item_click_cnt, user_id, kwai_id, user_pay_amt,
-        activation_num, comment, pay_num, order_id
+        activation_num, comment, pay_num, order_id,excitation_consumption,award_amount
         )
         VALUES
         <foreach collection="list" item="item" separator=",">
@@ -58,7 +58,7 @@
             #{item.appDownload}, #{item.starReleaseTime}, #{item.conversionNum}, #{item.play5s}, #{item.orderType},
             #{item.play3s}, #{item.starName}, #{item.amount}, #{item.formSubmissionNum}, #{item.play3sRate},
             #{item.auditRejectReason}, #{item.itemClickCnt}, #{item.userId}, #{item.kwaiId}, #{item.userPayAmt},
-            #{item.activationNum}, #{item.comment}, #{item.payNum}, #{item.orderId}
+            #{item.activationNum}, #{item.comment}, #{item.payNum}, #{item.orderId}, #{item.excitationConsumption}, #{item.awardAmount}
             )
         </foreach>
     </insert>
@@ -72,7 +72,7 @@
         app_download, star_release_time, conversion_num, play_5s, order_type,
         play_3s, star_name, amount, form_submission_num, play_3s_rate,
         audit_reject_reason, item_click_cnt, user_id, kwai_id, user_pay_amt,
-        activation_num, comment, pay_num, order_id
+        activation_num, comment, pay_num, order_id,excitation_consumption,award_amount
         )
         VALUES
         <foreach collection="list" item="item" separator=",">
@@ -84,7 +84,7 @@
             #{item.appDownload}, #{item.starReleaseTime}, #{item.conversionNum}, #{item.play5s}, #{item.orderType},
             #{item.play3s}, #{item.starName}, #{item.amount}, #{item.formSubmissionNum}, #{item.play3sRate},
             #{item.auditRejectReason}, #{item.itemClickCnt}, #{item.userId}, #{item.kwaiId}, #{item.userPayAmt},
-            #{item.activationNum}, #{item.comment}, #{item.payNum}, #{item.orderId}
+            #{item.activationNum}, #{item.comment}, #{item.payNum}, #{item.orderId}, #{item.excitationConsumption}, #{item.awardAmount}
             )
         </foreach>
     </insert>
@@ -97,7 +97,7 @@
         view, item_impression_cnt, item_click_cnt, active_num,
         user_pay_amt, app_download, activation_num, action,
         comment, pay_num, conversion_num, play_5s,
-        play_3s, share_num
+        play_3s, share_num,excitation_consumption
         )
         VALUES
         <foreach collection="list" item="item" separator=",">
@@ -108,7 +108,7 @@
             #{item.view}, #{item.itemImpressionCnt}, #{item.itemClickCnt}, #{item.activeNum},
             #{item.userPayAmt}, #{item.appDownload}, #{item.activationNum}, #{item.action},
             #{item.comment}, #{item.payNum}, #{item.conversionNum}, #{item.play5s},
-            #{item.play3s}, #{item.shareNum}
+            #{item.play3s}, #{item.shareNum},#{item.excitationConsumption}
             )
         </foreach>
     </insert>
@@ -121,7 +121,7 @@
         view, item_impression_cnt, item_click_cnt, active_num,
         user_pay_amt, app_download, activation_num, action,
         comment, pay_num, conversion_num, play_5s,
-        play_3s, share_num
+        play_3s, share_num,excitation_consumption
         )
         VALUES
         <foreach collection="list" item="item" separator=",">
@@ -132,7 +132,7 @@
             #{item.view}, #{item.itemImpressionCnt}, #{item.itemClickCnt}, #{item.activeNum},
             #{item.userPayAmt}, #{item.appDownload}, #{item.activationNum}, #{item.action},
             #{item.comment}, #{item.payNum}, #{item.conversionNum}, #{item.play5s},
-            #{item.play3s}, #{item.shareNum}
+            #{item.play3s}, #{item.shareNum},#{item.excitationConsumption}
             )
         </foreach>
     </insert>