Prechádzať zdrojové kódy

kuaishou_supply_chain 去除id,更改stat_date类型

zhaoxian 9 mesiacov pred
rodič
commit
6f3e7bc3dd

+ 7 - 0
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -348,6 +348,13 @@ public class DateUtils extends PropertyEditorSupport {
         return d2;
     }
 
+    public static String tempToDateLong(long millis) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+        Date d1 = new Date(millis);
+        String d2 = simpleDateFormat.format(d1);
+        return d2;
+    }
+
 
     public static Long tempToLongDate(long millis) {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");

+ 1 - 1
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/settlementJob.java

@@ -217,7 +217,7 @@ public class settlementJob {
 
 
         String date = DateUtils.getNowDate("yyyy-MM-dd");
-        String yesDate = DateUtils.getAnotherDay("yyyy-MM-dd", date, -1);
+        String yesDate = DateUtils.getAnotherDay("yyyyMMdd", date, -1);
 
 
         for (int i = 0; i < cookies.size(); i++) {

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

@@ -17,8 +17,6 @@ import java.util.List;
  */
 public interface KuaishouSupplyChainMapper extends BaseMapper<KuaishouSupplyChain> {
 
-    void replace(@Param(value = "adds") List<KuaishouSupplyChain> supplyChains);
-
     List<JSONObject>  getCookie();
 
 

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

@@ -2,73 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.kuaishou.modules.batch.mapper.KuaishouSupplyChainMapper">
 
-    <insert id="replace">
-        replace into ruixuan.kuaishou_supply_chain(
-        id,
-        oid,
-        item_id,
-        item_title,
-        reserve_price,
-        image_url,
-        order_status,
-        order_create_time,
-        send_status,
-        settlement_biz_type,
-        settlement_biz_type_desc,
-        send_time,
-        recv_time,
-        seller_id,
-        promoter_id,
-        promoter_nick_name,
-        activity_id,
-        order_amount,
-        pay_amount,
-        regimental_promotion_rate,
-        share_rate,
-        base_amount,
-        service_amount,
-        regimental_promotion_amount,
-        total_regimental_settle_amount,
-        stat_date,
-        stat_hour,
-        item_commission_rate
-        )
-        values
-        <foreach collection="adds" item="add" separator=",">
-            (
-            #{add.id},
-            #{add.oid},
-            #{add.itemId},
-            #{add.itemTitle},
-            #{add.reservePrice},
-            #{add.imageUrl},
-            #{add.orderStatus},
-            #{add.orderCreateTime},
-            #{add.sendStatus},
-            #{add.settlementBizType},
-            #{add.settlementBizTypeDesc},
-            #{add.sendTime},
-            #{add.recvTime},
-            #{add.sellerId},
-            #{add.promoterId},
-            #{add.promoterNickName},
-            #{add.activityId},
-            #{add.orderAmount},
-            #{add.payAmount},
-            #{add.regimentalPromotionRate},
-            #{add.shareRate},
-            #{add.baseAmount},
-            #{add.serviceAmount},
-            #{add.regimentalPromotionAmount},
-            #{add.totalRegimentalSettleAmount},
-            #{add.statDate},
-            #{add.statHour},
-            #{add.itemCommissionRate}
-            )
-
-        </foreach>
-    </insert>
-
     <insert id="cleanKuaiShouPromoterBindChannel" parameterType="java.lang.Long">
         insert into ruixuan.promoter_bind_channel_date (promoter_id, promoter_name,promoter_url, user_id, user_name, stat_date,media_id)
         select t1.promoter_id, t1.promoter_nick_name, t1.promoter_url,t1.user_id, t1.user_name, #{date},media_id

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

@@ -4,7 +4,6 @@
 
     <insert id="replaceRuixuanSupplyChains">
         replace into ruixuan.kuaishou_supply_chain(
-        id,
         oid,
         item_id,
         item_title,
@@ -36,7 +35,6 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
-            #{add.id},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -72,7 +70,6 @@
     </insert>
     <insert id="replaceMgsSupplyChains">
         replace into miaogousi.kuaishou_supply_chain(
-        id,
         oid,
         item_id,
         item_title,
@@ -104,7 +101,6 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
-            #{add.id},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -138,7 +134,6 @@
     </insert>
     <insert id="replaceRocketSupplyChains">
         replace into rocket.kuaishou_supply_chain(
-        id,
         oid,
         item_id,
         item_title,
@@ -170,7 +165,6 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
-            #{add.id},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -205,7 +199,6 @@
     </insert>
     <insert id="replaceYufuSupplyChains">
         replace into yufu.kuaishou_supply_chain(
-        id,
         oid,
         item_id,
         item_title,
@@ -237,7 +230,6 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
-            #{add.id},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},

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

@@ -3,7 +3,6 @@
 <mapper namespace="cn.com.ctop.kuaishou.modules.batch.mapper.RocketSupplyChainMapper">
     <insert id="replaceRuixuanSupplyChains">
         replace into ruixuan.kuaishou_supply_chain(
-        id,
         oid,
         item_id,
         item_title,
@@ -35,7 +34,6 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
-            #{add.id},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -71,7 +69,6 @@
     </insert>
     <insert id="replaceMgsSupplyChains">
         replace into miaogousi.kuaishou_supply_chain(
-        id,
         oid,
         item_id,
         item_title,
@@ -103,7 +100,6 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
-            #{add.id},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -137,7 +133,6 @@
     </insert>
     <insert id="replaceRocketSupplyChains">
         replace into rocket.kuaishou_supply_chain(
-        id,
         oid,
         item_id,
         item_title,
@@ -169,7 +164,6 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
-            #{add.id},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -204,7 +198,6 @@
     </insert>
     <insert id="replaceYufuSupplyChains">
         replace into yufu.kuaishou_supply_chain(
-        id,
         oid,
         item_id,
         item_title,
@@ -236,7 +229,6 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
-            #{add.id},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},

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

@@ -7,7 +7,6 @@
 
     <insert id="replaceRuixuanSupplyChains">
         replace into ruixuan.kuaishou_supply_chain(
-        id,
         oid,
         item_id,
         item_title,
@@ -39,7 +38,6 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
-            #{add.id},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -75,7 +73,6 @@
     </insert>
     <insert id="replaceMgsSupplyChains">
         replace into miaogousi.kuaishou_supply_chain(
-        id,
         oid,
         item_id,
         item_title,
@@ -107,7 +104,6 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
-            #{add.id},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -141,7 +137,6 @@
     </insert>
     <insert id="replaceRocketSupplyChains">
         replace into rocket.kuaishou_supply_chain(
-        id,
         oid,
         item_id,
         item_title,
@@ -173,7 +168,6 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
-            #{add.id},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},
@@ -208,7 +202,6 @@
     </insert>
     <insert id="replaceYufuSupplyChains">
         replace into yufu.kuaishou_supply_chain(
-        id,
         oid,
         item_id,
         item_title,
@@ -240,7 +233,6 @@
         values
         <foreach collection="adds" item="add" separator=",">
             (
-            #{add.id},
             #{add.oid},
             #{add.itemId},
             #{add.itemTitle},

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

@@ -132,7 +132,7 @@ public class KuaishouSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyCh
             supplyChain.setServiceAmount(jsonObject.getLong("serviceAmount"));
             supplyChain.setRegimentalPromotionAmount(jsonObject.getLong("regimentalPromotionAmount"));
             supplyChain.setTotalRegimentalSettleAmount(jsonObject.getLong("totalRegimentalSettleAmount"));
-            supplyChain.setStatDate(DateUtils.tempToDate(jsonObject.getLong("orderCreateTime")));
+            supplyChain.setStatDate(DateUtils.tempToDateLong(jsonObject.getLong("orderCreateTime")));
             supplyChain.setStatHour(DateUtils.getHour(jsonObject.getLong("orderCreateTime")));
             supplyChain.setItemCommissionRate(itemMap.get(item.getLong("itemId")));
             Criteria criteria = new Criteria();

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

@@ -132,7 +132,7 @@ public class MgsSupplyChainServiceImpl extends ServiceImpl<KuaishouSupplyChainMa
             supplyChain.setServiceAmount(jsonObject.getLong("serviceAmount"));
             supplyChain.setRegimentalPromotionAmount(jsonObject.getLong("regimentalPromotionAmount"));
             supplyChain.setTotalRegimentalSettleAmount(jsonObject.getLong("totalRegimentalSettleAmount"));
-            supplyChain.setStatDate(DateUtils.tempToDate(jsonObject.getLong("orderCreateTime")));
+            supplyChain.setStatDate(DateUtils.tempToDateLong(jsonObject.getLong("orderCreateTime")));
             supplyChain.setStatHour(DateUtils.getHour(jsonObject.getLong("orderCreateTime")));
             supplyChain.setItemCommissionRate(itemMap.get(item.getLong("itemId")));
 

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

@@ -127,7 +127,7 @@ public class YufuSupplyChainServiceImpl extends ServiceImpl<YufuSupplyChainMappe
             supplyChain.setServiceAmount(jsonObject.getLong("serviceAmount"));
             supplyChain.setRegimentalPromotionAmount(jsonObject.getLong("regimentalPromotionAmount"));
             supplyChain.setTotalRegimentalSettleAmount(jsonObject.getLong("totalRegimentalSettleAmount"));
-            supplyChain.setStatDate(DateUtils.tempToDate(jsonObject.getLong("orderCreateTime")));
+            supplyChain.setStatDate(DateUtils.tempToDateLong(jsonObject.getLong("orderCreateTime")));
             supplyChain.setStatHour(DateUtils.getHour(jsonObject.getLong("orderCreateTime")));
             supplyChain.setItemCommissionRate(itemMap.get(item.getLong("itemId")));
             Criteria criteria = new Criteria();