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 @@ AND a.user_id = #{param.userId} + + AND a.is_default = #{param.isDefault} + AND a.bank_name LIKE CONCAT('%', #{param.bankName}, '%') 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 getByIdRel(Integer id); + /** + * 获取默认银行卡 + * @return List + */ + 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 pageRel(ShopDealerBankParam param) { PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("is_default desc, create_time desc"); List list = baseMapper.selectPageRel(page, param); return new PageResult<>(list, page.getTotal()); } @@ -33,7 +34,7 @@ public class ShopDealerBankServiceImpl extends ServiceImpl list = baseMapper.selectListRel(param); // 排序 PageParam 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 wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ShopDealerBank::getUserId, userId) + .eq(ShopDealerBank::getIsDefault, true) + .orderByDesc(ShopDealerBank::getCreateTime) + .last("LIMIT 1"); + return getOne(wrapper); + } + }