增加type 5优先购买券

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/constant/StatusConst.java

@@ -10,10 +10,11 @@ package com.liquidnet.service.sweet.constant;
  */
 public class StatusConst {
 
-    // 积分抽奖 奖品类型 1积分 2优惠券 3实物 4登登登VIP
+    // 积分抽奖 奖品类型 1积分 2优惠券 3实物 4登登登VIP 5优先购买券
     public static final Integer PRIZE_TYPE1 = 1;
     public static final Integer PRIZE_TYPE2 = 2;
     public static final Integer PRIZE_TYPE3 = 3;
     public static final Integer PRIZE_TYPE4 = 4;
+    public static final Integer PRIZE_TYPE5 = 5;
 
 }

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/admin/SweetIntegralActivityPrizeFormParam.java

@@ -46,7 +46,7 @@ public class SweetIntegralActivityPrizeFormParam implements Serializable,Cloneab
     @NotBlank(message = "prizeImgSelect不能为空")
     private String prizeImgSelect;
 
-    @ApiModelProperty(required = true, value = "奖品类型 1积分 2优惠券 3实物 4登登登VIP", example = "1")
+    @ApiModelProperty(required = true, value = "奖品类型 1积分 2优惠券 3实物 4登登登VIP 5优先购买券", example = "1")
     @NotNull(message = "prizeType不能为空")
     private Integer prizeType;
 

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/IntegralActivityDrawVo.java

@@ -29,7 +29,7 @@ public class IntegralActivityDrawVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "奖品名称")
     private String prizeTitle;
 
-    @ApiModelProperty(value = "奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物")
+    @ApiModelProperty(value = "奖品类型 1积分 2优惠券 3实物 4登登登VIP 5优先购买券惠顾 2积分 3代金券 4满减券 5优先购买券 6实物")
     private Integer prizeType;
 
     @ApiModelProperty(value = "关联id 如商品id 券id")

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/IntegralActivityPrizeApiVo.java

@@ -31,7 +31,7 @@ public class IntegralActivityPrizeApiVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "中奖选中奖品图片")
     private String prizeImgSelect;
 
-    @ApiModelProperty(value = "奖品类型 1积分 2优惠券 3实物 4登登登VIP")
+    @ApiModelProperty(value = "奖品类型 1积分 2优惠券 3实物 4登登登VIP 5优先购买券")
     private Integer prizeType;
 
     @ApiModelProperty(value = "单次奖励数量如积分 中奖给多少物")

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/IntegralActivityPrizeVo.java

@@ -32,7 +32,7 @@ public class IntegralActivityPrizeVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "中奖选中奖品图片")
     private String prizeImgSelect;
 
-    @ApiModelProperty(value = "奖品类型 1积分 2优惠券 3实物 4登登登VIP")
+    @ApiModelProperty(value = "奖品类型 1积分 2优惠券 3实物 4登登登VIP 5优先购买券")
     private Integer prizeType;
 
     @ApiModelProperty(value = "单次奖励数量如积分 中奖给多少物")

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/admin/SweetIntegralActivityPrizeVo.java

@@ -44,7 +44,7 @@ public class SweetIntegralActivityPrizeVo implements Serializable, Cloneable {
     @ApiModelProperty(required = true, value = "中奖选中奖品图片")
     private String prizeImgSelect;
 
-    @ApiModelProperty(value = "奖品类型 1积分 2优惠券 3实物 4登登登VIP")
+    @ApiModelProperty(value = "奖品类型 1积分 2优惠券 3实物 4登登登VIP 5优先购买券")
     private Integer prizeType;
 
     @ApiModelProperty(value = "单次奖励数量如积分 中奖给多少物")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetIntegralActivityDrawServiceImpl.java

@@ -110,7 +110,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
         mongoTemplate.getCollection(IntegralActivityDrawVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("drawId").is(drawId)).getQueryObject(),
                 new Document("$set", new Document("receivingStatus", 2)
-                        .append("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.now())))
+                        .append("updatedAt", LocalDateTime.now()))
         );
 
         return update;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetIntegralActivityPrizeRelationServiceImpl.java

@@ -6,6 +6,7 @@ import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityP
 import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetObjectAdminUtil;
 import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.sweet.constant.StatusConst;
 import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityPrizeRelationFormParam;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityPrizeRelationVo;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityPrizeVo;
@@ -130,7 +131,7 @@ public class SweetIntegralActivityPrizeRelationServiceImpl extends ServiceImpl<S
         // 详情奖品 积分和券
         List<SweetIntegralActivityPrize> activityPrizes1 = sweetIntegralActivityPrizeMapper.selectList(
                 Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getIntegralActivityId, integralActivityId)
-                        .in(SweetIntegralActivityPrize::getPrizeType, Arrays.asList(1,2))
+                        .in(SweetIntegralActivityPrize::getPrizeType, Arrays.asList(StatusConst.PRIZE_TYPE1, StatusConst.PRIZE_TYPE2))
         );
         List<IntegralActivityPrizeVo> prizeList1 = SweetObjectAdminUtil.getSweetIntegralActivityPrizeVoList();
         activityPrizes1.forEach(r -> {
@@ -154,7 +155,7 @@ public class SweetIntegralActivityPrizeRelationServiceImpl extends ServiceImpl<S
         // 详情奖品 实物等
         List<SweetIntegralActivityPrize> activityPrizes2 = sweetIntegralActivityPrizeMapper.selectList(
                 Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getIntegralActivityId, integralActivityId)
-                        .in(SweetIntegralActivityPrize::getPrizeType, Arrays.asList(3,4))
+                        .in(SweetIntegralActivityPrize::getPrizeType, Arrays.asList(StatusConst.PRIZE_TYPE3, StatusConst.PRIZE_TYPE4, StatusConst.PRIZE_TYPE5))
         );
         List<IntegralActivityPrizeVo> prizeList2 = SweetObjectAdminUtil.getSweetIntegralActivityPrizeVoList();
         int totalPrizeNum = 0;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetIntegralActivityServiceImpl.java

@@ -8,6 +8,7 @@ import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityS
 import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetObjectAdminUtil;
 import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.sweet.constant.StatusConst;
 import com.liquidnet.service.sweet.dto.SweetIntegralActivityDto;
 import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityFromParam;
 import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityListSearchParam;
@@ -270,7 +271,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
         // 详情奖品 积分和券
         List<SweetIntegralActivityPrize> activityPrizes1 = sweetIntegralActivityPrizeMapper.selectList(
                 Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getIntegralActivityId, integralActivityId)
-                        .in(SweetIntegralActivityPrize::getPrizeType, Arrays.asList(1,2))
+                        .in(SweetIntegralActivityPrize::getPrizeType, Arrays.asList(StatusConst.PRIZE_TYPE1, StatusConst.PRIZE_TYPE2))
         );
         List<IntegralActivityPrizeVo> prizeList1 = SweetObjectAdminUtil.getSweetIntegralActivityPrizeVoList();
         activityPrizes1.forEach(r -> {
@@ -294,7 +295,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
         // 详情奖品 实物等
         List<SweetIntegralActivityPrize> activityPrizes2 = sweetIntegralActivityPrizeMapper.selectList(
                 Wrappers.lambdaQuery(SweetIntegralActivityPrize.class).eq(SweetIntegralActivityPrize::getIntegralActivityId, integralActivityId)
-                        .in(SweetIntegralActivityPrize::getPrizeType, Arrays.asList(3,4))
+                        .in(SweetIntegralActivityPrize::getPrizeType, Arrays.asList(StatusConst.PRIZE_TYPE3, StatusConst.PRIZE_TYPE4, StatusConst.PRIZE_TYPE5))
         );
         List<IntegralActivityPrizeVo> prizeList2 = SweetObjectAdminUtil.getSweetIntegralActivityPrizeVoList();
         int totalPrizeNum = 0;

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/dto/SweetActivityDrawListDao.java

@@ -38,7 +38,7 @@ public class SweetActivityDrawListDao implements Serializable {
     private String prizeTitle;
 
     /**
-     * 奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物
+     * 奖品类型 1积分 2优惠券 3实物 4登登登VIP 5优先购买券惠顾 2积分 3代金券 4满减券 5优先购买券 6实物
      */
     private Integer prizeType;
 

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/dto/admin/SweetIntegralActivityDrawListSearchParam.java

@@ -39,9 +39,6 @@ public class SweetIntegralActivityDrawListSearchParam implements Serializable {
     @ApiModelProperty(value = "发放状态")
     private Integer receivingStatus;
 
-    @ApiModelProperty(value = "是否中奖")
-    private Integer isWin;
-
     @ApiModelProperty(value = "页数", example = "0")
     private Integer pageSize;
 

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetIntegralActivityDraw.java

@@ -54,7 +54,7 @@ public class SweetIntegralActivityDraw implements Serializable, Cloneable {
     private String prizeTitle;
 
     /**
-     * 奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物
+     * 奖品类型 1积分 2优惠券 3实物 4登登登VIP 5优先购买券惠顾 2积分 3代金券 4满减券 5优先购买券 6实物
      */
     private Integer prizeType;
 

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetIntegralActivityDrawMapper.xml

@@ -43,12 +43,6 @@
             <if test="receivingStatus != null  and receivingStatus != ''">
                 and a.receiving_status = #{prizeTyreceivingStatuspe}
             </if>
-            <if test="isWin == 1">
-                and a.prize_type = 1
-            </if>
-            <if test="isWin == 2">
-                and a.prize_type != 1
-            </if>
         </where>
         ORDER BY a.mid DESC
     </select>
@@ -59,7 +53,7 @@
             <if test="integralActivityId != null  and integralActivityId != ''">
                 and integral_activity_id = #{integralActivityId}
             </if>
-            and prize_type in (3, 4)
+            and prize_type in (3, 4, 5)
         </where>
     </select>
     <select id="totalDrawNum" resultType="java.lang.Integer">

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetIntegralActivityPrizeMapper.xml

@@ -9,7 +9,7 @@
             <if test="integralActivityId != null  and integralActivityId != ''">
                 and integral_activity_id = #{integralActivityId}
             </if>
-            and prize_type in (3, 4)
+            and prize_type in (3, 4, 5)
         </where>
     </select>
     <select id="otherTotalPrizeNum" resultType="java.lang.Integer">

liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweet_integral_activity_20211020.sql

@@ -81,7 +81,7 @@ CREATE TABLE `sweet_integral_activity_draw`
     `activity_num`           int             NOT NULL DEFAULT 0 COMMENT '活动玩一次所需积分',
     `prize_id`               varchar(255)    NOT NULL DEFAULT '' COMMENT '关联奖品id',
     `prize_title`            varchar(255)    NOT NULL DEFAULT '' COMMENT '奖品名称',
-    `prize_type`             tinyint         NOT NULL DEFAULT 0 COMMENT '奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物',
+    `prize_type`             tinyint         NOT NULL DEFAULT 0 COMMENT '奖品类型 1积分 2优惠券 3实物 4登登登VIP 5优先购买券惠顾 2积分 3代金券 4满减券 5优先购买券 6实物',
     `prize_type_num`         int             NOT NULL DEFAULT 0 COMMENT '单次奖励数量如积分 中奖给多少',
     `relation_id`            varchar(255)    NOT NULL DEFAULT '' COMMENT '关联id 如商品id 券id',
     `user_id`                varchar(255)    NOT NULL DEFAULT '' COMMENT '关联用户id',