feat(shop): 添加分销商申请地址详情字段

- 在 ShopDealerApply 实体类中新增社区、楼栋号、单元号、房号字段
- 更新 ShopDealerApplyController 中的 Excel 导入功能,修改表头格式说明
- 在控制器中添加测试数据并完善实体对象设置逻辑
- 扩展 ShopDealerApplyImportParam 参数类,增加地址相关字段映射
- 更新 ShopDealerApplyMapper.xml 添加地址查询条件
- 在 ShopDealerApplyParam 查询参数类中添加地址过滤字段
- 统一多个信用模块的关键词搜索逻辑,从精确匹配改为模糊匹配
This commit is contained in:
2026-01-21 17:34:47 +08:00
parent 416027ffe8
commit 492928667a
30 changed files with 83 additions and 27 deletions

View File

@@ -74,7 +74,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -62,7 +62,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -62,7 +62,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -62,7 +62,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -74,7 +74,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -65,8 +65,8 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR a.name = #{param.keywords} OR a.name LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -74,7 +74,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -74,7 +74,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -59,7 +59,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -59,7 +59,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -86,7 +86,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -62,7 +62,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -65,7 +65,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -56,7 +56,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -66,7 +66,7 @@
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR a.case_number = #{param.keywords} OR a.case_number = #{param.keywords}
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -62,7 +62,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -95,7 +95,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.name LIKE CONCAT('%', #{param.keywords}, '%') AND (a.name LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -74,7 +74,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -204,7 +204,7 @@
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR a.name = #{param.keywords} OR a.name = #{param.keywords}
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -74,7 +74,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -63,7 +63,7 @@
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name = #{param.keywords}
OR a.main_bodyName = #{param.keywords} OR b.main_body_name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -59,7 +59,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -71,7 +71,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -91,7 +91,7 @@
AND (a.name LIKE CONCAT('%', #{param.keywords}, '%') AND (a.name LIKE CONCAT('%', #{param.keywords}, '%')
OR a.procurement_name LIKE CONCAT('%', #{param.keywords}, '%') OR a.procurement_name LIKE CONCAT('%', #{param.keywords}, '%')
OR a.winning_name LIKE CONCAT('%', #{param.keywords}, '%') OR a.winning_name LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -74,7 +74,7 @@
</if> </if>
<if test="param.keywords != null"> <if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR b.name = #{param.keywords} OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
) )
</if> </if>
</where> </where>

View File

@@ -182,7 +182,7 @@ public class ShopDealerApplyController extends BaseController {
/** /**
* excel批量导入分销商申请记录 * excel批量导入分销商申请记录
* Excel表头格式类型、用户ID、姓名、分销商名称、分销商编码、手机号、合同金额、详细地址、推荐人用户ID、申请方式、审核状态、合同时间、驳回原因、商城ID * Excel表头格式类型、用户ID、姓名、分销商名称、分销商编码、手机号、合同金额、详细地址、社区、楼栋号、单元号、房号、推荐人用户ID、申请方式、审核状态、合同时间、驳回原因、商城ID
*/ */
@PreAuthorize("hasAuthority('shop:shopDealerApply:save')") @PreAuthorize("hasAuthority('shop:shopDealerApply:save')")
@Transactional(rollbackFor = {Exception.class}) @Transactional(rollbackFor = {Exception.class})
@@ -295,6 +295,10 @@ public class ShopDealerApplyController extends BaseController {
example.setApplyType(10); example.setApplyType(10);
example.setApplyStatus(10); example.setApplyStatus(10);
example.setContractTime("2025-09-05 10:00:00"); example.setContractTime("2025-09-05 10:00:00");
example.setCommunity("xx社区");
example.setBuildingNumber("1");
example.setUnitNumber("2");
example.setRoomNumber("302");
templateList.add(example); templateList.add(example);
// 设置导出参数 // 设置导出参数
@@ -327,6 +331,10 @@ public class ShopDealerApplyController extends BaseController {
entity.setMobile(param.getMobile()); entity.setMobile(param.getMobile());
entity.setMoney(param.getMoney()); entity.setMoney(param.getMoney());
entity.setAddress(param.getAddress()); entity.setAddress(param.getAddress());
entity.setCommunity(param.getCommunity());
entity.setBuildingNumber(param.getBuildingNumber());
entity.setUnitNumber(param.getUnitNumber());
entity.setRoomNumber(param.getRoomNumber());
entity.setRefereeId(param.getRefereeId()); entity.setRefereeId(param.getRefereeId());
entity.setApplyType(param.getApplyType()); entity.setApplyType(param.getApplyType());
entity.setApplyStatus(param.getApplyStatus()); entity.setApplyStatus(param.getApplyStatus());

View File

@@ -60,6 +60,18 @@ public class ShopDealerApply implements Serializable {
@Schema(description = "详细地址") @Schema(description = "详细地址")
private String address; private String address;
@Schema(description = "社区")
private String community;
@Schema(description = "楼栋号")
private String buildingNumber;
@Schema(description = "单元号")
private String unitNumber;
@Schema(description = "房号")
private String roomNumber;
@Schema(description = "佣金比例") @Schema(description = "佣金比例")
@TableField(exist = false) @TableField(exist = false)
private BigDecimal rate; private BigDecimal rate;

View File

@@ -25,6 +25,18 @@
<if test="param.mobile != null"> <if test="param.mobile != null">
AND a.mobile LIKE CONCAT('%', #{param.mobile}, '%') AND a.mobile LIKE CONCAT('%', #{param.mobile}, '%')
</if> </if>
<if test="param.community != null">
AND a.community LIKE CONCAT('%', #{param.community}, '%')
</if>
<if test="param.buildingNumber != null">
AND a.building_number = #{param.buildingNumber}
</if>
<if test="param.unitNumber != null">
AND a.unit_number = #{param.unitNumber}
</if>
<if test="param.roomNumber != null">
AND a.room_number = #{param.roomNumber}
</if>
<if test="param.dealerName != null"> <if test="param.dealerName != null">
AND a.dealer_name LIKE CONCAT('%', #{param.dealerName}, '%') AND a.dealer_name LIKE CONCAT('%', #{param.dealerName}, '%')
</if> </if>

View File

@@ -40,6 +40,18 @@ public class ShopDealerApplyImportParam implements Serializable {
@Excel(name = "详细地址") @Excel(name = "详细地址")
private String address; private String address;
@Excel(name = "社区")
private String community;
@Excel(name = "楼栋号")
private String buildingNumber;
@Excel(name = "单元号")
private String unitNumber;
@Excel(name = "房号")
private String roomNumber;
@Excel(name = "推荐人用户ID") @Excel(name = "推荐人用户ID")
private Integer refereeId; private Integer refereeId;

View File

@@ -40,6 +40,18 @@ public class ShopDealerApplyParam extends BaseParam {
@Schema(description = "手机号") @Schema(description = "手机号")
private String mobile; private String mobile;
@Schema(description = "社区")
private String community;
@Schema(description = "楼栋号")
private String buildingNumber;
@Schema(description = "单元号")
private String unitNumber;
@Schema(description = "房号")
private String roomNumber;
@Schema(description = "推荐人用户ID") @Schema(description = "推荐人用户ID")
@QueryField(type = QueryType.EQ) @QueryField(type = QueryType.EQ)
private Integer refereeId; private Integer refereeId;