From 454eb7ff69d4b548cd20291510ea8d673b3cf3e5 Mon Sep 17 00:00:00 2001
From: rengp <jykx19@163.com>
Date: Tue, 17 Oct 2023 14:53:16 +0800
Subject: [PATCH] no message

---
 com/engine/tjyh/xc/cmd/XcCmd.java              | 17 ++++++++++-------
 .../tjyh/xc/service/impl/XcServiceImpl.java    |  1 -
 com/engine/tjyh/xc/util/HttpRequestUtil.java   | 18 +++++++++++++-----
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/com/engine/tjyh/xc/cmd/XcCmd.java b/com/engine/tjyh/xc/cmd/XcCmd.java
index 25682c4..0cee98f 100644
--- a/com/engine/tjyh/xc/cmd/XcCmd.java
+++ b/com/engine/tjyh/xc/cmd/XcCmd.java
@@ -246,10 +246,10 @@ public class XcCmd extends AbstractCommonCommand<Map<String, Object>> {
         String StartTime = obj.getString("StartTime");//开始时间
         String EndTime = obj.getString("EndTime");//结束时间
         String CityName = obj.getString("CityName");//入住城市
-        String AmountRMB = obj.getString("AmountRMB");//原酒店金额
+        String AmountRMB = Util.null2String(obj.getString("AmountRMB"));//原酒店金额
         JSONObject RefundAmountInfoEnty = obj.getJSONObject("RefundTotalAmount");
         String RefundTotalAmount = RefundAmountInfoEnty.getString("TicketPrice");//退回金额
-        String SubcriptionFee = RefundAmountInfoEnty.getString("SubcriptionFee");//退/改签费
+        String SubcriptionFee =Util.null2String(RefundAmountInfoEnty.getString("SubcriptionFee"));//退/改签费
 
         writeLog("tgqyy="+tgqyy);
 
@@ -411,11 +411,11 @@ public class XcCmd extends AbstractCommonCommand<Map<String, Object>> {
 
 
 
-        String refundTicketFee = OrderTicket.getString("RefundTicketFee");//退票费：
+        String refundTicketFee = Util.null2String(OrderTicket.getString("RefundTicketFee"));//退票费：
         if("".equals(refundTicketFee)){
             refundTicketFee = "0";
         }
-        String dealTicketPrice = OrderTicket.getString("DealTicketPrice");//DealTicketPrice（改签车票金额）
+        String dealTicketPrice = Util.null2String(OrderTicket.getString("DealTicketPrice"));//DealTicketPrice（改签车票金额）
         if("".equals(dealTicketPrice)){
             dealTicketPrice = "0";
         }
@@ -428,7 +428,10 @@ public class XcCmd extends AbstractCommonCommand<Map<String, Object>> {
             writeLog("TicketInfoID_th----" + TicketInfoID_th);
             //D原车次；C改签车次
             String TrainTicketType = ticketInfo_z.getString("TrainTicketType");
-            String ticketPrice = ticketInfo_z.getString("TicketPrice");//原火车金额
+            String ticketPrice = Util.null2String(ticketInfo_z.getString("TicketPrice"));//原火车金额
+            if("".equals(ticketPrice)){
+                ticketPrice = "0";
+            }
             jg = jg + Util.getDoubleValue(ticketPrice);
         }
 
@@ -683,14 +686,14 @@ public class XcCmd extends AbstractCommonCommand<Map<String, Object>> {
         double yjpje_2 = Util.getDoubleValue(TripRecordInfoEntity.getString("PrintPrice"))+Util.getDoubleValue(TripRecordInfoEntity.getString("Oil"))+Util.getDoubleValue(TripRecordInfoEntity.getString("Tax"));
         double tgqf_2 = Util.getDoubleValue(basicInfo.getString("RefundAmount"))+Util.getDoubleValue(basicInfo.getString("ChangeAmount"));
 
-        String xx = ChangeInfoEntity.getString("CPrintPrice");
+        String xx = Util.null2String(ChangeInfoEntity.getString("CPrintPrice"));
         if("".equals(xx)){
             xx = "0";
         }
 
         map.put("fjypj",yjpje_2);
         map.put("fjtpcsfy",tgqf_2);
-        map.put("fjgqj",0);
+        map.put("fjgqj",xx);
 
 
 
diff --git a/com/engine/tjyh/xc/service/impl/XcServiceImpl.java b/com/engine/tjyh/xc/service/impl/XcServiceImpl.java
index cd81f44..cc0b157 100644
--- a/com/engine/tjyh/xc/service/impl/XcServiceImpl.java
+++ b/com/engine/tjyh/xc/service/impl/XcServiceImpl.java
@@ -2,7 +2,6 @@ package com.engine.tjyh.xc.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.engine.core.impl.Service;
-import com.engine.tjyh.xc.cmd.XcCmd;
 import com.engine.tjyh.xc.cmd.XcCmd2;
 import com.engine.tjyh.xc.service.XcService;
 
diff --git a/com/engine/tjyh/xc/util/HttpRequestUtil.java b/com/engine/tjyh/xc/util/HttpRequestUtil.java
index b3a5b12..aa01534 100644
--- a/com/engine/tjyh/xc/util/HttpRequestUtil.java
+++ b/com/engine/tjyh/xc/util/HttpRequestUtil.java
@@ -73,19 +73,27 @@ public class HttpRequestUtil extends BaseBean {
      * @param client
      */
     private void proxyConfig(DefaultHttpClient client) {
-        writeLog("================proxyConfig==================");
+        writeLog("================proxyConfig==================s");
         boolean isAgent = true;
         if (isAgent) {   //开启了代理
-            String host = "10.200.1.69";
-            int port = 9063;
-            String userName = "root";
-            String password = "Qasd!234";
+            BaseBean bb = new BaseBean();
+            bb.getPropValue("tjyhxcjc","host");
+            String host =  bb.getPropValue("tjyhxcjc","host");
+            int port = Util.getIntValue(bb.getPropValue("tjyhxcjc","port"));
+            String userName = bb.getPropValue("tjyhxcjc","userName");
+            String password = bb.getPropValue("tjyhxcjc","password");
+
+            writeLog(host);
+            writeLog(port);
+            writeLog(userName);
+            writeLog(password);
 
             client.getCredentialsProvider().setCredentials(new AuthScope(host, port), new UsernamePasswordCredentials(userName, password));
 
             HttpHost httpHost = new HttpHost(host, port);
             client.getParams().setParameter(ConnRouteParams.DEFAULT_PROXY, httpHost);
         }
+        writeLog("================proxyConfig==================e");
     }
 
     /**