'提交代码'

hai-service/src/main/java/com/hai/common/exception/ErrorCode.java

@@ -121,6 +121,7 @@ public enum ErrorCode {
     DELETE_DATA_ERROR("3003","删除数据失败"),
     COMPETENCE_INSUFFICIENT("3004","权限不足"),
     REQUEST_ERROR("3005","请求错误"),
+    REQUEST_TIMED_OUT("3006","请求超时，请稍后重试"),
 
 	MSG_EVENT_NULL("2999","消息类型为空"),
 	USE_VISIT_ILLEGAL("4001","用户身份错误"),

hai-service/src/main/java/com/hai/config/HuiLianTongUnionCardConfig.java

@@ -72,18 +72,23 @@ public class HuiLianTongUnionCardConfig {
      * @throws Exception
      */
     public static JSONObject queryConsumptionRecordByBusiness(String businessType,String cardNo,Long sdate,Long edate,Integer page,Integer pageSize) throws Exception {
-        Map<String,Object> dataMap = new HashMap<>();
-        dataMap.put("businessType", businessType);
-        dataMap.put("cardNo", cardNo);
-        dataMap.put("page", page);
-        dataMap.put("pageSize", pageSize);
-        if (sdate != null) {
-            dataMap.put("sdate", DateUtil.date2String(new Date(sdate), "yyyy-MM-dd"));
+        try {
+            Map<String,Object> dataMap = new HashMap<>();
+            dataMap.put("businessType", businessType);
+            dataMap.put("cardNo", cardNo);
+            dataMap.put("page", page);
+            dataMap.put("pageSize", pageSize);
+            if (sdate != null) {
+                dataMap.put("sdate", DateUtil.date2String(new Date(sdate), "yyyy-MM-dd"));
+            }
+            if (edate != null) {
+                dataMap.put("edate", DateUtil.date2String(new Date(edate), "yyyy-MM-dd"));
+            }
+            return request("qtk/queryConsumptionRecordByBusiness", dataMap);
+        } catch (Exception e) {
+            throw ErrorHelp.genException(SysCode.System, ErrorCode.REQUEST_TIMED_OUT, "");
         }
-        if (edate != null) {
-            dataMap.put("edate", DateUtil.date2String(new Date(edate), "yyyy-MM-dd"));
-        }
-        return request("qtk/queryConsumptionRecordByBusiness", dataMap);
+
     }
 
     /**