From d73c4b7919fc4391004fa924bf920cd3166fbe02 Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Sat, 12 Apr 2025 17:17:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E4=BA=B2=E8=A7=92=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/ProductUserQueryController.java      |  9 +++++++-
 .../persistent/dao/view/ProductViewDao.java   |  3 +++
 .../query/product/ProductQueryService.java    |  2 ++
 .../product/impl/ProductQueryServiceImpl.java |  6 +++++
 .../WalletAccountAssociateOrderRecordDao.xml  | 23 +++++++++++++++++++
 5 files changed, 42 insertions(+), 1 deletion(-)

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 84a3820..a5149dd 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
@@ -71,6 +71,13 @@ public class ProductUserQueryController {
         return PageUtil.convert(productQueryService.pageProductByMatchmaker(pageUtil, queryParam), UserPageProductByMatchmakerVo.class);
     }
 
+    @GetMapping("page/product/by/matchmaking-corner")
+    @ApiOperation("相亲角获取商品分页列表")
+    public QnPage<UserPageProductByMatchmakerVo> userPageProductByMatchmakingCorner(PageUtil pageUtil,
+                                                                                    UserPageProductByMatchmakerQueryParam queryParam) {
+        return PageUtil.convert(productQueryService.pageProductByMatchmakingCorner(pageUtil, queryParam), UserPageProductByMatchmakerVo.class);
+    }
+
     @GetMapping("get/product/by/customer/list")
     @ApiOperation("客户获取商品列表")
     public List<UserPageProductByCustomerGroupVo> getPageProductByCustomer() {
@@ -79,7 +86,7 @@ public class ProductUserQueryController {
 
     @GetMapping("get/product/by/customer/details")
     @ApiOperation("客户获取商品详情")
-    public List<UserPageProductByCustomerGroupVo> getPageProductByCustomer(@RequestParam(value = "id",required = true) Long id,@RequestParam(value = "userId",required = false) Long userId) {
+    public List<UserPageProductByCustomerGroupVo> getPageProductByCustomer(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "userId", required = false) Long userId) {
         return productQueryService.getPageProductByCustomer(id);
     }
 
diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java
index bb4ac9e..4ad649a 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java
@@ -30,4 +30,7 @@ public interface ProductViewDao {
 
     IPage<UserPageProductByMatchmakerVo> pageProductByMatchmaker(Page<Object> pageWithoutOrders,
                                                                  @Param("queryParam") UserPageProductByMatchmakerQueryParam queryParam);
+
+    IPage<UserPageProductByMatchmakerVo> pageProductByMatchmakingCorner(Page<Object> pageWithoutOrders,
+                                                                        @Param("queryParam") UserPageProductByMatchmakerQueryParam queryParam);
 }
diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java
index 3a923d4..76df969 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java
@@ -41,4 +41,6 @@ public interface ProductQueryService {
     Product querySiteActivityBy(Long siteActivityId, Integer genderCode);
 
     Product queryById(Long id);
+
+    IPage<UserPageProductByMatchmakerVo> pageProductByMatchmakingCorner(PageUtil pageUtil, UserPageProductByMatchmakerQueryParam queryParam);
 }
diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java
index d32d7bc..f0618ce 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java
@@ -94,6 +94,11 @@ public class ProductQueryServiceImpl implements ProductQueryService {
         return productViewDao.pageProductByMatchmaker(pageUtil.toPageWithoutOrders(), queryParam);
     }
 
+    @Override
+    public IPage<UserPageProductByMatchmakerVo> pageProductByMatchmakingCorner(PageUtil pageUtil, UserPageProductByMatchmakerQueryParam queryParam) {
+        return productViewDao.pageProductByMatchmakingCorner(pageUtil.toPageWithoutOrders(), queryParam);
+    }
+
     @Override
     public Product queryBy(Long userId, Long miId, ProductSubCategoryEnum subCategory) {
         return productDao.selectOne(new LambdaQueryWrapper<Product>()
@@ -169,6 +174,7 @@ public class ProductQueryServiceImpl implements ProductQueryService {
         return product;
     }
 
+
     @Override
     public ProductSpecTerm getTermByName(List<ProductSpecTerm> productSpecTermList, ProductSpecTermNameEnum name) {
         ProductSpecTerm productSpecTerm = null;
diff --git a/dating-agency-mall-server/src/main/resources/mapper/product/WalletAccountAssociateOrderRecordDao.xml b/dating-agency-mall-server/src/main/resources/mapper/product/WalletAccountAssociateOrderRecordDao.xml
index 5022f78..4275a2b 100644
--- a/dating-agency-mall-server/src/main/resources/mapper/product/WalletAccountAssociateOrderRecordDao.xml
+++ b/dating-agency-mall-server/src/main/resources/mapper/product/WalletAccountAssociateOrderRecordDao.xml
@@ -156,5 +156,28 @@
         </if>
         order by dp.sub_category desc
     </select>
+
+    <select id="pageProductByMatchmakingCorner"
+            resultType="com.qniao.dam.api.query.product.user.response.UserPageProductByMatchmakerVo">
+        select
+        dp.id as productId,
+        dps.id as productSpecId,
+        dp.main_category,
+        dp.sub_category,
+        dp.product_title,
+        dp.product_desc,
+        dp.detail_desc,
+        dps.unit_original_price,
+        dps.unit_selling_price,
+        dpst2.`value` as validityPeriodDays
+        from da_product as dp
+        LEFT JOIN da_product_spec as dps on dps.is_delete=0 and dps.product_id=dp.id
+        LEFT JOIN  da_product_spec_term as dpst2 on dpst2.is_delete=0 and dpst2.product_spec_id =dps.id and dpst2.`name`=3
+        where dp.is_delete=0 and dp.`status`=1 and dp.product_type=4
+        <if test="queryParam.subCategory != null">
+            AND dp.sub_category = #{queryParam.subCategory}
+        </if>
+        order by dp.sub_category desc
+    </select>
 </mapper>