2020-12-23

1.调整 sa_need9 为旺旺号 地址增加市和区
2.sa_total\sd_total\sd_price 取 payment 19.31 而 不上 totalfee 19.9

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

@@ -88,7 +88,7 @@ public class InsertServiceImpl implements InsertService {
         if (sa_remark == null || sa_remark == "") {
             TaobaoClient client = new DefaultTaobaoClient("http://39.98.201.114:30001/router/rest", "31921866", "7121c52d4c9970ba08bf09e2f525acd0");
             TradesSoldGetRequest req = new TradesSoldGetRequest();  //正常备份接口
-            req.setFields("tid,type,status,payment,orders,rx_audit_status,trades,receiver_name,receiver_mobile,created,buyer_nick,receiver_state" +
+            req.setFields("tid,type,status,payment,orders,rx_audit_status,trades,receiver_name,receiver_mobile,created,buyer_nick,receiver_state,receiver_city,receiver_district" +
                     ",receiver_address,shipping_type,o2o_guide_name,modified,end_time,post_fee,payment,total_fee,consign_time,sku_properties_name,seller_nick");
 
 
@@ -201,7 +201,7 @@ public class InsertServiceImpl implements InsertService {
 
 
                     String INSERTSALESql = "insert into sale(  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_shcustname,sa_toplace" +
+                        ",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)" +
@@ -210,7 +210,7 @@ public class InsertServiceImpl implements InsertService {
                         + 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() ) + ","
-                        + trimNull(trades.get(i).getTotalFee() ) + " , to_date ( '" +consigntime + "','YYYY-MM-DD hh24:mi:ss') ,'unprint', '淘宝自动抓取'   FROM DUAL  " +
+                        + trimNull(trades.get(i).getPayment() ) + " , to_date ( '" +consigntime + "','YYYY-MM-DD hh24:mi:ss') ,'unprint', '淘宝自动抓取'   FROM DUAL  " +
                         " WHERE ' " + trimNull(trades.get(i).getStatus() )  + " ' NOT IN  ( 'TRADE_NO_CREATE_PAY','WAIT_BUYER_PAY','PAY_PENDING' )    AND  NOT EXISTS ( select sa_id from sale WHERE SA_iD=" + said +  " )   AND  NOT EXISTS ( select SA_CODE from sale WHERE SA_CODE= '" +  trades.get(i).getTid() +  "'  )    AND  NOT EXISTS ( select SA_TAOBAOID from sale WHERE SA_TAOBAOID=" + trades.get(i).getTid() + "   )  ";
                 insertSqlsList.add(INSERTSALESql);
 
@@ -224,7 +224,7 @@ public class InsertServiceImpl implements InsertService {
 //                    sdid = sdid +L;
                     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  ' " + 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() +
+                            "  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).getPayment() +
                             ",'ENTERING','在录入', " + trimNull(orders.get(j).getDiscountFee() ) + " 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 +" )  ";