From 7032513f7f55e35755deccd6fef36c97a575c498 Mon Sep 17 00:00:00 2001
From: "yan.y" <yiyan@021.com>
Date: Tue, 8 Apr 2025 11:53:31 +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

---
 .../controller/OrderMainController.java       |  3 ++
 .../linln/admin/orders/domain/OrderMain.java  |  1 +
 .../service/impl/OrderMainServiceImpl.java    |  1 +
 .../templates/orders/orderMain/add.html       |  7 +++++
 .../templates/orders/orderMain/index.html     | 30 ++++++++++++++-----
 .../resources/templates/users/pets/index.html | 22 +++++++-------
 6 files changed, 46 insertions(+), 18 deletions(-)

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 5ceddf3..cb01f56 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
@@ -229,6 +229,9 @@ public class OrderMainController {
             orderMainService.updateUserAddr(orderMain.getAddrId(), orderMain.getAddr());
         }
         beOrderMain.setServiceTime(orderMain.getServiceTime());
+        if (StrUtil.isNotBlank(orderMain.getRemark())) {
+            beOrderMain.setRemark(orderMain.getRemark());
+        }
         orderMainService.save(beOrderMain);
         orderMainService.updateCarOrder(beOrderMain.getOrderId(), orderMain.getCarId());
         return ResultVoUtil.SAVE_SUCCESS;
diff --git a/admin/src/main/java/com/linln/admin/orders/domain/OrderMain.java b/admin/src/main/java/com/linln/admin/orders/domain/OrderMain.java
index d033fff..5e2830f 100644
--- a/admin/src/main/java/com/linln/admin/orders/domain/OrderMain.java
+++ b/admin/src/main/java/com/linln/admin/orders/domain/OrderMain.java
@@ -116,6 +116,7 @@ public class OrderMain implements Serializable {
     private String payDj;
     @Transient
     private String carInfo;
+    private String remark;
 
     public OrderMain() {
     }
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 45776ff..de5cfac 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
@@ -227,6 +227,7 @@ public class OrderMainServiceImpl implements OrderMainService {
 
     @Override
     public void updateCarOrder(String orderId, Long carId) {
+        if (carId == 0) return;
         CarOrder carOrder = carOrderRepository.findFirstByOrderId(orderId);
         if (carOrder == null) {
             carOrder = new CarOrder();
diff --git a/admin/src/main/resources/templates/orders/orderMain/add.html b/admin/src/main/resources/templates/orders/orderMain/add.html
index b5345ab..5aff48a 100644
--- a/admin/src/main/resources/templates/orders/orderMain/add.html
+++ b/admin/src/main/resources/templates/orders/orderMain/add.html
@@ -25,6 +25,12 @@
                        th:value="${orderMain.projectionServiceTime}"/>
             </div>
         </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">备注</label>
+            <div class="layui-input-inline">
+                <textarea name="remark" th:value="${orderMain.remark}"></textarea>
+            </div>
+        </div>
         <div class="layui-form-item">
             <label class="layui-form-label">详细地址信息</label>
             <div class="layui-input-inline">
@@ -43,6 +49,7 @@
             <label class="layui-form-label">服务车辆</label>
             <div class="layui-input-inline">
                 <select class="timo-search-select" id="carId" name="carId">
+                    <option th:text="无" value="0"></option>
                     <option th:each="c,Car:${cars}" th:value="${c.id}" th:text="${c.carNo}"></option>
                 </select>
             </div>
diff --git a/admin/src/main/resources/templates/orders/orderMain/index.html b/admin/src/main/resources/templates/orders/orderMain/index.html
index f978d95..580c14d 100644
--- a/admin/src/main/resources/templates/orders/orderMain/index.html
+++ b/admin/src/main/resources/templates/orders/orderMain/index.html
@@ -57,7 +57,10 @@
                             <option value="1" th:selected="${#strings.equals(param.payStatus, '1')}">已支付</option>
                         </select>
                     </div>
-
+                    <label class="layui-form-label">服务时间</label>
+                    <div class="layui-input-inline">
+                        <input class="layui-input" type="text" id="serviceTime" name="serviceTime" placeholder="请输入服务时间"  th:value="${param?.serviceTime}" lay-key="1" >
+                    </div>
                     <button class="layui-btn timo-search-btn">
                         <i class="fa fa-search"></i>
                     </button>
@@ -71,14 +74,15 @@
                 <tr>
                     <th>操作</th>
                     <th>用户ID</th>
+                    <th>备注</th>
                     <th>用户余额</th>
-                    <th>订单创建时间</th>
                     <th>服务时间</th>
                     <th>订单状态</th>
                     <th>派单状态</th>
                     <th>派单信息</th>
                     <th>地址信息</th>
                     <th>宠物信息</th>
+                    <th>优惠券名称</th>
                     <th>洗护时长</th>
                     <th>付款状态</th>
                     <th>支付类型</th>
@@ -89,8 +93,8 @@
                     <th>会员折扣</th>
                     <th>优惠券折扣金额</th>
                     <th>优惠券ID</th>
-                    <th>优惠券名称</th>
                     <th>订单ID</th>
+                    <th>订单创建时间</th>
                     <th>支付订单号</th>
                 </tr>
                 </thead>
@@ -107,14 +111,15 @@
                         <a th:if="${item.orderStatus == 3 || item.orderStatus == 4}" class="ajax-get" data-msg="您是否确认删除" th:href="@{/orders/orderMain/status/delete(ids=${item.id})}">删除</a>
                     </td>
                     <td th:text="${item.uid}">用户ID</td>
+                    <td style="white-space: pre-wrap; width: 100px;" th:text="${item.remark}">备注</td>
                     <td th:text="${item.orderUser.amount == null ? 0 : item.orderUser.amount / 10.0}">用户余额</td>
-                    <td th:text="${item.createTime}">订单创建时间</td>
                     <td th:text="${item.serviceTime}">服务时间</td>
                     <td th:text="${#dicts.orderStatus(item.orderStatus)}">订单状态</td>
                     <td th:text="${#dicts.dispatchStatus(item.dispatchStatus)}">派单状态</td>
-                    <td th:utext="${item.carInfo}">派单信息</td>
-                    <td th:utext="${item.userServiceAddr}">地址信息</td>
+                    <td style="white-space: pre-wrap; width: 100px;" th:utext="${item.carInfo}">派单信息</td>
+                    <td style="white-space: pre-wrap; width: 100px;" th:utext="${item.userServiceAddr}">地址信息</td>
                     <td th:utext="${item.petInfos}">宠物信息</td>
+                    <td th:text="${item.coupons?.name}">优惠券名称</td>
                     <td th:text="${item.projectionServiceTime}">洗护时长</td>
                     <td th:text="${#dicts.payStatus(item.payStatus)}">付款状态</td>
                     <td th:text="${#dicts.payType(item.payType)}">支付类型</td>
@@ -125,8 +130,8 @@
                     <td th:text="${item.payDiscount / 100.0}">会员折扣</td>
                     <td th:text="${item.goodsDiscountAmount / 10.0}">优惠券折扣金额</td>
                     <td th:text="${item.ucid}">优惠券ID</td>
-                    <td th:text="${item.coupons?.name}">优惠券名称</td>
                     <td th:text="${item.orderId}">订单ID</td>
+                    <td th:text="${item.createTime}">订单创建时间</td>
                     <td th:text="${item.payOrderId}">支付订单号</td>
 
                     <!--<td>
@@ -142,5 +147,16 @@
     </div>
 </div>
 <script th:replace="/common/template :: script"></script>
+<script type="text/javascript">
+    layui.use(['laydate','form'], function () {
+        var laydate = layui.laydate;
+        // 渲染
+        laydate.render({
+            elem: '#serviceTime',
+            type: 'datetime',
+            format: 'yyyy-MM-dd HH:mm'
+        });
+    })
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/admin/src/main/resources/templates/users/pets/index.html b/admin/src/main/resources/templates/users/pets/index.html
index 0e7d6c4..17689f4 100644
--- a/admin/src/main/resources/templates/users/pets/index.html
+++ b/admin/src/main/resources/templates/users/pets/index.html
@@ -84,16 +84,16 @@
         </div>
     </div>
 <script th:replace="/common/template :: script"></script>
-    <script type="text/javascript">
-        layui.use(['laydate','form'], function () {
-            var laydate = layui.laydate;
-            // 渲染
-            laydate.render({
-                elem: '#birthday',
-                type: 'month',
-                format: 'MM'
-            });
-        })
-    </script>
+<script type="text/javascript">
+    layui.use(['laydate','form'], function () {
+        var laydate = layui.laydate;
+        // 渲染
+        laydate.render({
+            elem: '#birthday',
+            type: 'month',
+            format: 'MM'
+        });
+    })
+</script>
 </body>
 </html>
\ No newline at end of file