2020-01-06

1.增量接口未抓到对应数据，调整成原接口。
2.定时任务改执行时间改短
3.是否对接sa_isupdate 至为 1

src/main/java/com/uas/eis/serviceImpl/InsertServiceImpl.java

@@ -72,13 +72,13 @@ public class InsertServiceImpl implements InsertService {
     }
 
     @Autowired
-    @Scheduled(cron = "0 0/10 * * * ?")
+    @Scheduled(cron = "0 0/8 * * * ?")
     public void getAllDate() {
 
 //        1.无淘宝自动抓取的 订单 ，则正常备份历史订单
 //          有淘宝自动抓取的 订单 ，则调用增量备份
         List<Trade> trades = new ArrayList<Trade>();
-        String sa_remark = baseDao.queryForObject("select distinct sa_remark from sale where sa_remark ='淘宝自动抓取' ", String.class);
+        String sa_remark = baseDao.queryForObject("select distinct sa_remark from sale where sa_remark ='淘宝对接接口抓所有' ", String.class);
 
         //String session_Key = baseDao.queryForObject(" select  tb_code from ( select  row_number() over(partition  by TB_OPENUID order by tb_date desc ) xuhao , tb_code from tbauthorization ) where xuhao=1 ", String.class);
         List<Map<String,Object>> list = baseDao.queryForList(" select  tb_code from ( select  row_number() over(partition  by TB_OPENUID order by tb_date desc ) xuhao , tb_code from tbauthorization ) where xuhao=1");
@@ -103,7 +103,15 @@ public class InsertServiceImpl implements InsertService {
                         ",extend_info,service_type,threepl_timing,is_o2o_passport,delivery_time,sign_time");
 
 
-                req.setStartCreated(StringUtils.parseDateTime("1990-01-01 00:00:00"));
+                Calendar calendar3 = Calendar.getInstance();
+                calendar3.setTime(new Date());
+
+                calendar3.set(Calendar.HOUR_OF_DAY, 0);
+                calendar3.set(Calendar.MINUTE, 0);
+                calendar3.set(Calendar.SECOND, 0);
+                calendar3.add(calendar3.DATE,-2);
+                Date zero3 = calendar3.getTime();
+//                req.setStartCreated(StringUtils.parseDateTime("2020-01-05 00:00:00"));
 
                 Date date = new Date();
                 Calendar calendar = Calendar.getInstance();
@@ -113,6 +121,9 @@ public class InsertServiceImpl implements InsertService {
                 calendar.set(Calendar.SECOND, 59);
                 Date endtime = calendar.getTime();
 
+
+
+                req.setStartCreated(zero3);
                 req.setEndCreated(endtime);
 
                 try {
@@ -150,14 +161,15 @@ public class InsertServiceImpl implements InsertService {
                 calendar2.set(Calendar.SECOND, 0);
                 Date zero = calendar2.getTime();
 
-                req2.setStartModified(zero);
-
+               req2.setStartModified(zero);
+//                req2.setStartModified(StringUtils.parseDateTime("2020-01-05 00:00:00"));
                 calendar2.set(Calendar.HOUR_OF_DAY, 23);
                 calendar2.set(Calendar.MINUTE, 59);
                 calendar2.set(Calendar.SECOND, 59);
                 Date endtime = calendar2.getTime();
 
-                req2.setEndModified(endtime);
+               req2.setEndModified(endtime);
+//                req2.setEndModified(StringUtils.parseDateTime("2020-01-05 23:59:59"));
                 try {
                     TradesSoldIncrementGetResponse rsp2 = client2.execute(req2, session_Key);
                     trades = rsp2.getTrades();
@@ -218,13 +230,13 @@ public class InsertServiceImpl implements InsertService {
 
 
 
-                    String INSERTSALESql = "insert into sale( SA_DISCOUNTFEE,SA_TRADESTATUS, sa_sellernick,sa_custcode,sa_paymentscode,SA_TAOBAOID,sa_payments,sa_custname,sa_kind,sa_wwh_user,sa_need15,sa_id,sa_tradeid,sa_code,sa_date,sa_recorder,sa_recorddate,sa_currency,sa_rate" +
+                    String INSERTSALESql = "insert into sale( SA_ISUPDATE,SA_DISCOUNTFEE,SA_TRADESTATUS, sa_sellernick,sa_custcode,sa_paymentscode,SA_TAOBAOID,sa_payments,sa_custname,sa_kind,sa_wwh_user,sa_need15,sa_id,sa_tradeid,sa_code,sa_date,sa_recorder,sa_recorddate,sa_currency,sa_rate" +
                             ",sa_apcustname,sa_need9,sa_toplace" +
                             ",sa_transport,sa_seller,sa_updatedate" +
                             ",sa_enddate,sa_statuscode,sa_status,sa_fare,sa_total" +
                             ",sa_recamount,sa_plandelivery,sa_printstatuscode,sa_remark)" +
-                            "  SELECT   "+trades.get(i).getDiscountFee() +",'"+trimNull(trades.get(i).getStatus() )+"','" + trimNull(trades.get(i).getSellerNick() ) + " ', 'GN0008358','P001', "   + trades.get(i).getTid() + " , '现结','HLK淘宝','国内标准销售订单', ' " +trimNull( trades.get(i).getReceiverName() ) + "  ' , ' " + trimNull(trades.get(i).getReceiverMobile()) + " ' , " + said + "," + trades.get(i).getTid() + "," + trades.get(i).getTid()
-                            + " , to_date (  '" + createdtime + "' ,'YYYY-MM-DD hh24:mi:ss') , '管理员',sysdate,'RMB','1','"
+                            "  SELECT   1,"+trades.get(i).getDiscountFee() +",'"+trimNull(trades.get(i).getStatus() )+"','" + trimNull(trades.get(i).getSellerNick() ) + " ', 'GN0008358','P001', "   + trades.get(i).getTid() + " , '现结','HLK淘宝','国内标准销售订单', ' " +trimNull( trades.get(i).getReceiverName() ) + "  ' , ' " + trimNull(trades.get(i).getReceiverMobile()) + " ' , " + said + "," + trades.get(i).getTid() + "," + trades.get(i).getTid()
+                            + " , to_date (  '" + end_time + "' ,'YYYY-MM-DD hh24:mi:ss') , '管理员',sysdate,'RMB','1','"
                             + trimNull(trades.get(i).getReceiverName() )+ "','" + trimNull( trades.get(i).getBuyerNick() )+ "','" + trimNull(trades.get(i).getReceiverState() ) + trimNull(trades.get(i).getReceiverCity() ) + trimNull(trades.get(i).getReceiverDistrict() ) +  trimNull( trades.get(i).getReceiverAddress() )+ "  ', '  "
                             + trimNull( trades.get(i).getShippingType() ) + "  ', ' " + trimNull (trades.get(i).getO2oGuideName() ) + "  ', to_date ( '" + modified
                             + "','YYYY-MM-DD hh24:mi:ss') , to_date ( '" +end_time + "','YYYY-MM-DD hh24:mi:ss') ,'ENTERING','在录入'," + trimNull( trades.get(i).getPostFee() )+ "," +trimNull( trades.get(i).getPayment() ) + ","
@@ -241,7 +253,7 @@ public class InsertServiceImpl implements InsertService {
 
                         String INSERTSALEDETAILSql = "insert into saledetail(SD_PROPERTIES,sd_remark,sd_id,sd_said,sd_code,sd_detno,sd_prodcode,sd_qty,sd_price,sd_total" +
                                 ",sd_statuscode,sd_status,sd_discount,SD_DIVIDE_ORDER_FEE,SD_PART_MJZ_DISCOUNT )" +
-                                "  SELECT  ' " + trimNull ( orders.get(j).getSkuPropertiesName() ) + " ' ,  ' " + orders.get(j).getTitle() + " ' , "  + sdid + " ," + said + "  ,' " +  sdid + " '," + k + "," + orders.get(j).getOuterIid() + "," + orders.get(j).getNum() + "," + orders.get(j).getPrice() + " ," + orders.get(j).getPayment() +
+                                "  SELECT  ' " + trimNull ( orders.get(j).getSkuPropertiesName() ) + " ' ,  ' " + orders.get(j).getTitle() + " ' , "  + sdid + " ," + said + "  ,' " +  sdid + " '," + k + ",'" + trimNull(orders.get(j).getOuterIid()) + "'," + orders.get(j).getNum() + "," + orders.get(j).getPrice() + " ," + orders.get(j).getPayment() +
                                 ",'ENTERING','在录入', " + orders.get(j).getDiscountFee()  +","+orders.get(j).getDivideOrderFee()  +","+orders.get(j).getPartMjzDiscount()  + " FROM DUAL   WHERE NOT EXISTS ( select sd_id from saledetail " +
                                 "WHERE  '" + trimNull(trades.get(i).getStatus() )  + "' NOT IN  ( 'TRADE_NO_CREATE_PAY','WAIT_BUYER_PAY','PAY_PENDING' )    AND  sd_id=" + sdid + "  )  AND  NOT EXISTS ( select sd_id from  sale left join  saledetail on sa_id=sd_said " +
                                 "WHERE SA_TAOBAOID = " + trades.get(i).getTid() +  "  and sd_detno = "  + k +" )  ";