完善 admin export

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

@@ -56,7 +56,7 @@ public class IntegralActivityDrawVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "adam收货人完整地址 空格隔离省市区详细地址")
     private String receivingAddress;
 
-    @ApiModelProperty(value = "收货状态 1中奖未发放 2已发放")
+    @ApiModelProperty(value = "发放状态 1未发放 2已发放")
     private Integer receivingStatus;
 
     @ApiModelProperty(value = "创建时间")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/list.html

@@ -123,7 +123,7 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + drawListFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.integralActivityId + '\')"><i class="fa fa-edit"></i>查看中奖名单</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + drawListFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.integralActivityId + '\')"><i class="fa fa-edit"></i>查看抽奖名单</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + updateFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.integralActivityId + '\')"></i>编辑</a> ');
                         actions.push(`<a class="btn btn-danger btn-xs ${isOnlineFlag}" href="javascript:void(0)" onclick="openModal('${row.integralActivityId}','${row.isOnline}')"></i>上下线</a>`);
                         actions.push('<a class="btn btn-warning btn-xs ' + exportExcelFlag + '" href="javascript:void(0)" onclick="exportExcel(\'' + row.integralActivityId + '\')"></i>导出中奖信息</a> ');

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/dto/SweetActivityDrawExcelListDao.java

@@ -12,17 +12,30 @@ public class SweetActivityDrawExcelListDao implements Serializable, Cloneable {
 
     private static final long serialVersionUID = -3918944925598231439L;
 
-    @Excel(name = "活动id")
-    private String integralActivityId;
-    @Excel(name = "奖品id")
-    private String prizeId;
-    @Excel(name = "用户id")
-    private String userId;
-    @Excel(name = "完整地址")
+    @Excel(name = "奖品名称")
+    private String prizeTitle;
+
+    @Excel(name = "奖品类型")
+    private Integer prizeType;
+
+    @Excel(name = "数量")
+    private Integer prizeTypeNum;
+
+    @Excel(name = "用户昵称")
+    private String nickname;
+
+    @Excel(name = "收货人姓名")
+    private String receivingName;
+
+    @Excel(name = "收货人手机号")
+    private String receivingPhone;
+
+    @Excel(name = "收货地址")
     private String receivingAddress;
+
     @Excel(name = "发放状态")
     private Integer receivingStatus;
-    @Excel(name = "创建时间")
+
     private LocalDateTime createdAt;
 
     private static final SweetActivityDrawExcelListDao obj = new SweetActivityDrawExcelListDao();
@@ -37,9 +50,12 @@ public class SweetActivityDrawExcelListDao implements Serializable, Cloneable {
 
     public SweetActivityDrawExcelListDao copy(SweetActivityDrawListDao source) {
         if (null == source) return this;
-        this.setIntegralActivityId(source.getIntegralActivityId());
-        this.setPrizeId(source.getPrizeId());
-        this.setUserId(source.getUserId());
+        this.setPrizeTitle(source.getPrizeTitle());
+        this.setPrizeType(source.getPrizeType());
+        this.setPrizeTypeNum(source.getPrizeTypeNum());
+        this.setNickname(source.getNickname());
+        this.setReceivingName(source.getReceivingName());
+        this.setReceivingPhone(source.getReceivingPhone());
         this.setReceivingAddress(source.getReceivingAddress());
         this.setReceivingStatus(source.getReceivingStatus());
         this.setCreatedAt(source.getCreatedAt());

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

@@ -12,14 +12,79 @@ public class SweetActivityDrawListDao implements Serializable {
 
     private static final long serialVersionUID = 3465116974370295458L;
 
+    /**
+     * 抽奖id
+     */
+    private String drawId;
+
+    /**
+     * 关联活动id
+     */
     private String integralActivityId;
 
+    /**
+     * 活动玩一次所需积分
+     */
+    private Integer activityNum;
+
+    /**
+     * 关联奖品id
+     */
     private String prizeId;
 
+    /**
+     * 奖品名称
+     */
+    private String prizeTitle;
+
+    /**
+     * 奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物
+     */
+    private Integer prizeType;
+
+    /**
+     * 关联id 如商品id 券id
+     */
+    private String relationId;
+
+    /**
+     * 单次奖励数量如积分 中奖给多少
+     */
+    private Integer prizeTypeNum;
+
+    /**
+     * 关联用户id
+     */
     private String userId;
 
+    /**
+     * 关联用户昵称
+     */
+    private String nickname;
+
+    /**
+     * adam收货地址addresses_id
+     */
+    private String receivingAddressesId;
+
+    /**
+     * adam收货人姓名
+     */
+    private String receivingName;
+
+    /**
+     * adam收货人手机号
+     */
+    private String receivingPhone;
+
+    /**
+     * adam收货人完整地址 空格隔离省市区详细地址
+     */
     private String receivingAddress;
 
+    /**
+     * 发放状态 1未发放 2已发放
+     */
     private Integer receivingStatus;
 
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)

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

@@ -98,7 +98,7 @@ public class SweetIntegralActivityDraw implements Serializable, Cloneable {
     private String receivingAddress;
 
     /**
-     * 收货状态 1中奖未发放 2已发放
+     * 发放状态 1未发放 2已发放
      */
     private Integer receivingStatus;
 

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

@@ -73,7 +73,7 @@ CREATE TABLE `sweet_integral_activity_draw`
     `receiving_name`         varchar(255)    NOT NULL DEFAULT '' COMMENT 'adam收货人姓名',
     `receiving_phone`        varchar(255)    NOT NULL DEFAULT '' COMMENT 'adam收货人手机号',
     `receiving_address`      varchar(255)    NOT NULL DEFAULT '' COMMENT 'adam收货人完整地址 空格隔离省市区详细地址',
-    `receiving_status`       smallint        NOT NULL DEFAULT 1 COMMENT '收货状态 1中奖未发放 2已发放',
+    `receiving_status`       smallint        NOT NULL DEFAULT 1 COMMENT '发放状态 1未发放 2已发放',
     `created_at`             datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `updated_at`             datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`mid`),