Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!869

mp-service/src/main/java/com/qs/mp/admin/domain/Goods.java

@@ -125,7 +125,7 @@ public class Goods implements Serializable {
   /**
    * 兑换大厅是否展示，0不展示，1展示
    */
-  @ApiModelProperty("兑换大厅是否展示，0不展示，1展示")
+  @ApiModelProperty("兑换大厅是否展示，0不展示，1展示,2盲票关联")
   @TableField("exchange_show")
   private Integer exchangeShow;
 

mp-service/src/main/java/com/qs/mp/admin/domain/TicketBoxGoods.java

@@ -0,0 +1,85 @@
+package com.qs.mp.admin.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+/**
+ * @describe 盲票商品关联表实体类
+ * @auther quanshu
+ * @create 2022-07-16 09:41:09
+ */
+@ApiModel("盲票商品关联表")
+@TableName("mp_ticket_box_goods")
+@Data
+public class TicketBoxGoods implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 盲票组ID
+     */
+    @ApiModelProperty("盲票组ID")
+    @TableField("box_id")
+    private String boxId;
+
+    /**
+     * 商品名称
+     */
+    @ApiModelProperty("商品名称")
+    @TableField("title")
+    private String title;
+
+    /**
+     * 商品图片
+     */
+    @ApiModelProperty("商品图片")
+    @TableField("pic_url")
+    private String picUrl;
+
+    /**
+     * 关联商品id
+     */
+    @ApiModelProperty("关联商品id")
+    @TableField("ref_id")
+    private String refId;
+
+    /**
+     * 逻辑删除标识
+     */
+    @ApiModelProperty("逻辑删除标识")
+    @TableField("is_deleted")
+    @TableLogic
+    private Integer isDeleted;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("created_time")
+    private Date createdTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("updated_time")
+    private Date updatedTime;
+
+
+}

mp-service/src/main/java/com/qs/mp/admin/domain/param/GoodsQueryParam.java

@@ -76,7 +76,7 @@ public class GoodsQueryParam {
     /**
      * 兑换大厅是否展示，0不展示，1展示
      */
-    @ApiModelProperty(value = "兑换大厅是否展示", required = false)
+    @ApiModelProperty(value = "兑换大厅是否展示0不展示，1展示, 2盲票关联", required = false)
     private Integer exchangeShow;
 
     /**

mp-service/src/main/java/com/qs/mp/admin/domain/param/TicketBoxCreateParam.java

@@ -1,5 +1,6 @@
 package com.qs.mp.admin.domain.param;
 
+import com.qs.mp.admin.domain.TicketBoxGoods;
 import com.qs.mp.common.enums.TicketTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -62,5 +63,8 @@ public class TicketBoxCreateParam {
 
 	@NotEmpty(message = "奖级列表不能为空")
 	@ApiModelProperty(value = "奖级列表",required=true)
-	List<TicketAwardsParam> awardsList;
+	private List<TicketAwardsParam> awardsList;
+
+	@ApiModelProperty("关联商品列表")
+	private List<TicketBoxGoods> goodsList;
 }

mp-service/src/main/java/com/qs/mp/admin/domain/param/TicketBoxUpdateParam.java

@@ -1,5 +1,6 @@
 package com.qs.mp.admin.domain.param;
 
+import com.qs.mp.admin.domain.TicketBoxGoods;
 import com.qs.mp.common.enums.TicketTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -51,5 +52,8 @@ public class TicketBoxUpdateParam {
     private BigDecimal saleCommRate;
 
     @ApiModelProperty(value = "奖级列表")
-    List<TicketAwardsParam> awardsList;
+    private List<TicketAwardsParam> awardsList;
+
+    @ApiModelProperty("关联商品列表")
+    private List<TicketBoxGoods> goodsList;
 }

mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketBoxVO.java

@@ -2,6 +2,7 @@ package com.qs.mp.admin.domain.vo;
 
 import com.qs.mp.admin.domain.TicketBox;
 
+import com.qs.mp.admin.domain.TicketBoxGoods;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
@@ -37,6 +38,9 @@ public class TicketBoxVO extends TicketBox {
   @ApiModelProperty("奖级列表（后台显示）")
   List<TicketAwardsVO> awardsList;
 
+  @ApiModelProperty("关联商品列表")
+  private List<TicketBoxGoods> goodsList;
+
   @ApiModelProperty("经销商分佣百分比")
   private BigDecimal channelCommRate;
 

mp-service/src/main/java/com/qs/mp/admin/mapper/TicketBoxGoodsMapper.java

@@ -0,0 +1,13 @@
+package com.qs.mp.admin.mapper;
+
+import com.qs.mp.admin.domain.TicketBoxGoods;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @auther quanshu
+ * @create 2022-07-16 09:41:09
+ * @describe 盲票商品关联表mapper类
+ */
+public interface TicketBoxGoodsMapper extends BaseMapper<TicketBoxGoods> {
+
+}

mp-service/src/main/java/com/qs/mp/admin/service/ITicketBoxGoodsService.java

@@ -0,0 +1,16 @@
+package com.qs.mp.admin.service;
+
+import com.qs.mp.admin.domain.TicketBoxGoods;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 盲票商品关联表 服务类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-07-16
+ */
+public interface ITicketBoxGoodsService extends IService<TicketBoxGoods> {
+
+}

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxGoodsServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qs.mp.admin.service.impl;
+
+import com.qs.mp.admin.domain.TicketBoxGoods;
+import com.qs.mp.admin.mapper.TicketBoxGoodsMapper;
+import com.qs.mp.admin.service.ITicketBoxGoodsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 盲票商品关联表 服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-07-16
+ */
+@Service
+public class TicketBoxGoodsServiceImpl extends ServiceImpl<TicketBoxGoodsMapper, TicketBoxGoods> implements ITicketBoxGoodsService {
+
+}

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -94,6 +94,9 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
   @Autowired
   private IAsyncTaskService asyncTaskService;
 
+  @Autowired
+  private ITicketBoxGoodsService ticketBoxGoodsService;
+
 
   @Override
   public List<TicketBox> listBySaleChannel(QueryWrapper<TicketBox> queryWrapper) {
@@ -125,8 +128,20 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
     ticketBox.setSaleChannelType(param.getSaleChannelType());
     this.updateById(ticketBox);
 
+
+    // 清除盲票关联商品
+    Assert.isTrue(ticketBoxGoodsService.remove(
+        new LambdaUpdateWrapper<TicketBoxGoods>().eq(TicketBoxGoods::getBoxId, ticketBox.getBoxId())), "清除盲票关联商品失败");
+
+    // 关联商品
+    if (CollectionUtils.isNotEmpty(param.getGoodsList())) {
+      ticketBoxGoodsService.saveBatch(param.getGoodsList());
+    }
+
+
     // 清除指定渠道内容
-    ticketBoxChannelService.remove(new LambdaUpdateWrapper<TicketBoxChannel>().eq(TicketBoxChannel::getBoxId, ticketBox.getBoxId()));
+    Assert.isTrue(ticketBoxChannelService.remove(
+        new LambdaUpdateWrapper<TicketBoxChannel>().eq(TicketBoxChannel::getBoxId, ticketBox.getBoxId())), "清除清除指定渠道内容失败");
 
     // 指定渠道
     if (TicketBoxSaleChannelTypeEnum.PART.getValue().equals(param.getSaleChannelType())) {
@@ -322,6 +337,12 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
     ticketBox.setSaleChannelType(param.getSaleChannelType());
     save(ticketBox);
 
+
+    // 关联商品
+    if (CollectionUtils.isNotEmpty(param.getGoodsList())) {
+      ticketBoxGoodsService.saveBatch(param.getGoodsList());
+    }
+
     // 指定渠道
     if (TicketBoxSaleChannelTypeEnum.PART.getValue().equals(param.getSaleChannelType())) {
       List<Long> channelIdList = param.getChannelIdList();

mp-service/src/main/resources/mapper/admin/TicketBoxGoodsMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qs.mp.admin.mapper.TicketBoxGoodsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.admin.domain.TicketBoxGoods">
+        <id column="id" property="id" />
+        <result column="box_id" property="boxId" />
+        <result column="title" property="title" />
+        <result column="pic_url" property="picUrl" />
+        <result column="ref_id" property="refId" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, box_id, title, pic_url, ref_id, is_deleted, created_time, updated_time
+    </sql>
+
+</mapper>