financecondition表改成和客户表一对一

src/main/java/com/uas/erp/schedular/financeservice/domain/CustInfo.java

@@ -1,5 +1,6 @@
 package com.uas.erp.schedular.financeservice.domain;
 
+
 import java.util.List;
 
 /**
@@ -151,12 +152,7 @@ public class CustInfo {
     /**
      * 财务情况说明
      */
-    private List<FinanceConditionInfo> financeConditions;
-
-    /**
-     * 金融服务申请数据
-     */
-    private Apply financingApply;
+    private FinanceConditionInfo financeConditions;
 
     /**
      * 买方客户资料
@@ -394,22 +390,14 @@ public class CustInfo {
         this.customerExcutives = customerExcutives;
     }
 
-    public List<FinanceConditionInfo> getFinanceConditions() {
+    public FinanceConditionInfo getFinanceConditions() {
         return financeConditions;
     }
 
-    public void setFinanceConditions(List<FinanceConditionInfo> financeConditions) {
+    public void setFinanceConditions(FinanceConditionInfo financeConditions) {
         this.financeConditions = financeConditions;
     }
 
-    public Apply getFinancingApply() {
-        return financingApply;
-    }
-
-    public void setFinancingApply(Apply financingApply) {
-        this.financingApply = financingApply;
-    }
-
     public List<PurcCustInfo> getMfCustInfos() {
         return mfCustInfos;
     }
@@ -441,4 +429,5 @@ public class CustInfo {
     public void setUpdowncasts(List<UpdowncastInfo> updowncasts) {
         this.updowncasts = updowncasts;
     }
+
 }

src/main/java/com/uas/erp/schedular/financeservice/domain/FinanceConditionInfo.java

@@ -1,5 +1,6 @@
 package com.uas.erp.schedular.financeservice.domain;
 
+
 /**
  * created by shicr on 2017/12/20
  * 财务情况说明

src/main/java/com/uas/erp/schedular/financeservice/task/ApplyInfoTask.java

@@ -62,7 +62,7 @@ public class ApplyInfoTask extends AbstractTask {
 
                 BusinessConditionInfo conditionInfos = apply1.getCustomerInfo() != null ? apply1.getCustomerInfo().getBusinessCondition() : null;
 
-                List<FinanceConditionInfo> conditionInfo = apply1.getCustomerInfo() != null ? apply1.getCustomerInfo().getFinanceConditions() : null;
+                FinanceConditionInfo conditionInfo = apply1.getCustomerInfo() != null ?apply1.getCustomerInfo().getFinanceConditions() : null;
 
                 List<ProductMixInfo> productMixInfos = apply1.getCustomerInfo() != null ? apply1.getCustomerInfo().getProductMixes() : null;
 

src/main/java/com/uas/erp/schedular/financeservice/task/CustomerInfoTask.java

@@ -0,0 +1,90 @@
+package com.uas.erp.schedular.financeservice.task;
+import com.alibaba.fastjson.JSONObject;
+import com.uas.api.crypto.util.FlexJsonUtils;
+import com.uas.erp.schedular.financeservice.domain.AccountInfo;
+import com.uas.erp.schedular.financeservice.domain.CustInfo;
+import com.uas.erp.schedular.financeservice.domain.CustomerInfo;
+import com.uas.erp.schedular.task.support.Method;
+import com.uas.erp.schedular.task.support.Role;
+import com.uas.erp.schedular.task.support.TaskMapping;
+import com.uas.erp.schedular.util.ContextHolder;
+import org.springframework.stereotype.Component;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import java.util.List;
+
+/**
+ * Created by hejq on 2017-12-21.
+ */
+@Component
+@TaskMapping(title = "金融服务", role = Role.SELLER)
+public class CustomerInfoTask extends AbstractTask {
+
+   /* @TaskMapping(title = "申请企业从金融平台下载客户的申请数据", fixedDelay = 60000, method = Method.DOWNLOAD)
+    public void downloadFinance() {
+       String jsonStr = getForObject("/erp/customerInfo", String.class);
+        if (!StringUtils.isEmpty(jsonStr)) {
+            JSONObject jsonObject = JSONObject.parseObject(jsonStr);
+            String size = jsonObject.getString("size");
+            ContextHolder.setDataSize(null != size ? Integer.valueOf(size) : 0);
+            saveCustInfo(jsonObject.getString("custInfos"));
+            // TODO notice++
+            // 回执
+            onSaleDownSuccess(jsonObject.getString("idStr"));
+        }
+    }*/
+
+    @TaskMapping(title = "申请企业从金融平台下载客户的申请数据", fixedDelay = 60000, method = Method.DOWNLOAD)
+    public void downloadFinance() {
+        String jsonStr = getForObject("/erp/finance", String.class);
+        if (!StringUtils.isEmpty(jsonStr)) {
+            JSONObject jsonObject = JSONObject.parseObject(jsonStr);
+            String size = jsonObject.getString("size");
+            ContextHolder.setDataSize(null != size ? Integer.valueOf(size) : 0);
+            saveCustInfo(jsonObject.getString("custInfos"));
+            // TODO notice++
+            // 回执
+            onSaleDownSuccess(jsonObject.getString("idStr"));
+        }
+    }
+
+    /**
+     * 将下载的数据的idStr传回金融平台进行更新操作
+     *
+     * @param idStr
+     */
+    private void onSaleDownSuccess(String idStr) {
+        if(!StringUtils.isEmpty(idStr))
+            post("/erp/customerInfo/back", dataWrap(idStr));
+    }
+
+    /**
+     * 下载的数据传输到ERP做处理，这边不做处理
+     *
+     * @param custInfos
+     */
+    private void saveCustInfo(String custInfos) {
+        if(!StringUtils.isEmpty(custInfos)) {
+            List<CustInfo> infos = FlexJsonUtils.fromJsonArray(custInfos, CustInfo.class);
+            if(!CollectionUtils.isEmpty(infos)) {
+                for(CustInfo info : infos) {
+                    CustomerInfo customer = new CustomerInfo();
+                    String url = "/openapi/applicant/financingApply.action";
+/*                    postForEntity(url, new ModelMap("customer", JSON.toJSONString(customer))
+                            .addAttribute("accountList",JSON.toJSONString(info.getAccountInfoList()))
+                            .addAttribute("associateCompany", JSON.toJSONString(info.getAssociateCompanies()))
+                            .addAttribute("businessCondition", JSON.toJSONString(info.getBusinessCondition()))
+                            .addAttribute("customerExcutive", JSON.toJSONString(info.getCustomerExcutives()))
+                            .addAttribute("financeCondition", JSON.toJSONString(info.getFinanceConditions()))
+                            .addAttribute("mfCust", JSON.toJSONString(info.getMfCustInfos()))
+                            .addAttribute("financingApply", JSON.toJSONString(info.getFinancingApply()))
+                            .addAttribute("prouductMixe", JSON.toJSONString(info.getProductMixes()))
+                            .addAttribute("updowncast", JSON.toJSONString(info.getUpdowncasts()))
+                            .addAttribute("shareholders", JSON.toJSONString(info.getShareholders()))
+                            .addAttribute("changeInstruction", JSON.toJSONString(info.getChangesInstructions())));*/
+                }
+            }
+        }
+    }
+}

src/main/resources/init/setting.json

@@ -31,5 +31,5 @@
 },{
   "key": "api.finance.service.url",
   "description": "金融保理平台（客户端）正式接口地址",
-  "value": "http://10.10.100.178:23000"
+  "value": "http://www.finance.ubtob.com"
 }]

src/main/resources/logback.xml

@@ -38,8 +38,9 @@
         <appender-ref ref="DB" />
     </logger>
 
-    <root level="DEBUG">
+    <root level="INFO">
         <appender-ref ref="ROLLING" />
+        <appender-ref ref="STDOUT" />
     </root>
 
     <root level="INFO">

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

@@ -13,6 +13,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -22,16 +23,16 @@ import java.util.List;
  * <p>
  * Created by hejq on 2017-12-22.
  */
-//@RunWith(SpringJUnit4ClassRunner.class)
-//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = UasSchedulingApplication.class)
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = UasSchedulingApplication.class)
 public class ConnectToFinanceTest extends AbstractTask {
 
-//    @Test
+    @Test
     public void testConnect() {
         Master master = new Master();
         master.setMa_user("UAS_TEST");
-        master.setMa_uu(10046597L);
-        master.setMa_accesssecret("60ed5581d63aa728e050007f0100453f");
+        master.setMa_uu(10046945L);
+        master.setMa_accesssecret("600d3f07955ba67fe050007f01002db2");
         master.setMa_env("test");
         master.setMa_name("UAS_TEST");
         ContextHolder.setMaster(master);
@@ -51,7 +52,7 @@ public class ConnectToFinanceTest extends AbstractTask {
 
                 BusinessConditionInfo conditionInfos = apply1.getCustomerInfo() != null ? apply1.getCustomerInfo().getBusinessCondition() : null;
 
-                List<FinanceConditionInfo> conditionInfo = apply1.getCustomerInfo() != null ? apply1.getCustomerInfo().getFinanceConditions() : null;
+                FinanceConditionInfo conditionInfo = apply1.getCustomerInfo() != null ? apply1.getCustomerInfo().getFinanceConditions() : null;
 
                 List<ProductMixInfo> productMixInfos = apply1.getCustomerInfo() != null ? apply1.getCustomerInfo().getProductMixes() : null;
 
@@ -65,10 +66,6 @@ public class ConnectToFinanceTest extends AbstractTask {
 
                 List<AccountInfo> accountInfos = apply1.getCustomerInfo() != null ? apply1.getCustomerInfo().getAccountInfoList() : null;
 
-                System.out.println(FlexJsonUtils.toJsonDeep(new ApplyInfo(apply1)));
-
-                System.out.println(FlexJsonUtils.toJsonDeep(apply1.getAttachList()));
-
                 postForEntity(url, new ModelMap("customer", FlexJsonUtils.toJsonDeep(new CustomerInfo(apply1.getCustomerInfo())))
                         .addAttribute("apply", FlexJsonUtils.toJsonDeep(new ApplyInfo(apply1)))
                         .addAttribute("associateCompany", FlexJsonUtils.toJsonDeep(companyInfos))
@@ -86,4 +83,14 @@ public class ConnectToFinanceTest extends AbstractTask {
             }
         }
     }
+
+    /**
+     * 将下载的数据的idStr传回金融平台进行更新操作
+     *
+     * @param idStr
+     */
+    private void onSaleDownSuccess(String idStr) {
+        if (!StringUtils.isEmpty(idStr))
+            post("/erp/customerInfo/back", dataWrap(idStr));
+    }
 }