二期系统对接

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/orderjzdetail/OrderJzDetailServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yc.ship.module.trade.service.orderjzdetail;
 
+import cn.hutool.core.codec.Base64Decoder;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.http.HttpUtil;
@@ -160,6 +161,10 @@ public class OrderJzDetailServiceImpl implements OrderJzDetailService {
             vistor.put("name", tradeVisitorDO.getName());
             vistor.put("mobile", tradeVisitorDO.getPhone());
             vistor.put("idCard", tradeVisitorDO.getIdCard());
+            if(tradeVisitorDO.getIdCard().length()!=18){
+                vistor.put("idType", "1");
+            }
+
             vistor.put("face", "");
             vistorList.add(vistor);
         }
@@ -189,8 +194,9 @@ public class OrderJzDetailServiceImpl implements OrderJzDetailService {
                 .execute().body();
         log.info("二期系统预下单完成,响应参数:{}", res);
         // base64解密
-        log.info("二期系统预下单完成,响应response参数:{}", res);
-        JSONObject jsonObj = JSONUtil.parseObj(res);
+        String result = Base64Decoder.decodeStr(res);
+        log.info("二期系统预下单完成,响应response参数:{}", result);
+        JSONObject jsonObj = JSONUtil.parseObj(result);
         JSONObject responseHead = jsonObj.getJSONObject("responseHead");
         if (StringUtils.equals("1000", responseHead.getStr("res_code"))) {
             String response = jsonObj.getStr("responseBody");