网关日志限制修改

ace-gate/src/main/java/com/github/wxiaoqi/security/gate/filter/ResponseRecordFilter.java

@@ -19,7 +19,6 @@ import org.springframework.http.codec.ClientCodecConfigurer;
 import org.springframework.http.codec.json.Jackson2JsonDecoder;
 import org.springframework.http.codec.json.Jackson2JsonEncoder;
 import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
-import org.springframework.stereotype.Component;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.reactive.function.BodyInserter;
 import org.springframework.web.reactive.function.BodyInserters;
@@ -31,7 +30,7 @@ import reactor.core.publisher.Mono;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-@Component
+//@Component
 @Slf4j
 public class ResponseRecordFilter implements GlobalFilter, Ordered {
 

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/dto/SmsTemplateDTO.java

@@ -62,6 +62,10 @@ public class SmsTemplateDTO {
     public static final int REFUND_A = 22;
     //违章押金退还
     public static final int REFUND_B = 23;
+    //旅游内部通知（客服）
+    public static final int PAY_H = 24;
+    //取消旅游订单（客服）
+    public static final int CANCEL_F = 25;
 
 
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/CCPRestSmsBiz.java

@@ -58,6 +58,11 @@ public class CCPRestSmsBiz{
     //违章押金退还 23
     public static final String TEMPLATE_ID_FINISH_B = "460773";
 
+    //旅游内部通知（客服）24
+    public static final String TEMPLATE_ID_PAY_H = "461421";
+    //取消旅游订单（客服）25
+    public static final String TEMPLATE_ID_CANCEL_F = "461424";
+
 
 
 
@@ -131,6 +136,12 @@ public class CCPRestSmsBiz{
              case 23 :
                  CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_FINISH_B);
                  break;
+             case 24 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_PAY_H);
+                 break;
+             case 25 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_CANCEL_F);
+                 break;
 
          }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -82,7 +82,7 @@ public class VehicleActiveService {
             }
             //修改预约记录状态
             if(departureVo.getBookRecordId() != null) {
-                updateBookRecordStatus(departureVo.getBookRecordId());
+                updateBookRecordStatus(departureVo.getBookRecordId(), 1);
             }
             VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(departureVo.getBookRecordId());
            if(vehicleDepartureLogVo != null) {
@@ -154,7 +154,7 @@ public class VehicleActiveService {
             }
 
             if(arrivalVo.getBookRecordId() != null) {
-                updateBookRecordStatus(arrivalVo.getBookRecordId());
+                updateBookRecordStatus(arrivalVo.getBookRecordId(), 2);
             }
 
 
@@ -192,10 +192,15 @@ public class VehicleActiveService {
         }
     }
 
-    public void updateBookRecordStatus(Integer bookRecordId) {
+    public void updateBookRecordStatus(Integer bookRecordId, Integer type) {
         VehicleBookRecord vehicleBookRecord = vehicleBookRecordBiz.selectById(bookRecordId);
         if(vehicleBookRecord != null) {
             vehicleBookRecord.setStatus(VehicleBookRecordStatus.LIFTED.getCode());
+            if(type == 1) {
+                vehicleBookRecord.setActualStartDate(new Date());
+            } else {
+                vehicleBookRecord.setActualEndDate(new Date());
+            }
             vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
         } else {
             throw new BaseException(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc(),