From 9644338a59293f911f4695b09925aa2f00fd19c2 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 11 Mar 2026 14:17:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:sql=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 local.env                                     |  2 +-
 .../mapper/order/HardOrderMapper.xml          | 70 +++++++++++++++++++
 .../wechat/ThirdMiniWechantPayConstant.java   |  4 --
 3 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/local.env b/local.env
index ba45f1487..ac3080116 100644
--- a/local.env
+++ b/local.env
@@ -1,4 +1,4 @@
 MYSQL_HOST=123.157.250.162
-MYSQL_PORT=2881
+MYSQL_PORT=33905
 MYSQL_USER=root@sys
 MYSQL_PWD=bsd.1799
\ No newline at end of file
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
index 50f0d4bfd..aff65d8f5 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
@@ -198,6 +198,76 @@
     </sql>
 
     <sql id="pageList">
+        select a.id,
+        a.order_no,
+        a.user_id,
+        a.user_dept_id,
+        a.merchant_id,
+        a.merchant_type,
+        a.merchant_dept_id,
+        a.hard_id,
+        a.dept_id,
+        a.wallet_id,
+        a.parent_car_id,
+        a.order_source_type_id,
+        a.order_type,
+        a.order_status,
+        a.pay_type,
+        a.hour_type,
+        a.sys_type,
+        a.total_price,
+        a.extra_price,
+        a.pay_price,
+        a.pay_time,
+        a.pay_refund_id,
+        a.refund_price,
+        a.refund_time,
+        a.refund_status,
+        a.apply_cancel_time,
+        a.android_order_code,
+        a.is_offline_order,
+        a.product_desc,
+        a.offline_pay_success,
+        a.create_by,
+        a.create_time,
+        a.update_by,
+        a.update_time,
+        a.del_flag,
+        a.tenant_id,
+        m.name as hardName,
+        m.type as hardType,
+        m.dept_id as hardTypeDeptId,
+        s.id as afterSaleId,
+        s.no as afterSaleNo
+        from (select a.id
+        from hard_order a
+        <where>
+            <include refid="whereA"/>
+            <if test="dto.hardTypeCode != null and dto.hardTypeCode != '' ">
+                and m.type = #{dto.hardTypeCode}
+            </if>
+            <if test="dto.hardTypeCodes != null and dto.hardTypeCodes.size() != 0">
+                and m.type in
+                <foreach collection="dto.hardTypeCodes" item="v" open="(" close=")" separator=",">
+                    #{v}
+                </foreach>
+            </if>
+            <if test="dto.afterSaleNo != null and dto.afterSaleNo != ''">
+                and s.no = #{dto.afterSaleNo}
+            </if>
+        </where>
+        order by a.create_time desc, a.user_id desc) t
+        join hard_order a on a.id = t.id
+        left join hard_manager m on m.id = a.hard_id and m.tenant_id = 1
+        left join (select order_id, max(id) as id
+        from hard_after_sale
+        where tenant_id = 1
+        group by order_id) sx on sx.order_id = a.id
+        left join hard_after_sale s on s.id = sx.id
+        order by a.create_time desc, a.user_id desc
+    </sql>
+
+    <sql id="pageListCopy">
         <include refid="selectA"/>
         m.name as hardName,
         m.type as hardType,
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/utils/miniapp/pay/wechat/ThirdMiniWechantPayConstant.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/utils/miniapp/pay/wechat/ThirdMiniWechantPayConstant.java
index 4ea7da380..5e14203ea 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/utils/miniapp/pay/wechat/ThirdMiniWechantPayConstant.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/utils/miniapp/pay/wechat/ThirdMiniWechantPayConstant.java
@@ -13,10 +13,6 @@ import javax.net.ssl.SSLSocketFactory;
 /**
  * 微信支付api
  */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
 public class ThirdMiniWechantPayConstant {
 
     public static final Api APY = Api.builder().summary("付款码支付").url("/pay/micropay").method(HttpMethod.POST).isNeedCertificate(false).build();