From a80ff87c9f8ff9c6540fe855c92a55a8bf01989c Mon Sep 17 00:00:00 2001
From: majian314 <hi34384320@aliyun.com>
Date: Mon, 29 Sep 2025 12:54:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E7=94=B5=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/orders/domain/ZcOrderSub.java   |  6 ++---
 .../mapper/orders/ZcOrderSubMapper.xml        |  6 +++--
 .../templates/orders/orderSub/orderSub.html   | 24 +++++++++----------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderSub.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderSub.java
index 13de065..906b2c7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderSub.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderSub.java
@@ -69,7 +69,7 @@ public class ZcOrderSub extends BaseEntity
     @Excel(name = "平台支付流水号")
     private String transactionId;
 
-    private Long bOrderId;
+    private String bOrderId;
 
     public void setSuborderId(Long suborderId) 
     {
@@ -195,11 +195,11 @@ public class ZcOrderSub extends BaseEntity
         this.transactionId = transactionId;
     }
 
-    public Long getbOrderId() {
+    public String getbOrderId() {
         return bOrderId;
     }
 
-    public void setbOrderId(Long bOrderId) {
+    public void setbOrderId(String bOrderId) {
         this.bOrderId = bOrderId;
     }
 
diff --git a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml
index 00b96d7..93bd9a1 100644
--- a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml
@@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="delFlag"    column="del_flag"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="bOrderId"    column="b_order_id"    />
     </resultMap>
 
     <sql id="selectZcOrderSubVo">
-        select suborder_id, order_id, suborder_no, suborder_type, amount, payment_method, vin_battery_no, created_at, payment_id, paid_at, pay_status, transaction_id, remark, del_flag, create_time, update_time from zc_order_sub
+        select suborder_id, order_id, suborder_no, suborder_type, amount, payment_method, vin_battery_no, created_at, payment_id, paid_at, pay_status, transaction_id, b_order_id, remark, del_flag, create_time, update_time from zc_order_sub
     </sql>
 
     <select id="selectZcOrderSubList" parameterType="ZcOrderSub" resultMap="ZcOrderSubResult">
@@ -41,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="paidAt != null "> and paid_at = #{paidAt}</if>
             <if test="payStatus != null and payStatus != '' "> and pay_status = #{payStatus}</if>
             <if test="transactionId != null and transactionId != '' "> and transaction_id = #{transactionId}</if>
+            <if test="bOrderId != null and bOrderId != '' "> and b_order_id like concat('%', #{bOrderId}, '%')</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
@@ -127,4 +129,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/templates/orders/orderSub/orderSub.html b/ruoyi-admin/src/main/resources/templates/orders/orderSub/orderSub.html
index 5624b13..5b2570c 100644
--- a/ruoyi-admin/src/main/resources/templates/orders/orderSub/orderSub.html
+++ b/ruoyi-admin/src/main/resources/templates/orders/orderSub/orderSub.html
@@ -20,13 +20,13 @@
                                 <label>订单编号：</label>
                                 <input type="text" name="suborderNo"/>
                             </li>
-                            <li>
-                                <label>订单类型：</label>
-                                <select name="suborderType" th:with="type=${@dict.getType('key_order_suborder_type')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
+<!--                            <li>-->
+<!--                                <label>订单类型：</label>-->
+<!--                                <select name="suborderType" th:with="type=${@dict.getType('key_order_suborder_type')}">-->
+<!--                                    <option value="">所有</option>-->
+<!--                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
+<!--                                </select>-->
+<!--                            </li>-->
                             <li>
                                 <label>支付方式：</label>
                                 <select name="paymentMethod" th:with="type=${@dict.getType('key_order_payment_method')}">
@@ -43,8 +43,8 @@
                             </li>
 
                             <li>
-                                <label>车架/电池编号：</label>
-                                <input type="text" name="vinBatteryNo"/>
+                                <label>租电平台订单号：</label>
+                                <input type="text" name="bOrderId"/>
                             </li>
                             <li class="select-time">
                                 <label>创建时间： </label>
@@ -124,8 +124,8 @@
                     }
                 },
                 {
-                    field: 'vinBatteryNo',
-                    title: '车架/电池编号'
+                    field: 'bOrderId',
+                    title: '租电平台订单号'
                 },
                 {
                     field: 'createdAt',
@@ -167,4 +167,4 @@
         });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>