玫瑰

dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductMainCategoryEnum.java

@@ -31,6 +31,8 @@ public enum ProductMainCategoryEnum {
 
     CONNECT_CHANNEL(23, "连麦"),
 
+    GIFT(24, "礼物"),
+
     MATCHMAKER(888, "红娘合伙人"),
 
     MATCHMAKING_CORNER(999, "相亲角");

dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductSubCategoryEnum.java

@@ -50,6 +50,8 @@ public enum ProductSubCategoryEnum {
 
     CONNECT_CHANNEL_FEE(2301, "连麦费用"),
 
+    GIFT_FEE(2401, "礼物费用"),
+
     MATCHMAKER_FRANCHISE_FEE(88801, "高级红娘"),
 
     MATCHMAKER_ONLINE_FEE(88802, "线上红娘"),

dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/product/entity/Product.java

@@ -48,6 +48,9 @@ public class Product extends Entity<Product> {
     @ApiModelProperty("主图")
     private String mainPic;
 
+    @ApiModelProperty("svga文件")
+    private String svgaFile;
+
     @ApiModelProperty("状态（已上架、已下架）")
     private ProductStatusEnum status;
 

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java

@@ -102,4 +102,10 @@ public class ProductUserQueryController {
     public List<UserVirtualCurrencyVo> userListVirtualCurrencyProduct(UserListVirtualCurrencyProductQueryParams queryParams) {
         return productQueryService.listVirtualCurrencyProduct(queryParams);
     }
+
+    @GetMapping("list/gift-product")
+    @ApiOperation("客户获取礼物列表")
+    public List<UserGiftProductVo> userListGiftProduct() {
+        return productQueryService.listGiftProduct();
+    }
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserGiftProductVo.java

@@ -0,0 +1,49 @@
+package com.qniao.dam.api.query.product.user.response;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qniao.dam.domian.aggregate.product.constant.ProductMainCategoryEnum;
+import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class UserGiftProductVo {
+
+    @ApiModelProperty("商品标识")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long productId;
+
+    @ApiModelProperty("商品规格标识")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long productSpecId;
+
+    @ApiModelProperty("产品主分类")
+    private ProductMainCategoryEnum mainCategory;
+
+    @ApiModelProperty("产品次分类")
+    private ProductSubCategoryEnum subCategory;
+
+    @ApiModelProperty("产品标题")
+    private String productTitle;
+
+    @ApiModelProperty("产品描述")
+    private String productDesc;
+
+    @ApiModelProperty("详情描述")
+    private String detailDesc;
+
+    @ApiModelProperty("原价")
+    private BigDecimal unitOriginalPrice;
+
+    @ApiModelProperty("售价")
+    private BigDecimal unitSellingPrice;
+
+    @ApiModelProperty("主图")
+    private String mainPic;
+
+    @ApiModelProperty("svga文件")
+    private String svgaFile;
+}

dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java

@@ -33,4 +33,6 @@ public interface ProductViewDao {
                                                                         @Param("queryParam") UserPageProductByMatchmakerQueryParam queryParam);
 
     List<UserVirtualCurrencyVo> listVirtualCurrencyProduct(@Param("queryParams") UserListVirtualCurrencyProductQueryParams queryParams);
+
+    List<UserGiftProductVo> listGiftProduct();
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java

@@ -46,4 +46,6 @@ public interface ProductQueryService {
     IPage<UserPageProductByMatchmakerVo> pageProductByMatchmakingCorner(PageUtil pageUtil, UserPageProductByMatchmakerQueryParam queryParam);
 
     List<UserVirtualCurrencyVo> listVirtualCurrencyProduct(UserListVirtualCurrencyProductQueryParams queryParams);
+
+    List<UserGiftProductVo> listGiftProduct();
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java

@@ -102,6 +102,11 @@ public class ProductQueryServiceImpl implements ProductQueryService {
         return productViewDao.listVirtualCurrencyProduct(queryParams);
     }
 
+    @Override
+    public List<UserGiftProductVo> listGiftProduct() {
+        return productViewDao.listGiftProduct();
+    }
+
     @Override
     public Product queryBy(Long userId, Long miId, ProductSubCategoryEnum subCategory) {
         return productDao.selectOne(new LambdaQueryWrapper<Product>()

dating-agency-mall-server/src/main/resources/mapper/product/WalletAccountAssociateOrderRecordDao.xml

@@ -219,5 +219,24 @@
         order by dps.unit_original_price asc
     </select>
 
+    <select id="listGiftProduct" resultType="com.qniao.dam.api.query.product.user.response.UserGiftProductVo">
+        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,
+            dp.main_pic,
+            dp.svga_file
+        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.main_category=24
+        order by dps.unit_original_price asc
+    </select>
+
 </mapper>