2021-09-03

1.替换成了最新的SDK
2.调用解密接口对敏感数据解密

pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.uas.eis</groupId>
@@ -46,63 +46,63 @@
 			<artifactId>spring-boot-devtools</artifactId>
 		</dependency> -->
 
-		<dependency>  
-            <groupId>org.springframework.boot</groupId>  
-            <artifactId>spring-boot-starter-data-jpa</artifactId>  
-        </dependency>
-	
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+
 		<!--<dependency>
 		    <groupId>log4j</groupId>
 		    <artifactId>log4j</artifactId>
 		    <version>1.2.17</version>
 		</dependency>-->
-		
+
 		<dependency>
 			<groupId>net.sf.json-lib</groupId>
 			<artifactId>json-lib</artifactId>
 			<version>2.4</version>
 			<classifier>jdk15</classifier>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
 			<version>1.2.15</version>
 		</dependency>
-		
+
 		<dependency>
-		    <groupId>io.jsonwebtoken</groupId>
-		    <artifactId>jjwt</artifactId>
-		    <version>0.6.0</version>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt</artifactId>
+			<version>0.6.0</version>
 		</dependency>
-		
+
 		<dependency>
-		    <groupId>org.codehaus.jackson</groupId>
-		    <artifactId>jackson-core-asl</artifactId>
-		    <version>1.9.13</version>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-core-asl</artifactId>
+			<version>1.9.13</version>
 		</dependency>
-		
+
 		<dependency>
-		    <groupId>org.codehaus.jackson</groupId>
-		    <artifactId>jackson-mapper-asl</artifactId>
-		    <version>1.9.13</version>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-mapper-asl</artifactId>
+			<version>1.9.13</version>
 		</dependency>
-		
+
 		<dependency>
-		    <groupId>net.sf.flexjson</groupId>
-		    <artifactId>flexjson</artifactId>
-		    <version>2.1</version>
+			<groupId>net.sf.flexjson</groupId>
+			<artifactId>flexjson</artifactId>
+			<version>2.1</version>
 		</dependency>
-		
+
 		<dependency>
-		    <groupId>org.springframework.boot</groupId>
-		    <artifactId>spring-boot-starter-cache</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-cache</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpcore</artifactId>
-			</dependency>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
@@ -112,13 +112,13 @@
 			<artifactId>httpmime</artifactId>
 		</dependency>
 
-        <dependency>
-            <groupId>org.oracle</groupId>
-            <artifactId>oracle</artifactId>
-            <version>1.0.0</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/ojdbc7.jar</systemPath>
-        </dependency>
+		<dependency>
+			<groupId>org.oracle</groupId>
+			<artifactId>oracle</artifactId>
+			<version>1.0.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/lib/ojdbc7.jar</systemPath>
+		</dependency>
 
 		<dependency>
 			<groupId>com.alibaba</groupId>
@@ -131,7 +131,7 @@
 			<artifactId>taobao1</artifactId>
 			<version>1.0</version>
 			<scope>system</scope>
-			<systemPath>${project.basedir}/lib/taobao-sdk-java-auto_1599984691101-20201105.jar</systemPath>
+			<systemPath>${project.basedir}/lib/taobao-sdk-java-auto_1629280165553-20210818.jar</systemPath>
 		</dependency>
 
 		<dependency>
@@ -139,7 +139,7 @@
 			<artifactId>taobao2</artifactId>
 			<version>1.0</version>
 			<scope>system</scope>
-			<systemPath>${project.basedir}/lib/taobao-sdk-java-auto_1599984691101-20201105-source.jar</systemPath>
+			<systemPath>${project.basedir}/lib/taobao-sdk-java-auto_1629280165553-20210818-source.jar</systemPath>
 		</dependency>
 
 	</dependencies>
@@ -155,11 +155,11 @@
 				</configuration>
 
 				<executions>
-					<execution>
-						<goals>
-							<goal>repackage</goal>
-						</goals>
-					</execution>
+				<execution>
+				<goals>
+				<goal>repackage</goal>
+				</goals>
+				</execution>
 				</executions>
 			</plugin>
 

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

@@ -27,6 +27,9 @@ import com.taobao.api.response.TradesSoldGetResponse;
 import com.taobao.api.request.TradesSoldIncrementGetRequest;
 import com.taobao.api.response.TradesSoldIncrementGetResponse;
 
+import com.taobao.api.request.TopOaidDecryptRequest;
+import com.taobao.api.response.TopOaidDecryptResponse;
+
 import com.uas.eis.utils.HttpUtil;
 import com.uas.eis.utils.HttpUtil.Response;
 
@@ -161,14 +164,14 @@ 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);
@@ -227,7 +230,35 @@ public class InsertServiceImpl implements InsertService {
                     } else {
                         consigntime = formatdx.format( trades.get(i).getConsignTime() );
                     }
-
+//0819
+                    String oaid=trades.get(i).getOaid();
+                    String tid6=trades.get(i).getTid().toString();
+                    TopOaidDecryptRequest req6 = new TopOaidDecryptRequest();
+                    List<TopOaidDecryptRequest.ReceiverQuery> list2 = new ArrayList<TopOaidDecryptRequest.ReceiverQuery>();
+                    TopOaidDecryptRequest.ReceiverQuery obj3 = new TopOaidDecryptRequest.ReceiverQuery();
+                    list2.add(obj3);
+                    obj3.setOaid(oaid);
+                    obj3.setTid(tid6);
+                    obj3.setScene("1001");
+                    req6.setQueryList(list2);
+                    TaobaoClient client6 = new DefaultTaobaoClient("http://39.98.201.114:30001/router/rest", "31921866", "7121c52d4c9970ba08bf09e2f525acd0");
+                    String name_oaid=trimNull(trades.get(i).getReceiverName() );
+                    String receiver_mobile=trimNull(trades.get(i).getReceiverMobile() );
+                    String address=trimNull(trades.get(i).getReceiverState() ) + trimNull(trades.get(i).getReceiverCity() ) + trimNull(trades.get(i).getReceiverDistrict() ) +  trimNull( trades.get(i).getReceiverAddress() );
+
+
+                    if(oaid!=null) {
+                        try {
+                            TopOaidDecryptResponse rsp6 = client6.execute(req6, session_Key);
+                            name_oaid=rsp6.getReceiverList().get(0).getName();
+                            receiver_mobile=rsp6.getReceiverList().get(0).getMobile();
+                            address=trimNull(rsp6.getReceiverList().get(0).getState() ) + trimNull(rsp6.getReceiverList().get(0).getCity() ) + trimNull(rsp6.getReceiverList().get(0).getDistrict() ) +  trimNull( rsp6.getReceiverList().get(0).getAddressDetail() );
+                        } catch (Exception e) {
+
+                            logger.info(new SimpleDateFormat("YYYY-MM-DD hh24:mi:ss").format(new Date()) + this.getClass() + "淘宝未返回敏感数据");
+                        }
+                    }
+//
 
 
                     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" +
@@ -235,9 +266,9 @@ public class InsertServiceImpl implements InsertService {
                             ",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   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()
+                            "  SELECT   1,"+trades.get(i).getDiscountFee() +",'"+trimNull(trades.get(i).getStatus() )+"','" + trimNull(trades.get(i).getSellerNick() ) + " ', 'GN0008358','P001', "   + trades.get(i).getTid() + " , '现结','HLK淘宝','国内标准销售订单', ' " +trimNull( name_oaid ) + "  ' , ' " + trimNull( receiver_mobile ) + " ' , " + 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(name_oaid )+ "','" + trimNull( trades.get(i).getBuyerNick() )+ "','" + address + "  ', '  "
                             + 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).getPayment() ) + " , to_date ( '" +consigntime + "','YYYY-MM-DD hh24:mi:ss') ,'unprint', '淘宝自动抓取'   FROM DUAL  " +