Ver código fonte

Merge branch 'master' of zx/ccnet2.0 into master

project 7 anos atrás
pai
commit
bb18e18194

+ 4 - 3
src/main/java/com/emato/ccnet/biz/req/order/csp/Ceb311CustiomsResponse.java

@@ -145,16 +145,17 @@ public class Ceb311CustiomsResponse implements CebCustomsResponse{
     private OrderCustiomsResponse analysisCustiomsResponse(Map<String, Object> map) {
         Gson gson = new Gson();
         Result response = (Result) map.get("resultData");
-        LOGGER.info("海关回执date:"+response);
+
         if(response == null){
             LOGGER.info("解析响应数据失败");
             return null;
         }
 
-        LOGGER.info("海关回执 data:"+response);
-
         //解析回执数据
         String data = JacksonUtil.toJson(response.getData());
+
+        LOGGER.info("海关回执 data:"+data);
+
         List<OrderCustiomsResponse> orderCustiomsResponseList  = gson.fromJson(data, List.class);
 
         if(orderCustiomsResponseList == null && orderCustiomsResponseList.size() <= 0){

+ 4 - 4
src/main/resources/application.yml

@@ -24,7 +24,7 @@ ds:
 # 使用环境
 spring:
   profiles:
-    active: dev
+    active: 
   aop:
     proxy-target-class: true
 
@@ -115,7 +115,7 @@ redis:
         port: 7004
       - host: 120.76.26.84
         port: 7005
-    #password: Abc-123#*.-
+    password: Abc-123#*.-
     # 连接超时时间(秒), 默认 2*1000
     connection-timeout: 5000
     # so-timeout:
@@ -170,7 +170,7 @@ cus:
 # 商户信息
 merchant:
   #商户编号
-  merch-sn: 146
+  merch-sn: mhbs990053989883052032
   #商户名称
   merch-name: 中网科技
   #平台编号
@@ -188,4 +188,4 @@ db:
     data-size: 2
 # 运单发送oms
   ceb511-send-oms:
-    data-size: 2
+    data-size: 2