From 7f87d06ca878e35373bc0910cda0d4aef4bcb5ed Mon Sep 17 00:00:00 2001
From: "yan.y" <yiyan@021.com>
Date: Fri, 14 Mar 2025 14:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/linln/admin/config/InitLoadDataService.java | 2 +-
 .../linln/admin/orders/controller/OrderMainController.java    | 2 +-
 .../src/main/java/com/linln/admin/orders/domain/PetGoods.java | 1 +
 .../linln/admin/orders/service/impl/OrderMainServiceImpl.java | 4 ++++
 .../linln/admin/orders/service/impl/PetGoodsServiceImpl.java  | 3 +++
 admin/src/main/resources/templates/orders/orderMain/add.html  | 2 +-
 admin/src/main/resources/templates/orders/petGoods/add.html   | 2 +-
 .../src/main/resources/templates/orders/petGoods/detail.html  | 2 +-
 8 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/admin/src/main/java/com/linln/admin/config/InitLoadDataService.java b/admin/src/main/java/com/linln/admin/config/InitLoadDataService.java
index dbaf9cf..f715c30 100644
--- a/admin/src/main/java/com/linln/admin/config/InitLoadDataService.java
+++ b/admin/src/main/java/com/linln/admin/config/InitLoadDataService.java
@@ -122,7 +122,7 @@ public class InitLoadDataService extends ApplicationAvailabilityBean {
     /**
      * 优惠券过期逻辑
      */
-    @Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "0 0/5 * * * ?")
     public void couponsExpire() {
         List<UserCoupons> userCouponsList = usersCouponsRepository.findUserCouponsByLastExpireTimeLessThan(new Date());
         for (UserCoupons userCoupons : userCouponsList) {
diff --git a/admin/src/main/java/com/linln/admin/orders/controller/OrderMainController.java b/admin/src/main/java/com/linln/admin/orders/controller/OrderMainController.java
index 03fbfb3..5ceddf3 100644
--- a/admin/src/main/java/com/linln/admin/orders/controller/OrderMainController.java
+++ b/admin/src/main/java/com/linln/admin/orders/controller/OrderMainController.java
@@ -230,7 +230,7 @@ public class OrderMainController {
         }
         beOrderMain.setServiceTime(orderMain.getServiceTime());
         orderMainService.save(beOrderMain);
-        orderMainService.updateCarOrder(orderMain.getOrderId(), orderMain.getCarId());
+        orderMainService.updateCarOrder(beOrderMain.getOrderId(), orderMain.getCarId());
         return ResultVoUtil.SAVE_SUCCESS;
     }
 
diff --git a/admin/src/main/java/com/linln/admin/orders/domain/PetGoods.java b/admin/src/main/java/com/linln/admin/orders/domain/PetGoods.java
index 687a1fd..da5bfe5 100644
--- a/admin/src/main/java/com/linln/admin/orders/domain/PetGoods.java
+++ b/admin/src/main/java/com/linln/admin/orders/domain/PetGoods.java
@@ -37,6 +37,7 @@ public class PetGoods implements Serializable {
     private Integer weight;
     // 宠物毛发
     private Integer hair;
+    @Transient
     private Integer size;
     // 商品ID
     private Long goodsId;
diff --git a/admin/src/main/java/com/linln/admin/orders/service/impl/OrderMainServiceImpl.java b/admin/src/main/java/com/linln/admin/orders/service/impl/OrderMainServiceImpl.java
index e131da9..45776ff 100644
--- a/admin/src/main/java/com/linln/admin/orders/service/impl/OrderMainServiceImpl.java
+++ b/admin/src/main/java/com/linln/admin/orders/service/impl/OrderMainServiceImpl.java
@@ -228,6 +228,10 @@ public class OrderMainServiceImpl implements OrderMainService {
     @Override
     public void updateCarOrder(String orderId, Long carId) {
         CarOrder carOrder = carOrderRepository.findFirstByOrderId(orderId);
+        if (carOrder == null) {
+            carOrder = new CarOrder();
+            carOrder.setOrderId(orderId);
+        }
         carOrder.setCarId(carId);
         carOrderRepository.save(carOrder);
     }
diff --git a/admin/src/main/java/com/linln/admin/orders/service/impl/PetGoodsServiceImpl.java b/admin/src/main/java/com/linln/admin/orders/service/impl/PetGoodsServiceImpl.java
index 4a91039..d4f71e5 100644
--- a/admin/src/main/java/com/linln/admin/orders/service/impl/PetGoodsServiceImpl.java
+++ b/admin/src/main/java/com/linln/admin/orders/service/impl/PetGoodsServiceImpl.java
@@ -48,6 +48,9 @@ public class PetGoodsServiceImpl implements PetGoodsService {
         List<PetGoods> content = petGoodsPage.getContent();
         for (PetGoods petGoods : content) {
             petGoods.setAssortmentDesc(petGoods.getAssortment() == 0 ? "无" : InitLoadDataService.PET_BASE_INFO_MAP.get(Long.parseLong(petGoods.getAssortment().toString())).getAssortment());
+            if (!InitLoadDataService.GOODS_MAP.containsKey(petGoods.getGoodsId())) {
+                System.out.println(petGoods.getId());
+            }
             petGoods.setGoods(InitLoadDataService.GOODS_MAP.get(petGoods.getGoodsId()));
         }
         return petGoodsPage;
diff --git a/admin/src/main/resources/templates/orders/orderMain/add.html b/admin/src/main/resources/templates/orders/orderMain/add.html
index 3782ff7..b5345ab 100644
--- a/admin/src/main/resources/templates/orders/orderMain/add.html
+++ b/admin/src/main/resources/templates/orders/orderMain/add.html
@@ -62,7 +62,7 @@
         laydate.render({
             elem: '#serviceTime',
             type: 'datetime',
-            format: 'yyyy-MM-dd HH'
+            format: 'yyyy-MM-dd HH:mm'
         });
     })
 </script>
diff --git a/admin/src/main/resources/templates/orders/petGoods/add.html b/admin/src/main/resources/templates/orders/petGoods/add.html
index 839dd77..e859fec 100644
--- a/admin/src/main/resources/templates/orders/petGoods/add.html
+++ b/admin/src/main/resources/templates/orders/petGoods/add.html
@@ -21,7 +21,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">宠物大小</label>
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="size" placeholder="请输入宠物大小" th:value="${petGoods?.size}">
+                <input class="layui-input" type="text" name="petSize" placeholder="请输入宠物大小" th:value="${petGoods?.petSize}">
             </div>
         </div>
         <div class="layui-form-item">
diff --git a/admin/src/main/resources/templates/orders/petGoods/detail.html b/admin/src/main/resources/templates/orders/petGoods/detail.html
index 358ab6d..f4a981f 100644
--- a/admin/src/main/resources/templates/orders/petGoods/detail.html
+++ b/admin/src/main/resources/templates/orders/petGoods/detail.html
@@ -21,7 +21,7 @@
                     <th>宠物类型</th>
                     <td th:text="${petGoods.petType}"></td>
                     <th>宠物大小</th>
-                    <td th:text="${petGoods.size}"></td>
+                    <td th:text="${petGoods.petSize}"></td>
                 </tr>
                 <tr>
                     <th>宠物体重</th>