diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java index 0675391..f3d935b 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java @@ -54,11 +54,19 @@ public class ShopDealerApplyController extends BaseController { } @PreAuthorize("hasAuthority('shop:shopDealerApply:list')") - @Operation(summary = "根据userId查询分销商申请记录表") + @Operation(summary = "根据id查询分销商申请记录表") @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { + public ApiResult getById(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(shopDealerApplyService.getById(id)); + } + + @PreAuthorize("hasAuthority('shop:shopDealerApply:list')") + @Operation(summary = "根据userId查询分销商申请记录表") + @GetMapping("/getByUserId/{id}") + public ApiResult getByUserId(@PathVariable("id") Integer id) { // 使用关联查询 - return success(shopDealerApplyService.getByIdRel(id)); + return success(shopDealerApplyService.getByUserIdRel(id)); } @PreAuthorize("hasAuthority('shop:shopDealerApply:save')") diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java index 7850b41..44cdcae 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java @@ -2,6 +2,8 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; + +import java.math.BigDecimal; import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -40,6 +42,12 @@ public class ShopDealerApply implements Serializable { @Schema(description = "手机号") private String mobile; + @Schema(description = "合同金额") + private BigDecimal money; + + @Schema(description = "详细地址") + private String address; + @Schema(description = "推荐人用户ID") private Integer refereeId; diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerApplyService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerApplyService.java index d9bf466..dd982d6 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerApplyService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerApplyService.java @@ -39,4 +39,5 @@ public interface ShopDealerApplyService extends IService { */ ShopDealerApply getByIdRel(Integer applyId); + ShopDealerApply getByUserIdRel(Integer userId); } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerApplyServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerApplyServiceImpl.java index d070ca2..690e624 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerApplyServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerApplyServiceImpl.java @@ -38,9 +38,16 @@ public class ShopDealerApplyServiceImpl extends ServiceImpl