From 0d8d79d5c4057f69ef905094bb65454794ba2956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sat, 6 Sep 2025 19:57:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E6=B7=BB=E5=8A=A0=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=93=B6=E8=A1=8C=E5=8D=A1=E5=8A=9F=E8=83=BD=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ShopDealerBank 模型中添加 isDefault 字段，用于标记默认银行卡- 在 ShopDealerBankMapper.xml 中添加查询默认银行卡的条件
- 在 ShopDealerBankParam 中添加 isDefault 参数，用于查询时筛选默认银行卡
- 修改 ShopDealerBankServiceImpl 中的分页和列表查询方法，按默认银行卡和创建时间排序
- 新增 getDefaultBank 方法，用于获取用户的默认银行卡
---
 .../com/gxwebsoft/shop/entity/ShopDealerBank.java |  3 +++
 .../shop/mapper/xml/ShopDealerBankMapper.xml      |  3 +++
 .../gxwebsoft/shop/param/ShopDealerBankParam.java |  4 ++++
 .../shop/service/ShopDealerBankService.java       |  6 ++++++
 .../service/impl/ShopDealerBankServiceImpl.java   | 15 +++++++++++++--
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerBank.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerBank.java
index bb3cb9c..eded8a3 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerBank.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerBank.java
@@ -44,6 +44,9 @@ public class ShopDealerBank implements Serializable {
     @Schema(description = "驳回原因")
     private String rejectReason;
 
+    @Schema(description = "默认收货地址")
+    private Boolean isDefault;
+
     @Schema(description = "租户id")
     private Integer tenantId;
 
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerBankMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerBankMapper.xml
index 9ac5893..023b7a2 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerBankMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerBankMapper.xml
@@ -13,6 +13,9 @@
             <if test="param.userId != null">
                 AND a.user_id = #{param.userId}
             </if>
+            <if test="param.isDefault != null">
+              AND a.is_default = #{param.isDefault}
+            </if>
             <if test="param.bankName != null">
                 AND a.bank_name LIKE CONCAT('%', #{param.bankName}, '%')
             </if>
diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerBankParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerBankParam.java
index 1bbe158..5aa4941 100644
--- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerBankParam.java
+++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerBankParam.java
@@ -51,4 +51,8 @@ public class ShopDealerBankParam extends BaseParam {
     @Schema(description = "驳回原因")
     private String rejectReason;
 
+    @Schema(description = "默认收货地址")
+    @QueryField(type = QueryType.EQ)
+    private Boolean isDefault;
+
 }
diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerBankService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerBankService.java
index e0d9efd..aba0ab0 100644
--- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerBankService.java
+++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerBankService.java
@@ -39,4 +39,10 @@ public interface ShopDealerBankService extends IService<ShopDealerBank> {
      */
     ShopDealerBank getByIdRel(Integer id);
 
+    /**
+     * 获取默认银行卡
+     * @return List<ShopDealerBank>
+     */
+    ShopDealerBank getDefaultBank(Integer userId);
+
 }
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerBankServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerBankServiceImpl.java
index da65388..edc77c3 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerBankServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerBankServiceImpl.java
@@ -1,5 +1,6 @@
 package com.gxwebsoft.shop.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
@@ -23,7 +24,7 @@ public class ShopDealerBankServiceImpl extends ServiceImpl<ShopDealerBankMapper,
     @Override
     public PageResult<ShopDealerBank> pageRel(ShopDealerBankParam param) {
         PageParam<ShopDealerBank, ShopDealerBankParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("is_default desc, create_time desc");
         List<ShopDealerBank> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +34,7 @@ public class ShopDealerBankServiceImpl extends ServiceImpl<ShopDealerBankMapper,
         List<ShopDealerBank> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<ShopDealerBank, ShopDealerBankParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("is_default desc, create_time desc");
         return page.sortRecords(list);
     }
 
@@ -44,4 +45,14 @@ public class ShopDealerBankServiceImpl extends ServiceImpl<ShopDealerBankMapper,
         return param.getOne(baseMapper.selectListRel(param));
     }
 
+    @Override
+    public ShopDealerBank getDefaultBank(Integer userId) {
+      LambdaQueryWrapper<ShopDealerBank> wrapper = new LambdaQueryWrapper<>();
+      wrapper.eq(ShopDealerBank::getUserId, userId)
+        .eq(ShopDealerBank::getIsDefault, true)
+        .orderByDesc(ShopDealerBank::getCreateTime)
+        .last("LIMIT 1");
+      return getOne(wrapper);
+    }
+
 }