Merge remote-tracking branch 'origin/dev' into dev

alien-store/src/main/java/shop/alien/store/controller/LawyerConsultationOrderController.java

@@ -34,9 +34,6 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class LawyerConsultationOrderController {
 
-    @Value("${order.coefficient}")
-    private String coefficient;
-
     private final LawyerConsultationOrderService consultationOrderService;
     private final OrderExpirationService orderExpirationService;
 
@@ -234,7 +231,7 @@ public class LawyerConsultationOrderController {
         //创建订单时，存储redis中，设置过期时间
         R<LawyerConsultationOrderDto> layerConsultationOrderDto = consultationOrderService.consultNow(lawyerConsultationOrder);
         if (R.isSuccess(layerConsultationOrderDto) && layerConsultationOrderDto.getData()!=null){
-            orderExpirationService.setOrderPaymentTimeout(layerConsultationOrderDto.getData().getOrderNumber(), 60 * Long.parseLong(coefficient));
+            orderExpirationService.setOrderPaymentTimeout(layerConsultationOrderDto.getData().getOrderNumber(), 60 * 30);
         }
 
         return layerConsultationOrderDto;