From b097837aa35569deb1b669ecfc9b52640b5b6094 Mon Sep 17 00:00:00 2001
From: AriadenCaseblg <AriadenCaseblg@chef.net>
Date: Sun, 12 Apr 2026 11:05:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B9=B3=E5=8F=B0=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BD=BF=E7=94=A8=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

补齐商户订单分页接口的 useIntegral 返回字段，并在平台商户订单列表新增“使用积分”列与列显隐配置，便于运营查看积分抵扣使用情况。

Made-with: Cursor
---
 docs/change-0410.md                                      | 2 ++
 .../zbkj/common/response/MerchantOrderPageResponse.java  | 3 +++
 .../src/main/resources/mapper/order/OrderMapper.xml      | 2 +-
 mer_plat_admin/src/views/merchantOrder/index.vue         | 9 +++++++--
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/docs/change-0410.md b/docs/change-0410.md
index 979fe37..c946722 100644
--- a/docs/change-0410.md
+++ b/docs/change-0410.md
@@ -7,11 +7,13 @@
 - **已修复**不改变平台端管理后台原有的订单管理功能页
 - **已修复**在平台端管理后台左侧的订单目录下加入移植过来的功能页面菜单
 
+
 ## 订单相关
 
 - **已修复**1. 新增“订单打印”功能，点击订单打印按钮（不同于打印小票），新打开一个订单详情（含商品信息，收货信息）的单独页面（不需要页面layout），点击页面上的“打印”按钮，可以直接使用浏览器打印
 - **已修复**2. 订单打印详情页中的商品相关信息使用eb_sync_order_detail_staging中的product_name，info字段的商品详细信息
 
+
 ## 测试问题（平台管理后台）
 
 - **已修复**商户订单页面（order/merchantList）点击详情等按钮提示“订单不存在”
diff --git a/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantOrderPageResponse.java b/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantOrderPageResponse.java
index 8fc9178..d3ecc4d 100644
--- a/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantOrderPageResponse.java
+++ b/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantOrderPageResponse.java
@@ -82,6 +82,9 @@ public class MerchantOrderPageResponse implements Serializable {
     @ApiModelProperty(value = "订单商品总数")
     private Integer totalNum;
 
+    @ApiModelProperty(value = "使用积分")
+    private Integer useIntegral;
+
     @ApiModelProperty(value = "商户备注")
     private String merchantRemark;
 
diff --git a/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml b/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml
index 9fefe49..df4bd6f 100644
--- a/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml
+++ b/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml
@@ -124,7 +124,7 @@
 
     <select id="getMerchantAdminPage" resultType="com.zbkj.common.response.MerchantOrderPageResponse" parameterType="Map">
         select o.mer_id as merId, o.order_no as orderNo, o.uid, o.pay_price as payPrice, o.pay_type as payType, o.paid,
-        o.status, o.refund_status as refundStatus, o.is_user_del as isUserDel, o.total_num as totalNum,
+        o.status, o.refund_status as refundStatus, o.is_user_del as isUserDel, o.total_num as totalNum, o.use_integral as useIntegral,
         o.cancel_status as cancelStatus, o.level, o.type, o.create_time as createTime,o.second_type as secondType, o.group_buy_record_status as groupBuyRecordStatus,
         o.cancel_status as cancelStatus, o.level, o.type, o.create_time as createTime,o.second_type as secondType,
         mo.merchant_remark as merchantRemark, mo.verify_code as verifyCode, mo.shipping_type as shippingType,
diff --git a/mer_plat_admin/src/views/merchantOrder/index.vue b/mer_plat_admin/src/views/merchantOrder/index.vue
index 0e3b165..82c0956 100644
--- a/mer_plat_admin/src/views/merchantOrder/index.vue
+++ b/mer_plat_admin/src/views/merchantOrder/index.vue
@@ -120,6 +120,11 @@
           </template>
         </el-table-column>
         <el-table-column prop="payPrice" label="实际支付" min-width="80" v-if="checkedCities.includes('实际支付')" />
+        <el-table-column label="使用积分" min-width="90" v-if="checkedCities.includes('使用积分')">
+          <template slot-scope="scope">
+            <span>{{ scope.row.useIntegral || 0 }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="支付方式" min-width="80" v-if="checkedCities.includes('支付方式')">
           <template slot-scope="scope">
             <span>{{ scope.row.payType | payTypeFilter }}</span>
@@ -411,8 +416,8 @@ export default {
       active: false,
       card_select_show: false,
       checkAll: true,
-      checkedCities: ['订单号', '商户名称', '用户昵称', '实际支付', '支付方式', '订单状态', '下单时间'],
-      columnData: ['订单号', '商户名称', '用户昵称', '实际支付', '支付方式', '订单状态', '下单时间'],
+      checkedCities: ['订单号', '商户名称', '用户昵称', '实际支付', '使用积分', '支付方式', '订单状态', '下单时间'],
+      columnData: ['订单号', '商户名称', '用户昵称', '实际支付', '使用积分', '支付方式', '订单状态', '下单时间'],
       isIndeterminate: false,
       orderDatalist: null,
       merPrintStatus: Cookies.get('merPrint'), // 商家小票打印开关状态