2020-11-25

增加部分订单字段 比如商品属性SD_PROPERTIES等

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

@@ -11,12 +11,14 @@ import com.uas.eis.service.InsertService;
 import net.sf.json.JSON;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import oracle.sql.DATE;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import com.uas.eis.utils.DateUtil;
 import java.util.*;
 
 import com.taobao.api.request.TradesSoldGetRequest;
@@ -61,6 +63,13 @@ public class InsertServiceImpl implements InsertService {
         return null;
     }
 
+    public  String trimNull(String str){
+        if("".equals(str)||str==null||"null".equals(str)){
+            return "";
+        }else{
+            return str.trim();
+        }
+    }
 
     @Autowired
   @Scheduled(cron = "0 0 0/1 * * ?")
@@ -74,7 +83,13 @@ public class InsertServiceImpl implements InsertService {
         if (sa_remark == null || sa_remark == "") {
             TaobaoClient client = new DefaultTaobaoClient("http://gw.api.taobao.com/router/rest", "31921866", "7121c52d4c9970ba08bf09e2f525acd0");
             TradesSoldGetRequest req = new TradesSoldGetRequest();  //正常备份接口
-            req.setFields("tid,type,status,payment,orders,rx_audit_status,trades");
+            req.setFields("tid,type,status,payment,orders,rx_audit_status,trades,receiver_name,receiver_phone,created,buyer_nick,receiver_state" +
+                    ",receiver_address,shipping_type,o2o_guide_name,modified,end_time,post_fee,payment,total_fee,consign_time,sku_properties_name");
+
+
+
+
+
             req.setStartCreated(StringUtils.parseDateTime("1990-01-01 00:00:00"));
 
             Date date = new Date();
@@ -98,7 +113,8 @@ public class InsertServiceImpl implements InsertService {
         } else {
             TaobaoClient client2 = new DefaultTaobaoClient("http://gw.api.taobao.com/router/rest", "31921866", "7121c52d4c9970ba08bf09e2f525acd0");
             TradesSoldIncrementGetRequest req2 = new TradesSoldIncrementGetRequest();  //增量备份接口
-            req2.setFields("tid,type,status,payment,orders,rx_audit_status,trades");
+            req2.setFields("tid,type,status,payment,orders,rx_audit_status,trades,receiver_name,receiver_phone,created,buyer_nick,receiver_state" +
+                    ",receiver_address,shipping_type,o2o_guide_name,modified,end_time,post_fee,payment,total_fee,consign_time,sku_properties_name");
 
             Date date2 = new Date();
             Calendar calendar2 = Calendar.getInstance();
@@ -136,22 +152,61 @@ public class InsertServiceImpl implements InsertService {
 
                 //
                 /*  插入淘宝订单ID  sa_tradeid 字段 alter table sale  add sa_tradeid number; */
-
+//                logger.info(trades.get(i).getEndTime());
+//                logger.info(new DATE());
                 Long said = baseDao.queryForObject("select sale_seq.nextval from dual", Long.class);
                 said = said + i ;
                 String sa_code = baseDao.sGetMaxNumber("Sale", 2);
+                SimpleDateFormat formatdx = new SimpleDateFormat("yyyy-MM-dd HH:MM:ss");
+                String createdtime="2020-11-25";
+                if(trades.get(i).getCreated() == null ) {
+                    createdtime =   formatdx.format(new DATE());
+//                    createdtime = new SimpleDateFormat("YYYY-MM-DD HH:mm:ss").format(new DATE());
+                } else {
+                    createdtime = formatdx.format(trades.get(i).getCreated());
+                }
+
+                String modified="2020-11-25";
+                if(trades.get(i).getModified() == null ) {
+                    modified = formatdx.format(trades.get(i).getCreated());
+                } else {
+                     modified = formatdx.format(trades.get(i).getModified());
+                }
+
+                String end_time="2020-11-25";
+                if(trades.get(i).getEndTime() == null ) {
+                    end_time = formatdx.format(trades.get(i).getCreated());
+                } else {
+                     end_time =  formatdx.format( trades.get(i).getEndTime() );
+                }
+
+                String consigntime="2020-11-25";
+                if(trades.get(i).getConsignTime() == null ) {
+                    consigntime = formatdx.format(trades.get(i).getCreated());
+                } else {
+                     consigntime = formatdx.format( trades.get(i).getConsignTime() );
+                }
+
+                if(trades.get(i).getConsignTime() == null ) {
+                    consigntime = formatdx.format(trades.get(i).getCreated());
+                } else {
+                    consigntime = formatdx.format( trades.get(i).getConsignTime() );
+                }
+
+//                logger.info(createdtime);
+
 
                 String INSERTSALESql = "insert into sale( 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_shcustname,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  'GN0008358','P001', "   + trades.get(i).getTid() + " , '现结','HLK淘宝','国内标准销售订单', " + trades.get(i).getReceiverName() + "  , " + trades.get(i).getReceiverPhone() + "," + said + "," + trades.get(i).getTid() + "," + sa_code
-                        + " ," + trades.get(i).getCreated() + "," + trades.get(i).getBuyerNick() + ",sysdate,'RMB','1',"
-                        + trades.get(i).getReceiverName() + "," + trades.get(i).getBuyerNick() + "," + trades.get(i).getReceiverState() + " || " + trades.get(i).getReceiverAddress() + ","
-                        + trades.get(i).getShippingType() + "," + trades.get(i).getO2oGuideName() + "," + trades.get(i).getModified()
-                        + "," + trades.get(i).getEndTime() + ",'entering','在录入'," + trades.get(i).getPostFee() + "," + trades.get(i).getPayment() + ","
-                        + trades.get(i).getTotalFee() + "," + trades.get(i).getConsignTime() + ",'unprint', '淘宝自动抓取'   FROM DUAL  " +
+                        "  SELECT  'GN0008358','P001', "   + trades.get(i).getTid() + " , '现结','HLK淘宝','国内标准销售订单', ' " +trimNull( trades.get(i).getReceiverName() ) + "  ' , ' " + trimNull(trades.get(i).getReceiverPhone()) + " ' , " + said + "," + trades.get(i).getTid() + "," + sa_code
+                        + " , to_date (  '" + createdtime + "' ,'YYYY-MM-DD hh24:mi:ss') , ' " + trimNull( trades.get(i).getBuyerNick() ) + " ',sysdate,'RMB','1','"
+                        + trimNull(trades.get(i).getReceiverName() )+ "','" + trimNull( trades.get(i).getBuyerNick() )+ "','" + trimNull(trades.get(i).getReceiverState() ) + "  || " + 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() ) + ","
+                        + trimNull(trades.get(i).getTotalFee() ) + " , to_date ( '" +consigntime + "','YYYY-MM-DD hh24:mi:ss') ,'unprint', '淘宝自动抓取'   FROM DUAL  " +
                         " WHERE NOT EXISTS ( select sa_id from sale WHERE SA_iD=" + said +  " )    AND  NOT EXISTS ( select SA_TAOBAOID from sale WHERE SA_TAOBAOID=" + trades.get(i).getTid() + "   )  ";
                 insertSqlsList.add(INSERTSALESql);
 
@@ -163,10 +218,10 @@ public class InsertServiceImpl implements InsertService {
                     //
                     Long sdid = baseDao.queryForObject("select saledetail_seq.nextval from dual", Long.class);
                     sdid = sdid +L;
-                    String INSERTSALEDETAILSql = "insert into saledetail(sd_remark,sd_id,sd_said,sd_code,sd_detno,sd_prodcode,sd_qty,sd_price,sd_total" +
+                    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)" +
-                            "  SELECT  ' " + orders.get(j).getTitle() + " ' , "  + sdid + " ," + said + "  ,' " +  sdid + " '," + k + "," + orders.get(j).getNumIid() + "," + orders.get(j).getNum() + "," + orders.get(j).getPrice() + " ," + orders.get(j).getTotalFee() +
-                            ",'entering','在录入'," + orders.get(j).getDiscountFee() + " FROM DUAL   WHERE NOT EXISTS ( select sd_id from saledetail " +
+                            "  SELECT  ' " + trimNull ( orders.get(j).getSkuPropertiesName() ) + " ' ,  ' " + orders.get(j).getTitle() + " ' , "  + sdid + " ," + said + "  ,' " +  sdid + " '," + k + "," + orders.get(j).getNumIid() + "," + orders.get(j).getNum() + "," + orders.get(j).getPrice() + " ," + orders.get(j).getTotalFee() +
+                            ",'ENTERING','在录入'," + trimNull(orders.get(j).getDiscountFee() ) + " FROM DUAL   WHERE NOT EXISTS ( select sd_id from saledetail " +
                             "WHERE 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 +" )  ";
                     insertSqlsList.add(INSERTSALEDETAILSql);