冲突解决

build.gradle

@@ -37,12 +37,10 @@ repositories {
     mavenLocal()
     maven { url "http://repo.spring.io/libs-milestone" }
     maven { url "http://repo.spring.io/libs-release" }
-	maven { url "http://10.10.100.21:8081/artifactory/libs-release-local" }
-	maven { url "http://10.10.100.21:8081/artifactory/ext-release-local" }
+    maven { url "http://10.10.100.21:8081/artifactory/libs-release-local" }
+    maven { url "http://10.10.100.21:8081/artifactory/ext-release-local" }
     maven { url "http://10.10.100.21:8081/artifactory/libs-snapshot-local" }
     maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
-    maven { url "https://artifactory.uuzcc.cn/artifactory/libs-snapshot" }
-    maven { url "https://artifactory.uuzcc.cn/artifactory/libs-release" }
     mavenCentral()
 }
 
@@ -62,7 +60,7 @@ dependencies {
     compile "org.projectlombok:lombok:1.18.4"
     compile "commons-io:commons-io:2.6"
     compile "com.usoft.framework:usoft-security-utils:dev-1.0-SNAPSHOT"
-    compile "com.usoft.sdk:usoft-sdk-fin:1.0-SNAPSHOT"
+    compile "com.usoft:usoft-sdk-fin-1.0:SNAPSHOT"
 }
 
 bootRun {

src/main/java/com/uas/erp/schedular/finance/task/B2BInformation.java

@@ -4,6 +4,13 @@ package com.uas.erp.schedular.finance.task;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.uas.erp.schedular.task.support.Method;
+import com.usoft.fin.external.open.api.entity.CapitalSideLoan;
+import com.usoft.fin.external.open.api.entity.FinanceOfferListOrBuilder;
+import com.usoft.fin.external.open.api.entity.OfferQuotaInfoRest;
+import com.usoft.fin.external.open.api.protobuf.*;
+import com.usoft.sdk.fin.client.CapitalSideSdk;
+
 import org.springframework.stereotype.Component;
 
 import com.uas.erp.schedular.task.support.Role;
@@ -15,6 +22,7 @@ import com.usoft.fin.external.open.api.entity.CapitalSideLoan;
 import com.usoft.fin.external.open.api.entity.FinanceOfferDetails;
 import com.usoft.fin.external.open.api.entity.FinanceOfferList;
 import com.usoft.fin.external.open.api.entity.FinanceOfferListOrBuilder;
+import com.usoft.fin.external.open.api.entity.OfferDetailAndFinanceAccept;
 import com.usoft.fin.external.open.api.entity.OfferQuotaInfoRest;
 import com.usoft.fin.external.open.api.protobuf.BatchOfferOrderReq;
 import com.usoft.fin.external.open.api.protobuf.BatchOfferOrderResp;
@@ -32,6 +40,7 @@ import com.usoft.fin.external.open.factoring.api.entity.FinanceDemandDetailAccep
 import com.usoft.sdk.fin.client.CapitalSideSdk;
 import com.usoft.sdk.fin.client.TradingHallSdk;
 import com.usoft.sdk.fin.utils.ProtoBufUtil;
+
 @Component
 @TaskMapping(title = "金融服务", role = Role.SELLER)
 public class B2BInformation  extends AbstractTask{
@@ -43,6 +52,7 @@ public class B2BInformation  extends AbstractTask{
 	 * 下载放款记录列表
 	 * @throws Exception
 	 */
+	@TaskMapping(title = "放款记录下载", fixedDelay = 360000, method = Method.DOWNLOAD)
     public void getCapitalSideLoan() throws Exception {
     	final List<String> sqls = new ArrayList<>();
         GetCapitalSideLoanReq.Builder req = GetCapitalSideLoanReq.newBuilder();
@@ -65,7 +75,7 @@ public class B2BInformation  extends AbstractTask{
         				    + "'"+loan.getFsCollectionAccount()+"','"+loan.getFsCollectionName()+"','"+loan.getReceiptForLoan()+"','"+loan.getInterestPayable()+"',"
         				    + "'"+loan.getBeOverdue()+"','"+loan.getSettle()+"','"+loan.getApplyDate()+"','"+loan.getPersonInCharge()+"','"+loan.getStatus()+"','"+loan.getApprovalDate()+"','"+loan.getApprovalMan()+"','已上传')");
         }
-        System.out.println(sqls);
+        //System.out.println(sqls);
         jdbcTemplate.batchExecute(sqls);
        
     }
@@ -74,6 +84,7 @@ public class B2BInformation  extends AbstractTask{
      * 报价记录下载
      * @throws Exception
      */
+	@TaskMapping(title = "报价记录下载", fixedDelay = 360000, method = Method.DOWNLOAD)
     public void getFinanceOfferList() throws Exception {
     	final List<String> sqls = new ArrayList<>();
     	final List<String> sqlsDemand = new ArrayList<>();
@@ -122,6 +133,7 @@ public class B2BInformation  extends AbstractTask{
      * 额度申请
      * @throws Exception
      */
+	@TaskMapping(title = "额度申请下载", fixedDelay = 360000, method = Method.DOWNLOAD)
     public void getOfferQuotaInfoList() throws Exception {
     	
     	final List<String> sqls = new ArrayList<>();
@@ -149,30 +161,30 @@ public class B2BInformation  extends AbstractTask{
      * 下载报价详情
      */
 	public void getFinanceOfferDetails() throws Exception {
-		final List<String> sqls = new ArrayList<>();
+		final List<String> ordersqls = new ArrayList<>();   //订单详情
+		final List<String> acceptsqls = new ArrayList<>();   //验收单详情
 		GetFinanceOfferDetailsReq.Builder req = GetFinanceOfferDetailsReq.newBuilder();
-		req.setOfferCode("71191218666434955543");
+		req.setOfferCode("71191218666434955543");//financeDemandDetail
 		GetFinanceOfferDetailsResp resp = capitalSideSdk.getFinanceOfferDetails(req);
-		java.util.List<AcceptFinanceDemandDetail> adetaillist = (List<AcceptFinanceDemandDetail>) resp.getFinanceOfferInfoOrBuilder();
-		for(AcceptFinanceDemandDetail rest :adetaillist){
-			sqls.add("insert into ACCEPTFINANCEDEMANDDETAIL(ID,CODE,FINANCEDEMANDCODE,CUSTENUU,CUSTENNAME,CUSTGRADE,PAYMENTS,ORDERID,ORDERCODE,ORDERTOTAL,"
+		FinanceOfferDetails adetaillist =  resp.getFinanceOfferInfo();
+		List<OfferDetailAndFinanceAccept> restlist = adetaillist.getOfferDetailAndFinanceAcceptInfoList();
+		for(OfferDetailAndFinanceAccept rest :restlist){
+			ordersqls.add("insert into ACCEPTFINANCEDEMANDDETAIL(ID,CODE,FINANCEDEMANDCODE,CUSTENUU,CUSTENNAME,CUSTGRADE,PAYMENTS,ORDERID,ORDERCODE,ORDERTOTAL,"
         			+ "ACCEPTAMOUNT,UPLOADSTATUS) "
-        			+ "values (OfferQuotaInfoRest_seq.nextval,'"+rest.getCode()+"','"+rest.getFinanceDemandCode()+"','"+rest.getCustEnuu()+"',"
-        					+ "'"+rest.getCustEnName()+"','"+rest.getCustGrade()+"','"+rest.getPayments()+"','"+rest.getOrderId()+"',"
-        				    + "'"+rest.getOrderCode()+"','"+rest.getOrderTotal()+"','"+rest.getAcceptAmount()+"','已上传',");
-		}
-		jdbcTemplate.batchExecute(sqls);
+        			+ "values (ACCEPTFINANCEDEMANDDETAIL_seq.nextval,'"+rest.getFinanceDemandDetail().getCode()+"','"+rest.getFinanceDemandDetail().getFinanceDemandCode()+"','"+rest.getFinanceDemandDetail().getCustEnuu()+"',"
+        					+ "'"+rest.getFinanceDemandDetail().getCustEnName()+"','"+rest.getFinanceDemandDetail().getCustGrade()+"','"+rest.getFinanceDemandDetail().getPayments()+"','"+rest.getFinanceDemandDetail().getOrderId()+"',"
+        				    + "'"+rest.getFinanceDemandDetail().getOrderCode()+"','"+rest.getFinanceDemandDetail().getOrderTotal()+"','"+rest.getFinanceDemandDetail().getAcceptAmount()+"','已上传'");
 		
-		java.util.List<FinanceDemandDetailAccept> fdetaillist = (List<FinanceDemandDetailAccept>) resp.getFinanceOfferInfoOrBuilder();
-		for(FinanceDemandDetailAccept fa : fdetaillist){
-			sqls.add("insert into FINANCEDEMANDDETAILACCEPT(ID,CODE,FINANCEDEMANDCODE,FINANCEDEMANDDETAILCODE,ORDERITEMID,ACCEPTITEMID,ACCEPTID,ACCEPTAMOUNT,ACCEPTDATE,ACCEPTCODE,"
+			acceptsqls.add("insert into FINANCEDEMANDDETAILACCEPT(ID,CODE,FINANCEDEMANDCODE,FINANCEDEMANDDETAILCODE,ORDERITEMID,ACCEPTITEMID,ACCEPTID,ACCEPTAMOUNT,ACCEPTDATE,ACCEPTCODE,"
         			+ "ACCEPTSTATUS,TITLE,SPEC,PRODUCTCODE,STATUS,UPLOADSTATUS) "
-        			+ "values (FINANCEDEMANDDETAILACCEPT_seq.nextval,'"+fa.getCode()+"','"+fa.getFinanceDemandCode()+"','"+fa.getFinanceDemandDetailCode()+"',"
-        			+ "'"+fa.getOrderItemId()+"','"+fa.getAcceptId()+"','"+fa.getAcceptAmount()+"','"+fa.getAcceptDate()+"',"
-        		    + "'"+fa.getAcceptCode()+"','"+fa.getAcceptStatus()+"','"+fa.getTitle()+"','"+fa.getSpec()+"','"+fa.getProductCode()+"','"+fa.getStatus()+"','已上传',");
+        			+ "values (FINANCEDEMANDDETAILACCEPT_seq.nextval,'"+rest.getFinanceDemandDetailAccept().getCode()+"','"+rest.getFinanceDemandDetailAccept().getFinanceDemandCode()+"','"+rest.getFinanceDemandDetailAccept().getFinanceDemandDetailCode()+"',"
+        			+ "'"+rest.getFinanceDemandDetailAccept().getOrderItemId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptAmount()+"','"+rest.getFinanceDemandDetailAccept().getAcceptDate()+"',"
+        		    + "'"+rest.getFinanceDemandDetailAccept().getAcceptCode()+"','"+rest.getFinanceDemandDetailAccept().getAcceptStatus()+"','"+rest.getFinanceDemandDetailAccept().getTitle()+"','"+rest.getFinanceDemandDetailAccept().getSpec()+"','"+rest.getFinanceDemandDetailAccept().getProductCode()+"','"+rest.getFinanceDemandDetailAccept().getStatus()+"','已上传'");
 		}
-		jdbcTemplate.batchExecute(sqls);
-		System.out.println(ProtoBufUtil.toJSON(resp));
+		System.out.println(ordersqls);
+		jdbcTemplate.batchExecute(ordersqls);
+		
+		jdbcTemplate.batchExecute(acceptsqls);
 	}
 }
 

src/test/java/com/uas/erp/test/SdkTest.java

@@ -46,5 +46,15 @@ public class SdkTest extends AbstractTask {
 		 b2BInformation.getFinanceOfferList();
 	 }
 	 
+	 @Test
+	 public void getFinanceOfferDetails() throws Exception{
+		 Master master = new Master();
+         master.setMa_user("YITOA_BL");
+         ContextHolder.setMaster(master);
+		 b2BInformation.getFinanceOfferDetails();
+	 }
+	 
+	 
+	 
 	
 }