积分活动奖品里关联多奖品表

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

@@ -35,27 +35,24 @@ public class SweetIntegralActivityPrizeVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "奖品名称")
     private String prizeTitle;
 
+    @ApiModelProperty(value = "奖品描述")
+    private String prizeDescribe;
+
     @ApiModelProperty(required = true, value = "初始展示奖品图片")
     private String prizeImgInit;
 
     @ApiModelProperty(required = true, value = "中奖选中奖品图片")
     private String prizeImgSelect;
 
-    @ApiModelProperty(value = "奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物")
+    @ApiModelProperty(value = "奖品类型 1积分 2优惠券 3实物 4登登登VIP")
     private Integer prizeType;
 
     @ApiModelProperty(value = "单次奖励数量如积分 中奖给多少物")
     private Integer prizeTypeNum;
 
-    @ApiModelProperty(value = "关联id 如商品id 券id")
-    private String relationId;
-
     @ApiModelProperty(value = "奖品数量")
     private Integer prizeNum;
 
-    @ApiModelProperty(value = "限制的中奖人数")
-    private Integer winnersNum;
-
     @ApiModelProperty(value = "中奖概率")
     private BigDecimal winningProbability;
 
@@ -85,13 +82,12 @@ public class SweetIntegralActivityPrizeVo implements Serializable, Cloneable {
         this.setPrizeId(source.getPrizeId());
         this.setIntegralActivityId(source.getIntegralActivityId());
         this.setPrizeTitle(source.getPrizeTitle());
+        this.setPrizeDescribe(source.getPrizeDescribe());
         this.setPrizeImgInit(source.getPrizeImgInit());
         this.setPrizeImgSelect(source.getPrizeImgSelect());
         this.setPrizeType(source.getPrizeType());
         this.setPrizeTypeNum(source.getPrizeTypeNum());
-        this.setRelationId(source.getRelationId());
         this.setPrizeNum(source.getPrizeNum());
-        this.setWinnersNum(source.getWinnersNum());
         this.setWinningProbability(source.getWinningProbability());
         this.setCreatedAt(source.getCreatedAt());
         this.setUpdatedAt(source.getUpdatedAt());

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

@@ -51,6 +51,25 @@ CREATE TABLE `sweet_integral_activity_prize`
   COLLATE utf8mb4_unicode_ci
   ROW_FORMAT = DYNAMIC COMMENT '积分活动奖品表';
 
+-- 积分活动奖品里关联多奖品表
+drop TABLE if exists `sweet_integral_activity_prize_relation`;
+CREATE TABLE `sweet_integral_activity_prize_relation`
+(
+    `mid`               bigint unsigned NOT NULL AUTO_INCREMENT,
+    `prize_relation_id` varchar(255)    NOT NULL DEFAULT '' COMMENT 'prize_relation_id',
+    `prize_id`          varchar(255)    NOT NULL DEFAULT '' COMMENT 'prize_id',
+    `coupon_id`         varchar(255)    NOT NULL DEFAULT '' COMMENT '券id',
+    `coupon_title`      varchar(255)    NOT NULL DEFAULT '' COMMENT '券名称',
+    `created_at`        datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`        datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`mid`),
+    KEY `sweet_prize_relation_id` (`prize_relation_id`),
+    KEY `sweet_prize_id` (`prize_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET utf8mb4
+  COLLATE utf8mb4_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT '积分活动奖品里关联多奖品表';
+
 -- 积分活动抽奖记录表
 drop TABLE if exists `sweet_integral_activity_draw`;
 CREATE TABLE `sweet_integral_activity_draw`

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/JxlMybatisPlusCodeGenerator.java

@@ -89,13 +89,13 @@ public class JxlMybatisPlusCodeGenerator {
         DataSourceConfig dsc = new DataSourceConfig();
 //        dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUrl("jdbc:mysql://39.106.122.201:3308/dev_ln_scene?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=CST");
+        dsc.setUrl("jdbc:mysql://39.107.71.112:3308/dev_ln_scene?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=CST");
         dsc.setUsername("testmall");
         dsc.setPassword("zhengzai!mYT");
 
         String resourcePath = "/Users/jiangxiulong/Downloads/tmp";
         String directory = "com.liquidnet.service.sweet";
-        String[] dbTableArray = new String[]{"sweet_applet_user"};
+        String[] dbTableArray = new String[]{"sweet_integral_activity_prize_relation"};
 
 
         doGenerator(resourcePath, dsc, directory, dbTableArray);

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

@@ -156,7 +156,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                 integralActivityDrawVo.setPrizeTitle(sweetIntegralActivityPrize.getPrizeTitle());
                 integralActivityDrawVo.setPrizeType(sweetIntegralActivityPrize.getPrizeType());
                 integralActivityDrawVo.setPrizeTypeNum(sweetIntegralActivityPrize.getPrizeTypeNum());
-                integralActivityDrawVo.setRelationId(sweetIntegralActivityPrize.getRelationId());
+//                integralActivityDrawVo.setRelationId(sweetIntegralActivityPrize.getRelationId());
                 integralActivityDrawVo.setUserId(userId);
                 integralActivityDrawVo.setNickname(nickname);
                 LocalDateTime nowTime = LocalDateTime.now();
@@ -186,7 +186,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                 sqlsDataA.add(new Object[]{
                         drawId, integralActivityId, integralActivity.getActivityNum(),
                         sweetIntegralActivityPrize.getPrizeId(), sweetIntegralActivityPrize.getPrizeTitle(), sweetIntegralActivityPrize.getPrizeType(),
-                        sweetIntegralActivityPrize.getPrizeTypeNum(), sweetIntegralActivityPrize.getRelationId(),
+                        sweetIntegralActivityPrize.getPrizeTypeNum(), //sweetIntegralActivityPrize.getRelationId(),
                         userId, nickname,
                         receivingStatus
                 });