From 82030c489dc4aaf2759880e33e8734ee3fb2d96d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 27 一月 2020 22:12:15 +0800
Subject: [PATCH] 加入临时车缴费清单

---
 java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java |   44 +++++++++++---------------------------------
 1 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java b/java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java
index 161b9c0..cd82cd7 100644
--- a/java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java
+++ b/java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java
@@ -2,8 +2,9 @@
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.CommonConstant;
-import com.java110.common.util.ProtocolUtil;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.util.ProtocolUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.core.base.AppBase;
 import com.java110.core.context.AppContext;
 import com.java110.core.context.IPageData;
@@ -30,8 +31,9 @@
 
     /**
      * 涓婚敭鐢熸垚
+     *
      * @param iPrimaryKeyService 涓婚敭鐢熸垚鏈嶅姟瀵硅薄
-     * @param type 涓婚敭绫诲瀷 濡� OL_ID , CUST_ID
+     * @param type               涓婚敭绫诲瀷 濡� OL_ID , CUST_ID
      * @return
      * @throws Exception
      */
@@ -43,52 +45,28 @@
         //瑕佹眰鎺ュ彛杩斿洖 {"RESULT_CODE":"0000","RESULT_INFO":{"user_id":"7020170411000041"},"RESULT_MSG":"鎴愬姛"}
         String custIdJSONStr = iPrimaryKeyService.queryPrimaryKey(data.toJSONString());
         JSONObject custIdJSONTmp = JSONObject.parseObject(custIdJSONStr);
-        if(custIdJSONTmp.containsKey("RESULT_CODE")
+        if (custIdJSONTmp.containsKey("RESULT_CODE")
                 && ProtocolUtil.RETURN_MSG_SUCCESS.equals(custIdJSONTmp.getString("RESULT_CODE"))
-                && custIdJSONTmp.containsKey("RESULT_INFO")){
+                && custIdJSONTmp.containsKey("RESULT_INFO")) {
             //浠庢帴鍙g敓鎴恛lId
-            targetId =  custIdJSONTmp.getJSONObject("RESULT_INFO").getString(type);
+            targetId = custIdJSONTmp.getJSONObject("RESULT_INFO").getString(type);
         }
-        if("-1".equals(targetId)) {
+        if ("-1".equals(targetId)) {
             throw new RuntimeException("璋冪敤涓婚敭鐢熸垚鏈嶅姟鏈嶅姟澶辫触锛�" + custIdJSONStr);
         }
 
         return targetId;
     }
 
-    /**
-     * 璋冪敤涓績鏈嶅姟
-     * @return
-     */
-    protected ResponseEntity<String> callCenterService(RestTemplate restTemplate,IPageData pd, String param, String url, HttpMethod httpMethod){
-        ResponseEntity<String> responseEntity = null;
-        HttpHeaders header = new HttpHeaders();
-        header.add(CommonConstant.HTTP_APP_ID.toLowerCase(), CommonConstant.HC_WEB_APP_ID);
-        header.add(CommonConstant.HTTP_USER_ID.toLowerCase(), CommonConstant.ORDER_DEFAULT_USER_ID);
-        header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), pd.getTransactionId());
-        header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), pd.getRequestTime());
-        header.add(CommonConstant.HTTP_SIGN.toLowerCase(), "");
-        HttpEntity<String> httpEntity = new HttpEntity<String>(param, header);
-        logger.debug("璇锋眰涓績鏈嶅姟淇℃伅锛寋}",httpEntity);
-        try{
-            responseEntity = restTemplate.exchange(url, httpMethod, httpEntity, String.class);
-        }catch (HttpStatusCodeException e){ //杩欓噷spring 妗嗘灦 鍦�4XX 鎴� 5XX 鏃舵姏鍑� HttpServerErrorException 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
-            responseEntity = new ResponseEntity<String>("璇锋眰涓嬫父绯荤粺寮傚父锛�"+e.getResponseBodyAsString(),e.getStatusCode());
-        }catch (Exception e){
-            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
-            logger.debug("璇锋眰涓績鏈嶅姟淇℃伅锛寋}",responseEntity);
-            return responseEntity;
-        }
 
-    }
 
 
     /**
      * 鍒涘缓涓婁笅鏂囧璞�
+     *
      * @return
      */
-    protected AppContext createApplicationContext(){
+    protected AppContext createApplicationContext() {
         return AppContext.newInstance();
     }
 

--
Gitblit v1.8.0