From 61e9859181e3e7cb76b7e2be8cf96187b3d2350a Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Tue, 8 Jul 2025 09:47:25 +0800
Subject: [PATCH] no message

---
 .../order/OrderMasterController.java          | 74 +++++++++++++++++++
 .../com/ghy/order/domain/OrderMaster.java     | 12 +++
 .../mapper/order/OrderMasterMapper.xml        | 16 +++-
 3 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index 7ec58522..297ad15c 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -165,6 +165,80 @@ public class OrderMasterController extends BaseController {
         return toAjax(orderMasterService.updateOrderMaster(orderMaster));
     }
 
+    /**
+     * 修改订单开票状态
+     *
+     * @param orderMaster 订单对象，包含id和isInvoiced字段
+     * @return 操作结果
+     */
+    @PostMapping("/changeInvoiceStatus")
+    @ResponseBody
+    @Log(title = "订单开票状态管理", businessType = BusinessType.UPDATE)
+    public AjaxResult changeInvoiceStatus(@RequestBody OrderMaster orderMaster)
+    {
+        try {
+            if (orderMaster.getId() == null) {
+                return AjaxResult.error("订单ID不能为空");
+            }
+            if (orderMaster.getIsInvoiced() == null) {
+                return AjaxResult.error("开票状态不能为空");
+            }
+            
+            // 只更新开票状态字段
+            OrderMaster updateOrder = new OrderMaster();
+            updateOrder.setId(orderMaster.getId());
+            updateOrder.setIsInvoiced(orderMaster.getIsInvoiced());
+            updateOrder.setUpdateBy(getLoginName());
+            
+            int result = orderMasterService.updateOrderMaster(updateOrder);
+            if (result > 0) {
+                String statusDesc = orderMaster.getIsInvoiced() == 0 ? "已开票" : "未开票";
+                return AjaxResult.success("订单开票状态已更新为：" + statusDesc);
+            } else {
+                return AjaxResult.error("更新失败，请检查订单是否存在");
+            }
+        } catch (Exception e) {
+            return AjaxResult.error("更新失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 修改订单是否需要开票状态
+     *
+     * @param orderMaster 订单对象，包含id和isNeedBill字段
+     * @return 操作结果
+     */
+    @PostMapping("/changeNeedBillStatus")
+    @ResponseBody
+    @Log(title = "订单是否需要开票状态管理", businessType = BusinessType.UPDATE)
+    public AjaxResult changeNeedBillStatus(@RequestBody OrderMaster orderMaster)
+    {
+        try {
+            if (orderMaster.getId() == null) {
+                return AjaxResult.error("订单ID不能为空");
+            }
+            if (orderMaster.getIsNeedBill() == null) {
+                return AjaxResult.error("是否需要开票状态不能为空");
+            }
+            
+            // 只更新是否需要开票状态字段
+            OrderMaster updateOrder = new OrderMaster();
+            updateOrder.setId(orderMaster.getId());
+            updateOrder.setIsNeedBill(orderMaster.getIsNeedBill());
+            updateOrder.setUpdateBy(getLoginName());
+            
+            int result = orderMasterService.updateOrderMaster(updateOrder);
+            if (result > 0) {
+                String statusDesc = orderMaster.getIsNeedBill() == 1 ? "需要开票" : "不需要开票";
+                return AjaxResult.success("订单是否需要开票状态已更新为：" + statusDesc);
+            } else {
+                return AjaxResult.error("更新失败，请检查订单是否存在");
+            }
+        } catch (Exception e) {
+            return AjaxResult.error("更新失败：" + e.getMessage());
+        }
+    }
+
     /**
      * 修改详细订单
      */
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 383f5c22..2998185d 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
@@ -262,4 +262,16 @@ public class OrderMaster extends BaseEntity {
      */
     @Excel(name = "是否发货到服务店", cellType = Excel.ColumnType.NUMERIC)
     private Integer isDeliveryToStore;
+
+    /**
+     * 是否已开票：0=是，1=否
+     */
+    @Excel(name = "是否已开票", cellType = Excel.ColumnType.NUMERIC, readConverterExp = "0=是,1=否")
+    private Integer isInvoiced;
+
+    /**
+     * 是否需要开票：0=不需要，1=需要
+     */
+    @Excel(name = "是否需要开票", cellType = Excel.ColumnType.NUMERIC, readConverterExp = "0=不需要,1=需要")
+    private Integer isNeedBill;
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index 36898a3d..102be70d 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -58,6 +58,8 @@
         <result property="hasServiceOrder"   column="has_service_order"/>
         <result property="orderImages"       column="order_images"/>
         <result property="isDeliveryToStore" column="is_delivery_to_store"/>
+        <result property="isInvoiced"        column="is_invoiced"/>
+        <result property="isNeedBill"        column="is_need_bill"/>
 
     </resultMap>
 
@@ -113,7 +115,9 @@
                server_goods_money,
                has_service_order,
                order_images,
-               is_delivery_to_store
+               is_delivery_to_store,
+               is_invoiced,
+               is_need_bill
 
         FROM order_master
     </sql>
@@ -169,7 +173,9 @@
                om.server_goods_money,
                om.has_service_order,
                om.order_images,
-               om.is_delivery_to_store
+               om.is_delivery_to_store,
+               om.is_invoiced,
+               om.is_need_bill
         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
@@ -468,6 +474,8 @@
             <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>
+            <if test="isInvoiced != null">is_invoiced = #{isInvoiced},</if>
+            <if test="isNeedBill != null">is_need_bill = #{isNeedBill},</if>
             update_time = SYSDATE()
         </set>
         WHERE id = #{id}
@@ -529,6 +537,8 @@
         <if test="hasServiceOrder != null">has_service_order,</if>
         <if test="orderImages != null">order_images,</if>
         <if test="isDeliveryToStore != null">is_delivery_to_store,</if>
+        <if test="isInvoiced != null">is_invoiced,</if>
+        <if test="isNeedBill != null">is_need_bill,</if>
         create_time
         )VALUES(
         <if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -571,6 +581,8 @@
         <if test="hasServiceOrder != null">#{hasServiceOrder},</if>
         <if test="orderImages != null">#{orderImages},</if>
         <if test="isDeliveryToStore != null">#{isDeliveryToStore},</if>
+        <if test="isInvoiced != null">#{isInvoiced},</if>
+        <if test="isNeedBill != null">#{isNeedBill},</if>
         SYSDATE()
         )
     </insert>