From 4ef6b6de2c1166a16caba8f226c85fb0299db83a Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 3 Jul 2025 14:55:42 +0800
Subject: [PATCH] no message

---
 .../resources/templates/order/master.html     | 23 +++++++++++++++++++
 .../com/ghy/order/domain/OrderMaster.java     | 12 ++++++++++
 .../mapper/order/OrderMasterMapper.xml        | 16 +++++++++++--
 3 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html
index 2b464d2a..24782d62 100644
--- a/ghy-admin/src/main/resources/templates/order/master.html
+++ b/ghy-admin/src/main/resources/templates/order/master.html
@@ -703,6 +703,29 @@
                     field: 'orderImgs',
                     title: '完单图片'
                 },
+                {
+                    field: 'orderImages',
+                    title: '下单图片',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        if (value && value.trim() !== '') {
+                            return '<img src="' + value + '" style="width: 50px; height: 50px; object-fit: cover;" onclick="showImagePreview(\'' + value + '\')">';
+                        }
+                        return '-';
+                    }
+                },
+                {
+                    field: 'isDeliveryToStore',
+                    title: '是否发货到服务店',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        if (value === 1) {
+                            return '<span class="label label-success">是</span>';
+                        } else {
+                            return '<span class="label label-default">否</span>';
+                        }
+                    }
+                },
                 {
                     field: 'orderType',
                     title: '订单类型',
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
index 5b0e6906..383f5c22 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
@@ -250,4 +250,16 @@ public class OrderMaster extends BaseEntity {
      * 是否已派发服务订单：0=未派发，1=已派发
      */
     private Integer hasServiceOrder;
+
+    /**
+     * 下单图片
+     */
+    @Excel(name = "下单图片", cellType = Excel.ColumnType.STRING)
+    private String orderImages;
+
+    /**
+     * 是否发货到服务店：0=否，1=是
+     */
+    @Excel(name = "是否发货到服务店", cellType = Excel.ColumnType.NUMERIC)
+    private Integer isDeliveryToStore;
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index a785e59d..36898a3d 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -56,6 +56,8 @@
         <result property="goodsOrderMasterId" column="goods_order_master_id"/>
         <result property="trackingNumber"    column="tracking_number"/>
         <result property="hasServiceOrder"   column="has_service_order"/>
+        <result property="orderImages"       column="order_images"/>
+        <result property="isDeliveryToStore" column="is_delivery_to_store"/>
 
     </resultMap>
 
@@ -109,7 +111,9 @@
                goods_order_master_id,
                tracking_number,
                server_goods_money,
-               has_service_order
+               has_service_order,
+               order_images,
+               is_delivery_to_store
 
         FROM order_master
     </sql>
@@ -163,7 +167,9 @@
                om.goods_order_master_id,
                om.tracking_number,
                om.server_goods_money,
-               om.has_service_order
+               om.has_service_order,
+               om.order_images,
+               om.is_delivery_to_store
         FROM order_master om
         LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id
         LEFT JOIN goods g ON g.goods_id = om.goods_id
@@ -460,6 +466,8 @@
             <if test="trackingNumber != null">tracking_number = #{trackingNumber},</if>
             <if test="serverGoodsMoney != null">server_goods_money = #{serverGoodsMoney},</if>
             <if test="hasServiceOrder != null">has_service_order = #{hasServiceOrder},</if>
+            <if test="orderImages != null">order_images = #{orderImages},</if>
+            <if test="isDeliveryToStore != null">is_delivery_to_store = #{isDeliveryToStore},</if>
             update_time = SYSDATE()
         </set>
         WHERE id = #{id}
@@ -519,6 +527,8 @@
         <if test="trackingNumber != null and trackingNumber != ''">tracking_number,</if>
         <if test="serverGoodsMoney != null">server_goods_money,</if>
         <if test="hasServiceOrder != null">has_service_order,</if>
+        <if test="orderImages != null">order_images,</if>
+        <if test="isDeliveryToStore != null">is_delivery_to_store,</if>
         create_time
         )VALUES(
         <if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -559,6 +569,8 @@
         <if test="trackingNumber != null and trackingNumber != ''">#{trackingNumber},</if>
         <if test="serverGoodsMoney != null">#{serverGoodsMoney},</if>
         <if test="hasServiceOrder != null">#{hasServiceOrder},</if>
+        <if test="orderImages != null">#{orderImages},</if>
+        <if test="isDeliveryToStore != null">#{isDeliveryToStore},</if>
         SYSDATE()
         )
     </insert>