From c431a1256067eacf20e43324ea14ac31b7a50cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 18 Aug 2025 16:10:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90ShopDealerApply=E7=BB=8F?=
 =?UTF-8?q?=E9=94=80=E5=95=86=E5=85=A5=E9=A9=BB=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/controller/ShopDealerApplyController.java        | 8 +++++++-
 .../shop/controller/ShopDealerUserController.java         | 2 +-
 src/main/java/com/gxwebsoft/shop/entity/ShopGift.java     | 6 ++++++
 .../java/com/gxwebsoft/shop/mapper/xml/ShopGiftMapper.xml | 2 +-
 .../shop/service/impl/ShopDealerApplyServiceImpl.java     | 2 +-
 .../shop/service/impl/ShopDealerUserServiceImpl.java      | 2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java
index 697c9c6..0675391 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java
@@ -54,7 +54,7 @@ public class ShopDealerApplyController extends BaseController {
     }
 
     @PreAuthorize("hasAuthority('shop:shopDealerApply:list')")
-    @Operation(summary = "根据id查询分销商申请记录表")
+    @Operation(summary = "根据userId查询分销商申请记录表")
     @GetMapping("/{id}")
     public ApiResult<ShopDealerApply> get(@PathVariable("id") Integer id) {
         // 使用关联查询
@@ -72,6 +72,12 @@ public class ShopDealerApplyController extends BaseController {
           shopDealerApply.setApplyTime(LocalDateTime.now());
           shopDealerApply.setUserId(loginUser.getUserId());
         }
+        if (shopDealerApply.getRefereeId() != null) {
+          if(shopDealerUserService.getByIdRel(shopDealerApply.getRefereeId()) == null){
+            return fail("推荐人不存在");
+          }
+        }
+
         if (shopDealerApplyService.save(shopDealerApply)) {
             return success("添加成功");
         }
diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java
index ddd9603..11700a1 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java
@@ -47,7 +47,7 @@ public class ShopDealerUserController extends BaseController {
     }
 
     @PreAuthorize("hasAuthority('shop:shopDealerUser:list')")
-    @Operation(summary = "根据id查询分销商用户记录表")
+    @Operation(summary = "根据userId查询分销商用户")
     @GetMapping("/{id}")
     public ApiResult<ShopDealerUser> get(@PathVariable("id") Integer id) {
         // 使用关联查询
diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopGift.java b/src/main/java/com/gxwebsoft/shop/entity/ShopGift.java
index 6e101b2..261c980 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/ShopGift.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/ShopGift.java
@@ -3,6 +3,8 @@ package com.gxwebsoft.shop.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -43,6 +45,10 @@ public class ShopGift implements Serializable {
     @TableField(exist = false)
     private String goodsImage;
 
+    @Schema(description = "面值")
+    @TableField(exist = false)
+    private BigDecimal faceValue;
+
     @Schema(description = "使用地点")
     private String useLocation;
 
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGiftMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGiftMapper.xml
index 3511db8..b2f0569 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGiftMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGiftMapper.xml
@@ -4,7 +4,7 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*,b.name as goodsName,b.image as goodsImage,c.nickname, u.nickname as operatorUserName
+        SELECT a.*,b.name as goodsName, b.price as faceValue, b.image as goodsImage,c.nickname, u.nickname as operatorUserName
         FROM shop_gift a
         LEFT JOIN shop_goods b ON a.goods_id = b.goods_id
         LEFT JOIN gxwebsoft_core.sys_user c ON a.user_id = c.user_id
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 26cb8d1..d070ca2 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerApplyServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerApplyServiceImpl.java
@@ -40,7 +40,7 @@ public class ShopDealerApplyServiceImpl extends ServiceImpl<ShopDealerApplyMappe
     @Override
     public ShopDealerApply getByIdRel(Integer applyId) {
         ShopDealerApplyParam param = new ShopDealerApplyParam();
-        param.setApplyId(applyId);
+        param.setUserId(applyId);
         return param.getOne(baseMapper.selectListRel(param));
     }
 
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java
index 230427d..73a8ed6 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java
@@ -40,7 +40,7 @@ public class ShopDealerUserServiceImpl extends ServiceImpl<ShopDealerUserMapper,
     @Override
     public ShopDealerUser getByIdRel(Integer id) {
         ShopDealerUserParam param = new ShopDealerUserParam();
-        param.setId(id);
+        param.setUserId(id);
         return param.getOne(baseMapper.selectListRel(param));
     }