Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/master'

yumeng 1 gadu atpakaļ
vecāks
revīzija
81f4244f94

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

@@ -181,6 +181,7 @@ public class KuaishouSupplyChain {
     @ApiModelProperty(value = "结算服务费收入")
     private Long totalRegimentalSettleAmount;
     private String statDate;
+    private Integer statHour;
     private Long itemCommissionRate;
     /**
      * 创建时间

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

@@ -30,6 +30,7 @@
         regimental_promotion_amount,
         total_regimental_settle_amount,
         stat_date,
+        stat_hour,
         item_commission_rate
         )
         values
@@ -61,6 +62,7 @@
             #{add.regimentalPromotionAmount},
             #{add.totalRegimentalSettleAmount},
             #{add.statDate},
+            #{add.statHour},
             #{add.itemCommissionRate}
             )
 

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

@@ -30,6 +30,7 @@
         regimental_promotion_amount,
         total_regimental_settle_amount,
         stat_date,
+        stat_hour,
         item_commission_rate
         )
         values
@@ -61,6 +62,7 @@
             #{add.regimentalPromotionAmount},
             #{add.totalRegimentalSettleAmount},
             #{add.statDate},
+            #{add.statHour},
             #{add.itemCommissionRate}
             )
 

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

@@ -119,6 +119,7 @@ public class KuaishouSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyCh
             supplyChain.setRegimentalPromotionAmount(jsonObject.getLong("regimentalPromotionAmount"));
             supplyChain.setTotalRegimentalSettleAmount(jsonObject.getLong("totalRegimentalSettleAmount"));
             supplyChain.setStatDate(DateUtils.tempToDate(jsonObject.getLong("orderCreateTime")));
+            supplyChain.setStatHour(DateUtils.getHour(jsonObject.getLong("orderCreateTime")));
             supplyChain.setItemCommissionRate(itemMap.get(item.getLong("itemId")));
             supplyChains.add(supplyChain);
         }

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

@@ -120,6 +120,7 @@ public class MgsSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyChainMa
             supplyChain.setRegimentalPromotionAmount(jsonObject.getLong("regimentalPromotionAmount"));
             supplyChain.setTotalRegimentalSettleAmount(jsonObject.getLong("totalRegimentalSettleAmount"));
             supplyChain.setStatDate(DateUtils.tempToDate(jsonObject.getLong("orderCreateTime")));
+            supplyChain.setStatHour(DateUtils.getHour(jsonObject.getLong("orderCreateTime")));
             supplyChain.setItemCommissionRate(itemMap.get(item.getLong("itemId")));
             supplyChains.add(supplyChain);
         }