From 62a2bb8d6c3cd691ace4c65e74fb759f8dbdf6d0 Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Fri, 19 Apr 2024 17:53:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/constant/ProductSubCategoryEnum.java     |  2 +-
 .../product/user/ProductUserQueryController.java     |  2 ++
 .../UserPageProductByMatchmakerQueryParam.java       | 12 ++++++++++++
 .../resources/mapper/product/ProductViewMapper.xml   |  3 +++
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/request/UserPageProductByMatchmakerQueryParam.java

diff --git a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductSubCategoryEnum.java b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductSubCategoryEnum.java
index 1195c4b..c1da0bf 100644
--- a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductSubCategoryEnum.java
+++ b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductSubCategoryEnum.java
@@ -30,7 +30,7 @@ public enum ProductSubCategoryEnum {
 
     CONTRACTED_MARRIAGE(801, "包领证"),
 
-    MATCHMAKER(88801, "红娘合伙人加盟费");
+    MATCHMAKER_FRANCHISE_FEE(88801, "红娘合伙人加盟费");
 
     @EnumValue
     @JsonValue
diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java
index 1d13727..785bc94 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java
@@ -1,6 +1,7 @@
 package com.qniao.dam.api.query.product.user;
 
 import com.qniao.dam.api.query.product.user.request.UserPageProductByCustomerQueryParam;
+import com.qniao.dam.api.query.product.user.request.UserPageProductByMatchmakerQueryParam;
 import com.qniao.dam.api.query.product.user.request.UserPageProductByOperatorQueryParam;
 import com.qniao.dam.api.query.product.user.response.*;
 import com.qniao.dam.query.product.ProductQueryService;
@@ -66,6 +67,7 @@ public class ProductUserQueryController {
     @GetMapping("page/product/by/matchmaker")
     @ApiOperation("红娘合伙人获取商品分页列表")
     public QnPage<UserPageProductByMatchmakerVo> userPageProductByMatchMaker(PageUtil pageUtil,
+                                                                             UserPageProductByMatchmakerQueryParam queryParam,
                                                                              @RequestParam("userId") Long userId) {
         return PageUtil.convert(productQueryService.pageProductByMatchmaker(pageUtil), UserPageProductByMatchmakerVo.class);
     }
diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/request/UserPageProductByMatchmakerQueryParam.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/request/UserPageProductByMatchmakerQueryParam.java
new file mode 100644
index 0000000..472a67c
--- /dev/null
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/request/UserPageProductByMatchmakerQueryParam.java
@@ -0,0 +1,12 @@
+package com.qniao.dam.api.query.product.user.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UserPageProductByMatchmakerQueryParam {
+
+    @ApiModelProperty("产品次分类 88801红娘合伙人加盟费")
+    private Integer subCategory;
+
+}
diff --git a/dating-agency-mall-server/src/main/resources/mapper/product/ProductViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/product/ProductViewMapper.xml
index ef4a892..99cca0e 100644
--- a/dating-agency-mall-server/src/main/resources/mapper/product/ProductViewMapper.xml
+++ b/dating-agency-mall-server/src/main/resources/mapper/product/ProductViewMapper.xml
@@ -137,6 +137,9 @@
         from da_product as dp
         LEFT JOIN da_product_spec as dps on dps.is_delete=0 and dps.product_id=dp.id
         where dp.is_delete=0 and dp.`status`=1 and dp.product_type=3
+        <if test="queryParam.subCategory != null">
+            AND dp.sub_category = #{queryParam.subCategory}
+        </if>
     </select>
 </mapper>