Merge remote-tracking branch 'origin/master'

authentication/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
     </appender>
 
     <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
-        <graylogHost>192.168.5.250</graylogHost>
+        <graylogHost>192.168.1.250</graylogHost>
 <!--        <graylogHost>172.24.144.227</graylogHost>-->
         <graylogPort>12201</graylogPort>
         <includeMdcData>true</includeMdcData>

gateway/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
     </appender>
 
     <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
-        <graylogHost>192.168.5.250</graylogHost>
+        <graylogHost>192.168.1.250</graylogHost>
 <!--        <graylogHost>172.24.144.227</graylogHost>-->
         <graylogPort>12201</graylogPort>
         <includeMdcData>true</includeMdcData>

partner/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
     </appender>
 
     <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
-        <graylogHost>192.168.5.250</graylogHost>
+        <graylogHost>192.168.1.250</graylogHost>
 <!--        <graylogHost>172.24.144.227</graylogHost>-->
         <graylogPort>12201</graylogPort>
         <includeMdcData>true</includeMdcData>

platform/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
     </appender>
 
     <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
-        <graylogHost>192.168.5.250</graylogHost>
+        <graylogHost>192.168.1.250</graylogHost>
 <!--        <graylogHost>172.24.144.227</graylogHost>-->
         <graylogPort>12201</graylogPort>
         <includeMdcData>true</includeMdcData>

tenant/costsorrule/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
     </appender>
 
     <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
-        <graylogHost>192.168.5.250</graylogHost>
+        <graylogHost>192.168.1.250</graylogHost>
 <!--        <graylogHost>172.24.144.227</graylogHost>-->
         <graylogPort>12201</graylogPort>
         <includeMdcData>true</includeMdcData>

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/component/RequestComponent.java

@@ -196,6 +196,7 @@ public class RequestComponent {
 
     /**
      * 构建URL
+     *
      * @param baseUrl
      * @param params
      * @return String
@@ -254,7 +255,7 @@ public class RequestComponent {
         webClient.post().uri(url).headers(setHeaders(headers)).body(BodyInserters.fromValue(body)).retrieve();
     }
 
-    public <Response> ResponseEntity<Response> chengTaiGet(String url, Object initDataRequest,ParameterizedTypeReference<Response> bodyTypeReference, HttpHeaders headers) {
+    public <Response> ResponseEntity<Response> chengTaiGet(String url, Object initDataRequest, ParameterizedTypeReference<Response> bodyTypeReference, HttpHeaders headers) {
         return webClient.get()
                 .uri(url)
                 .headers(setHeaders(headers))
@@ -357,6 +358,7 @@ public class RequestComponent {
 
     /**
      * 太平洋请求加cookie
+     *
      * @param url
      * @param body
      * @param headers
@@ -367,14 +369,14 @@ public class RequestComponent {
         if (log.isDebugEnabled()) {
             log.debug("request body is {}", body);
         }
-        System.out.println("request body is {"+body+"}");
+        System.out.println("request body is {" + body + "}");
         body = Optional.ofNullable(body).orElse("");
         WebClient webClient = selectWebClient(url);
         try {
             return webClient.post()
                     .uri(url)
                     .headers(setHeaders(headers))
-                    .cookie("route",cookiesRequest.getRoute())
+                    .cookie("route", cookiesRequest.getRoute())
                     .cookie("JSESSIONID", cookiesRequest.getJsessionId())
                     .body(BodyInserters.fromValue(body))
                     .retrieve()
@@ -718,8 +720,8 @@ public class RequestComponent {
             // 判断返回的字符串是否为有效的JSON格式
             if (isValidJson(responseBody)) {
                 result = JSON.parseObject(responseBody, responseClass);
-            }else{
-                result = (Response)responseBody;
+            } else {
+                result = (Response) responseBody;
             }
             // 构建返回的ResponseEntity
             return ResponseEntity.status(rawResponse.getStatusCode()).headers(rawResponse.getHeaders()).body(result);
@@ -790,10 +792,10 @@ public class RequestComponent {
             // 判断返回的字符串是否为有效的JSON格式
             if (isValidJson(responseBody)) {
                 result = JSON.parseObject(responseBody, responseClass);
-            }else{
-                result = (Response)responseBody;
+            } else {
+                result = (Response) responseBody;
             }
-            InsuranceLog.infoLog(InsuranceEnum.XDCX.getPinyin(), "\t---------> URl: {} \t---------> 请求参数:{}", url, BodyInserters.fromValue(body));
+            InsuranceLog.infoLog(InsuranceEnum.XDCX.getPinyin(), "\t---------> URl: {} \t---------> 请求参数:{}", url, body == null ? "" : BodyInserters.fromValue(body));
             InsuranceLog.infoLog(InsuranceEnum.XDCX.getPinyin(), "\t---------> 响应参数:{}", result);
             // 构建返回的ResponseEntity
             HttpHeaders responseHeaders = new HttpHeaders();
@@ -892,7 +894,7 @@ public class RequestComponent {
      * @param <T>           响应实体
      * @return 响应
      */
-    public <T> Mono<T> postGbk(String url, String body, Class<T> responseClass, HttpHeaders headers,String type) {
+    public <T> Mono<T> postGbk(String url, String body, Class<T> responseClass, HttpHeaders headers, String type) {
         if (log.isDebugEnabled()) {
             log.debug("request body is {}", body);
         }
@@ -907,7 +909,7 @@ public class RequestComponent {
                     // 将解码后的响应体转换为 Java 对象
                     try {
                         InsuranceLog.infoLog(InsuranceEnum.ZMBX.getPinyin(), "\n\t---------> {} \n\t---------> URl: {} \n\t---------> 响应参数:{}",
-                                "爬虫" + type,url,responseBody);
+                                "爬虫" + type, url, responseBody);
                         return JSON.parseObject(responseBody).toJavaObject(responseClass);
                     } catch (Exception e) {
                         throw new RuntimeException("JSON 解析失败", e);
@@ -1032,12 +1034,12 @@ public class RequestComponent {
                 .block();
     }
 
-    public <Response> ResponseEntity<Response> formDataZhongAn(String url, Object body, Class<Response> responseClass, HttpHeaders headers,String type) {
+    public <Response> ResponseEntity<Response> formDataZhongAn(String url, Object body, Class<Response> responseClass, HttpHeaders headers, String type) {
         MultiValueMap<String, Object> multiValueMap = RequestObjectConversion.convertMultiValueMap(body);
-        return formDatazhongan1(url, multiValueMap, responseClass, headers,type);
+        return formDatazhongan1(url, multiValueMap, responseClass, headers, type);
     }
 
-    public <Response> ResponseEntity<Response> formDatazhongan1(String url, MultiValueMap<String, Object> parts, Class<Response> responseClass, HttpHeaders headers,String type) {
+    public <Response> ResponseEntity<Response> formDatazhongan1(String url, MultiValueMap<String, Object> parts, Class<Response> responseClass, HttpHeaders headers, String type) {
 
         return webClient.post()
                 .uri(url)
@@ -1046,11 +1048,11 @@ public class RequestComponent {
                 .body(BodyInserters.fromMultipartData(parts))
                 .retrieve()
                 .toEntity(responseClass).doOnNext(responseBody -> InsuranceLog.infoLog(InsuranceEnum.ZAPA.getPinyin(), "\n\t---------> {} \n\t---------> URl: {} \n\t---------> 响应参数:{}",
-                        "爬虫" + type,url,JSONObject.toJSONString(responseBody)))
+                        "爬虫" + type, url, JSONObject.toJSONString(responseBody)))
                 .block();
     }
 
-    public String formDataString(String url, Object body, HttpHeaders headers,String type) {
+    public String formDataString(String url, Object body, HttpHeaders headers, String type) {
         MultiValueMap<String, Object> multiValueMap = RequestObjectConversion.convertMultiValueMap(body);
         BodyInserters.MultipartInserter multipartInserter = BodyInserters.fromMultipartData(multiValueMap);
         String block = webClient.post()
@@ -1059,7 +1061,7 @@ public class RequestComponent {
                 .contentType(MediaType.APPLICATION_FORM_URLENCODED)
                 .body(BodyInserters.fromMultipartData(multiValueMap))
                 .retrieve().bodyToMono(String.class).doOnNext(responseBody -> InsuranceLog.infoLog(InsuranceEnum.ZAPA.getPinyin(), "\n\t---------> {} \n\t---------> URl: {} \n\t---------> 响应参数:{}",
-                        "爬虫" + type,url, JSONObject.parseObject(responseBody)))
+                        "爬虫" + type, url, JSONObject.parseObject(responseBody)))
                 .block();
 
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -330,11 +330,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 throw new SystemException("订单不存在或已删除");
             }
             // 插入订单信息，如果插入失败，则返回错误信息
+            insOrders.setIsTemporarily(ordersEnd.getIsTemporarily());
             int insertResult = insOrdersMapper.updateById(insOrders);
             if (insertResult <= 0) {
                 log.error("订单插入失败，订单信息: {}", JSONUtil.toJsonStr(insOrders));
                 return HttpResult.error("修改订单失败");
             }
+            // 新增订单审核
+            insFeeAuditService.feeAuditAdd(insOrders,baseController.getSystemCode());
             String quoteNo = insOrders.getId();
             // 获取车辆信息对象，并设置订单编号，然后保存车辆信息
             InsOrdersCarInfo insOrdersCarInfo = BeanUtil.copyProperties(ordersEnd.getCarInfoVo(), InsOrdersCarInfo.class);

tenant/insurance/quotation-summary/src/main/resources/logback-spring.xml

@@ -11,7 +11,7 @@
     <logger name="com.mongodb" level="WARN"/>
 
     <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
-        <graylogHost>192.168.5.250</graylogHost>
+        <graylogHost>192.168.1.250</graylogHost>
 <!--        <graylogHost>172.24.144.227</graylogHost>-->
         <graylogPort>12201</graylogPort>
         <includeMdcData>true</includeMdcData>

tenant/organization/src/main/java/com/jzg/organization/service/impl/SignInServiceImpl.java

@@ -243,7 +243,7 @@ public class SignInServiceImpl implements SignInService {
                             // 发送抽奖次数下发通知消息
                             MessageAddParam param = new MessageAddParam();
                             param.setTitle("抽奖次数下发通知消息");
-                            param.setContent("{\"eventId\":\"" + activity.getId() + "\",\"localActivityTableId\":\"" + table.getId() + "\",\"message\":\"抽奖次数奖励下发\"}");
+                            param.setContent("{\"eventId\":\"" + activity.getId() + "\",\"localActivityTableId\":\"" + table.getId() + "\",\"message\":\"签到活动:抽奖次数奖励下发\"}");
                             param.setTplCode("template_13");
                             param.setReceive(List.of(sysUser.getMobile()));
                             sysMessageService.messageAdd(param);

tenant/organization/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
     </appender>
 
     <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
-        <graylogHost>192.168.5.250</graylogHost>
+        <graylogHost>192.168.1.250</graylogHost>
 <!--        <graylogHost>172.24.144.227</graylogHost>-->
         <graylogPort>12201</graylogPort>
         <includeMdcData>true</includeMdcData>