Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

ace-common/src/main/java/com/github/wxiaoqi/security/common/support/aop/ValidParamAop.java

@@ -16,6 +16,7 @@ import javax.validation.Validator;
 import javax.validation.executable.ExecutableValidator;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
+import java.util.Collection;
 import java.util.Objects;
 import java.util.Set;
 
@@ -62,8 +63,13 @@ public class ValidParamAop {
           for (int i =0;i<argLength;i++){
                BeanValid beanValidAnnotation = parameters[i].getDeclaredAnnotation(BeanValid.class);
                if (Objects.nonNull(beanValidAnnotation)){
-                    if (args[i].getClass().isArray()){
-                          Object[] arrayArg =(Object[])args[i];
+                    if ((args[i] instanceof Collection) || (args[i].getClass().isArray())){
+                         Object[] arrayArg = null;
+                         if(args[i] instanceof Collection){
+                              arrayArg = ((Collection)args[i]).toArray();
+                         }else {
+                              arrayArg = (Object[])args[i];
+                         }
                           for (Object item:arrayArg){
                                Set<ConstraintViolation<Object>> validateResult = this.validator.validate(item, beanValidAnnotation.value());
                                if (!validateResult.isEmpty()){

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/excel/ExcelUtils.java

+package com.github.wxiaoqi.security.common.util.excel;
+
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFFont;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/4 18:37
+ */
+public class ExcelUtils {
+    private XSSFWorkbook hssfWorkbook;
+    private XSSFSheet sheet;
+
+    public ExcelUtils(String sheetName){
+         hssfWorkbook = new XSSFWorkbook();
+         sheet = hssfWorkbook.createSheet(sheetName);
+    }
+
+    public  void createCellData(Sheet sheet, int startRowIndex, CellStyle cellStyle, List<String[]> datas) {
+        for (String[] data : datas) {
+            Row row = sheet.createRow(startRowIndex++);
+            createCellCount(row, 0, data, cellStyle);
+        }
+    }
+
+    private   void createCellCount(Row row, int CellStartIndex, String[] data, CellStyle cellStyle) {
+        for (int i = CellStartIndex, y = 0; y < data.length; i++, y++) {
+            Cell cell = row.createCell(i);
+            cell.setCellStyle(cellStyle);
+            cell.setCellValue(data[y]);
+
+        }
+    }
+
+    public  void createHeader(Row row, int cellStartIndex, String[] header, CellStyle cellStyle) {
+        for (int i = 0; i < header.length; i++) {
+            Cell cell = row.createCell(cellStartIndex);
+            cell.setCellValue(header[i]);
+            cell.setCellStyle(cellStyle);
+            cellStartIndex += 1;
+        }
+    }
+
+    public  CellStyle createGeneralCellStyle() {
+        CellStyle cellStyleGeneral = createHeaderCellStyle();
+        cellStyleGeneral.setWrapText(true);
+        XSSFFont generalFont = createFont();
+        generalFont.setBold(false);
+        cellStyleGeneral.setFont(generalFont);
+        return cellStyleGeneral;
+    }
+
+    public  CellStyle createHeaderCellStyle() {
+        XSSFCellStyle cellStyleHeader = hssfWorkbook.createCellStyle();
+        cellStyleHeader.setAlignment(HorizontalAlignment.CENTER);
+        cellStyleHeader.setVerticalAlignment(VerticalAlignment.CENTER);
+        cellStyleHeader.setLocked(false);
+        XSSFFont headerFont = createFont();
+        cellStyleHeader.setFont(headerFont);
+        return cellStyleHeader;
+    }
+
+    public  XSSFFont createFont() {
+        XSSFFont font = hssfWorkbook.createFont();
+        font.setFontName("黑体");
+        font.setBold(true);
+        return font;
+    }
+
+    public XSSFWorkbook getHssfWorkbook() {
+        return hssfWorkbook;
+    }
+
+    public void setHssfWorkbook(XSSFWorkbook hssfWorkbook) {
+        this.hssfWorkbook = hssfWorkbook;
+    }
+
+    public XSSFSheet getSheet() {
+        return sheet;
+    }
+
+    public void setSheet(XSSFSheet sheet) {
+        this.sheet = sheet;
+    }
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/bo/InviteMemberBO.java

@@ -10,6 +10,8 @@ import lombok.Data;
  */
 @Data
 public class InviteMemberBO {
+      private Integer userId;
+      private Integer parentId;
       private String username;
       private String headUrl;
       private Long joinTime;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java

@@ -12,6 +12,7 @@ import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.im.utils.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
@@ -192,4 +193,13 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         List<UserStaffBo> staffBos = mapper.findAllStaffsByCompanyIdAndPostionId(staffStatisticsFindDTO);
         return CollectionUtils.isEmpty(staffBos)?Collections.EMPTY_LIST:staffBos;
     }
+
+    public AppUserVo findByCode(String code) {
+        AppUserVo appUserVo = new AppUserVo();
+        AppUserDetail appUserDetail = new AppUserDetail();
+        appUserDetail.setCode(code);
+        appUserDetail = mapper.selectOne(appUserDetail);
+        org.springframework.beans.BeanUtils.copyProperties(appUserDetail,appUserVo);
+        return appUserVo;
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserRelationMapper.java

@@ -23,4 +23,6 @@ public interface AppUserRelationMapper extends Mapper<AppUserRelation> {
     public  int countByParentId(@Param("parentId")Integer parentId,@Param("bindTime")Long bindTime);
 
     List<AppUserRelation> selectByUserIds(@Param("userIds") List<Integer> userIds);
+
+    List<AppUserRelation> selectCountByLeaderId(Integer userId);
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -373,4 +373,9 @@ public class AppUserController extends CommonBaseController{
        return userDetailBiz.findAllStaffs();
     }
 
+    @GetMapping("/app/unauth/code/{code}")
+    public ObjectRestResponse<AppUserVo> findAppuserInfoByCode(@PathVariable("code") String code){
+       AppUserVo appUserVo =  userDetailBiz.findByCode(code);
+       return ObjectRestResponse.succ(appUserVo);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

 package com.github.wxiaoqi.security.admin.rpc.service;
 
 import cn.hutool.json.JSONUtil;
-import com.ace.cache.annotation.CacheClear;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.biz.*;
 import com.github.wxiaoqi.security.admin.constant.RedisKey;
@@ -252,8 +251,15 @@ public class AppPermissionService {
         if (StringUtils.isBlank(username) || StringUtils.isBlank(password) || StringUtils.isBlank(mobilecode)) {
             return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空");
         }
-        if(StringUtils.isNotBlank(code)&&appUserDetailBiz.getUserByCode(code)==0){
-            return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "邀请人不存在");
+        if (StringUtils.isNotBlank(code)){
+            //判断处理活动关键字
+            String[] codes = code.split("_");
+            if(codes.length > 1) {
+                String userCode = codes[0];
+                if(appUserDetailBiz.getUserByCode(userCode)==0) {
+                    return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "邀请人不存在");
+                }
+            }
         }
         String redisLockKey = RedisKey.CONSTANT_CODE_PREFIX + username + mobilecode;
         String mobilecodeRedis = userRedisTemplate.opsForValue().get(redisLockKey) == null ? "" : userRedisTemplate.opsForValue().get(redisLockKey).toString();

ace-modules/ace-admin/src/main/resources/mapper/AppUserRelationMapper.xml

@@ -21,4 +21,8 @@
            #{userId}
         </foreach>
     </select>
+
+    <select id="selectCountByLeaderId" resultType="com.github.wxiaoqi.security.admin.entity.AppUserRelation">
+        select * from   `app_user_relation` as `aur` inner join  `app_user_login` as `aul` on aul.id=aur.user_id where aur.is_del=0 and aul.isdel=0  and aur.parent_id=#{userId}
+    </select>
 </mapper>
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml

@@ -10,6 +10,7 @@
 	 IFNULL(ausww.income,0)  AS `income`
 FROM
 	`app_user_relation` AS `aur`
+	INNER JOIN (select `id` from `app_user_login` where  isdel=0)as `aul` ON aul.id=aur.user_id
 	LEFT JOIN (SELECT DISTINCT
 	`source_id` AS userId,
 	IFNULL(
@@ -148,29 +149,29 @@ FROM
         <if test="userName!=null and userName!=' '">
             WHERE `realname` LIKE CONCAT('%',#{userName},'%') OR `nickname` LIKE CONCAT('%',#{userName},'%')
         </if>) AS audd ON audd.userid = ausw.user_id
-      ORDER BY ausw.crt_time DESC
+        ORDER BY ausw.crt_time DESC
     </select>
 
     <select id="statisticsStatffSellerWaterByUserIdsAndTime"
             resultType="com.github.wxiaoqi.security.admin.dto.AppUserSellingWaterDTO">
         SELECT
-   `auswu`.user_id, ( IFNULL(auswu.upIncome,0) - IFNULL(auswd.dowIncome,0) ) AS `commission`
-   FROM
-    ( SELECT `user_id` as `userId`, IFNULL(SUM( commission ),0) AS upIncome FROM `app_user_selling_water` where STATUS = 0 and waiting=1
-    AND `crt_time` between #{startTime} and #{endTime}
-    <if test="userIds!=null and userIds.size!=0">
-        AND `user_id` IN <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
-         #{userId}
-    </foreach>
-    </if> group by user_id) AS `auswu`
-     left join
-    ( SELECT `user_id`,IFNULL(SUM( commission ),0) AS `dowIncome` FROM `app_user_selling_water` where STATUS = 1 and waiting=1
-     and `crt_time` between #{startTime} and #{endTime}
-    <if test="userIds!=null and userIds.size!=0">
-        AND `user_id` IN <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
-        #{userId}
-    </foreach>
-    </if> group by user_id) AS `auswd`
-    on auswd.user_id=auswu.user_id
+        `auswu`.user_id, ( IFNULL(auswu.upIncome,0) - IFNULL(auswd.dowIncome,0) ) AS `commission`
+        FROM
+        ( SELECT `user_id` as `userId`, IFNULL(SUM( commission ),0) AS upIncome FROM `app_user_selling_water` where STATUS = 0 and waiting=1
+        AND `crt_time` between #{startTime} and #{endTime}
+        <if test="userIds!=null and userIds.size!=0">
+            AND `user_id` IN <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+            #{userId}
+        </foreach>
+        </if> group by user_id) AS `auswu`
+        left join
+        ( SELECT `user_id`,IFNULL(SUM( commission ),0) AS `dowIncome` FROM `app_user_selling_water` where STATUS = 1 and waiting=1
+        and `crt_time` between #{startTime} and #{endTime}
+        <if test="userIds!=null and userIds.size!=0">
+            AND `user_id` IN <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+            #{userId}
+        </foreach>
+        </if> group by user_id) AS `auswd`
+        on auswd.user_id=auswu.user_id
     </select>
 </mapper>
\ No newline at end of file

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/bo/ActivityAttendanceRecordBo.java

+package com.xxfc.platform.activity.bo;
+
+import com.xxfc.platform.activity.vo.ActivityAttendanceRecordTotalVo;
+import com.xxfc.platform.activity.vo.ActivityAttendanceRecordVo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/4 15:19
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityAttendanceRecordBo {
+
+    private Integer totalPage;
+    private Long totalCount;
+    private Integer pageNum;
+    private Integer pageSize;
+    private List<ActivityAttendanceRecordVo> activityAttendanceRecordVos;
+    private ActivityAttendanceRecordTotalVo activityAttendanceRecordTotalVo;
+
+    public Integer getTotalPage() {
+        return totalPage==null?0:totalPage;
+    }
+
+    public Long getTotalCount() {
+        return totalCount==null?0:totalCount;
+    }
+
+    public Integer getPageNum() {
+        return pageNum==null?1:pageNum;
+    }
+
+    public Integer getPageSize() {
+        return pageSize==null?0:pageSize;
+    }
+
+    public List<ActivityAttendanceRecordVo> getActivityAttendanceRecordVos() {
+        return CollectionUtils.isEmpty(activityAttendanceRecordVos)? Collections.EMPTY_LIST:activityAttendanceRecordVos;
+    }
+
+    public ActivityAttendanceRecordTotalVo getActivityAttendanceRecordTotalVo() {
+        return activityAttendanceRecordTotalVo==null?new ActivityAttendanceRecordTotalVo():activityAttendanceRecordTotalVo;
+    }
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/bo/ActivityWinningRecordBo.java

+package com.xxfc.platform.activity.bo;
+
+import com.xxfc.platform.activity.vo.ActivityWinningRecordVo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/4 8:40
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityWinningRecordBo implements Serializable {
+
+    private Integer totalPage;
+    private Long totalCount;
+    private Integer pageNum;
+    private Integer pageSize;
+    private List<ActivityWinningRecordVo> activityWinningRecords;
+    private ActivityWinningRecordTotalVo activityWinningRecordTotalVo;
+
+    public Integer getTotalPage() {
+        return totalPage==null?0:totalPage;
+    }
+
+    public Long getTotalCount() {
+        return totalCount==null?0:totalCount;
+    }
+
+    public Integer getPageNum() {
+        return pageNum==null?0:pageNum;
+    }
+
+    public Integer getPageSize() {
+        return pageSize==null?0:pageSize;
+    }
+
+    public List<ActivityWinningRecordVo> getActivityWinningRecords() {
+        return CollectionUtils.isEmpty(activityWinningRecords)? Collections.EMPTY_LIST:activityWinningRecords;
+    }
+
+    public ActivityWinningRecordTotalVo getActivityWinningRecordTotalVo() {
+        return activityWinningRecordTotalVo==null?new ActivityWinningRecordTotalVo():activityWinningRecordTotalVo;
+    }
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/bo/ActivityWinningRecordTotalVo.java

+package com.xxfc.platform.activity.bo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/4 9:45
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityWinningRecordTotalVo {
+
+      private Integer onLineNum;
+      private Integer onLineWineNum;
+      private Integer localeNum;
+      private Integer localeWineNum;
+
+      public Integer getOnLineNum() {
+            return onLineNum==null?0:onLineNum;
+      }
+
+      public Integer getOnLineWineNum() {
+            return onLineWineNum==null?0:onLineWineNum;
+      }
+
+      public Integer getLocaleNum() {
+            return localeNum==null?0:localeNum;
+      }
+
+      public Integer getLocaleWineNum() {
+            return localeWineNum==null?0:localeWineNum;
+      }
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/constant/PrizeGoodsTypeEnum.java

+package com.xxfc.platform.activity.constant;
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/6 12:11
+ */
+public enum PrizeGoodsTypeEnum {
+    PRIZE(1,"奖品"),
+    COUPON(2,"优惠券"),
+    NO_PRIZE(0,"谢谢惠顾");
+
+    private int code;
+    private String desc;
+
+    PrizeGoodsTypeEnum(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/constant/PrizeTypeEnum.java

+package com.xxfc.platform.activity.constant;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 奖品类型
+ * @data 2019/12/4 18:24
+ */
+public enum  PrizeTypeEnum {
+    ONLINE(1,"线上"),
+    LOCALE(2,"现场");
+    private int code;
+    private String desc;
+
+    PrizeTypeEnum(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/ActivityAttendanceRecordDTO.java

+package com.xxfc.platform.activity.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/4 16:48
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityAttendanceRecordDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private Integer userId;
+    private String userName;
+    private String phone;
+    private String positionName;
+    private Integer status;
+    private BigDecimal amount;
+    private Integer inviteNum;
+    private String prizes;
+    private Long attendTime;
+
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/ActivityAttendanceRecordFindDTO.java

+package com.xxfc.platform.activity.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/4 15:32
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityAttendanceRecordFindDTO extends PageParam {
+     private Integer activityId;
+     private Long startTime;
+     private Long endTime;
+     private String phone;
+     private Integer status;
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/ActivityLuckDrawFindDTO.java

+package com.xxfc.platform.activity.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/3 18:56
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityLuckDrawFindDTO extends PageParam {
+
+     private Date startTime;
+     private Date endTime;
+     private String phone;
+     private Integer activityId;
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/ActivityWinningRecordDTO.java

+package com.xxfc.platform.activity.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/3 19:21
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityWinningRecordDTO {
+    private Integer userId;
+    private Integer activityId;
+    private String activityName;
+    private String prizeName;
+    private String iconPath;
+    private Integer prizeType;
+    private Integer hasWinning;
+    private String expiryDateCode;
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/ActivityWinningRecordFindDTO.java

+package com.xxfc.platform.activity.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/4 8:36
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityWinningRecordFindDTO extends PageParam {
+
+     private Integer activityId;
+     private Date startTime;
+     private Date endTime;
+     private String phone;
+     private Integer hasWinning;
+     private Integer prizeType;
+     private Integer state;
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/ActivityWinningRecordPageDTO.java

+package com.xxfc.platform.activity.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/4 15:08
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityWinningRecordPageDTO {
+
+    private Integer userId;
+    private String userName;
+    private String phone;
+    private String positionName;
+    private Integer prizeType;
+    private String prizeName;
+    private String iconPath;
+    private Integer hasWinning;
+    private String expiryDateCode;
+    private Date crtTime;
+    private Date lotteryTime;
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/QueryLogDto.java

+package com.xxfc.platform.activity.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+@Data
+public class QueryLogDto extends PageParam {
+	Integer popularizeId;
+	Integer userId;
+}
\ No newline at end of file

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityAttendanceRecord.java

+package com.xxfc.platform.activity.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/4 14:34
+ */
+@Data
+@Table(name = "activity_attendance_record")
+public class ActivityAttendanceRecord {
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    private Long id;
+    @Column(name = "user_id")
+    private Integer userId;
+    @Column(name = "user_name")
+    private String userName;
+    @Column(name = "phone")
+    private String phone;
+    @Column(name = "activity_id")
+    private Integer activityId;
+    @Column(name = "activity_name")
+    private String activityName;
+    @Column(name = "position_id")
+    private Integer positionId;
+    @Column(name = "position_name")
+    private String positionName;
+    @ApiModelProperty("线上抽奖次数")
+    @Column(name = "online_lottery_num")
+    private Integer onlineLotteryNum;
+    @ApiModelProperty("现场抽奖次数")
+    @Column(name = "locale_lottery_num")
+    private Integer localeLotteryNum;
+    @Column(name = "crt_time")
+    private Date crtTime;
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityLuckyDraw.java

+package com.xxfc.platform.activity.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 报名
+ * @data 2019/12/3 15:06
+ */
+@Data
+@Table(name = "activity_lucky_draw")
+public class ActivityLuckyDraw implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(generator= "JDBC")
+    private Long id;
+    @Column(name = "user_name")
+    private String userName;
+    @Column(name = "phone")
+    private String phone;
+    private Integer activityId;
+    @Column(name = "activity_name")
+    private String activityName;
+    @Column(name = "ticket_num")
+    private Integer ticketNum;
+    @Column(name = "user_id")
+    private Integer userId;
+    @Column(name = "crt_time")
+    private Date crtTime;
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityPopularizeLog.java

 package com.xxfc.platform.activity.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 
 /**
  * 用户参与推广活动（邀请有礼）的活动记录的记录（日志）
@@ -84,4 +85,27 @@ public class ActivityPopularizeLog implements Serializable {
 	@ApiModelProperty(value = "状态 0--未完成；1--完成；-1--失败")
 	private Integer status;
 
+	/**
+	 * 昵称
+	 */
+	@Transient
+	private String nickname;
+
+	/**
+	 * 头像
+	 */
+	@Transient
+	private String headimgurl;
+
+	/**
+	 * 邀请的第几个用户
+	 */
+	@Transient
+	private Integer num;
+
+	/**
+	 * 邀请的第几个用户的奖金
+	 */
+	@Transient
+	private BigDecimal amount;
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityPopularizeRelation.java

 package com.xxfc.platform.activity.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 
 /**
  * 活动的参与者关系表
@@ -61,6 +65,12 @@ public class ActivityPopularizeRelation implements Serializable {
     @Column(name = "popularize_id")
 	@ApiModelProperty(value = "活动id")
     private Integer popularizeId;
-	
 
+    @Column(name = "num")
+	@ApiModelProperty(value = "第几个用户")
+	private Integer num;
+
+    @Column(name = "amount")
+	@ApiModelProperty(value = "获得奖励金额")
+	private BigDecimal amount;
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityPopularizeUser.java

 package com.xxfc.platform.activity.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 
 /**
  * 用户与推广活动（邀请有礼）的关系表
@@ -60,14 +64,14 @@ public class ActivityPopularizeUser implements Serializable {
      */
     @Column(name = "end_progress")
 	@ApiModelProperty(value = "一共需要的进度")
-    private Integer endProgress;
+    private BigDecimal endProgress;
 	
 	    /**
      *  当前进度
      */
     @Column(name = "current_progress")
 	@ApiModelProperty(value = "当前进度")
-    private Integer currentProgress;
+    private BigDecimal currentProgress;
 	
 	    /**
      *  推广活动id

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityPopup.java

@@ -8,6 +8,7 @@ import tk.mybatis.mapper.code.IdentityDialect;
 import javax.persistence.Column;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.math.BigInteger;
 
 @Data
@@ -61,4 +62,7 @@ public class ActivityPopup {
     @Column(name = "time_type")
     private Integer timeType;
 
+    @Column(name = "activity_id")
+    private Integer activityId;
+
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityPrize.java

+package com.xxfc.platform.activity.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 奖品、设置
+ * @data 2019/12/3 15:21
+ */
+@Data
+@Table(name = "activity_prize")
+@ApiModel
+public class ActivityPrize implements Serializable {
+     private static final long serialVersionUID = 1L;
+     @Id
+     @GeneratedValue(generator = "JDBC")
+     private Integer id;
+
+     @NotNull(message = "编号不能为null")
+     @ApiModelProperty("编号")
+     @Column(name = "serial_number")
+     private Integer serialNumber;
+
+     @NotEmpty(message = "奖品名称不能为空")
+     @Column(name = "name")
+     private String name;
+
+     @NotEmpty(message = "奖品地址不能为空")
+     @ApiModelProperty("奖品图片地址")
+     @Column(name = "icon_path")
+     private String iconPath;
+
+
+     @ApiModelProperty("每天最多中奖份数")
+     @Column(name = "day_max_use")
+     private Integer dayMaxUse;
+
+     @Column(name = "total_stock")
+     private Integer totalStock;
+
+     @NotNull(message = "权重|概率不能为null")
+     @Column(name = "probability")
+     private Double probability;
+
+     @NotNull(message = "奖品设置类型不能null")
+     @ApiModelProperty("1：线上 2：现场")
+     @Column(name = "type")
+     private Integer type;
+
+     @Column(name = "crt_time")
+     private Date crtTime;
+     @Column(name = "upd_time")
+     private Date updTime;
+     @Column(name = "goods_id")
+     private Integer goodsId;
+
+     @NotNull(message = "奖品类型不能为null")
+     @Column(name = "prize_goods_type")
+     private Integer prizeGoodsType;
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityWinningRecord.java

+package com.xxfc.platform.activity.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 中奖记录
+ * @data 2019/12/3 16:14
+ */
+@Data
+@Table(name = "activity_winning_record")
+public class ActivityWinningRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    private Long id;
+    @Column(name = "user_id")
+    private Integer userId;
+    @Column(name = "activity_id")
+    private Integer activityId;
+    @ApiModelProperty("1:线上 2：现场")
+    @Column(name = "prize_type")
+    private Integer prizeType;
+    @Column(name = "prize_name")
+    private String prizeName;
+    @Column(name = "icon_path")
+    private String iconPath;
+    @ApiModelProperty("是否中奖 1：是 0:否")
+    @Column(name = "has_winning")
+    private Integer hasWinning;
+    @ApiModelProperty("兑奖码")
+    @Column(name = "expiry_date_code")
+    private String expiryDateCode;
+    @Column(name = "crt_time")
+    private Date crtTime;
+    @Column(name = "lottery_time")
+    private Date lotteryTime;
+    @Column(name = "goods_id")
+    private Integer goodsId;
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/TicketCollectionRecord.java

+package com.xxfc.platform.activity.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+@Table(name = "ticket_collection_record")
+@Data
+public class TicketCollectionRecord {
+    @Id
+    private Integer id;
+
+    /**
+     * 领取人姓名
+     */
+    private String name;
+
+    /**
+     * 领取人手机号
+     */
+    private String phone;
+
+    @Column(name = "crt_time")
+    private Date crtTime;
+
+    @Column(name = "upd_time")
+    private Date updTime;
+
+    /**
+     * 门票类型
+     */
+    private Integer type;
+
+}
\ No newline at end of file

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/util/LotteryUtils.java

+package com.xxfc.platform.activity.util;
+
+import com.xxfc.platform.activity.entity.ActivityPrize;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/3 20:01
+ */
+public class LotteryUtils {
+
+    public static int getrandomIndex(List<ActivityPrize> prizes) {
+        int random = -1;
+        try {
+            //计算总权重
+            double sumWeight = 0;
+            for (ActivityPrize p : prizes) {
+                sumWeight += p.getProbability();
+            }
+            //产生随机数
+            double randomNumber;
+            randomNumber = Math.random();
+            //根据随机数在所有奖品分布的区域并确定所抽奖品
+            double d1 = 0;
+            double d2 = 0;
+            for (int i = 0; i < prizes.size(); i++) {
+                d2 += Double.parseDouble(String.valueOf(prizes.get(i).getProbability())) / sumWeight;
+                if (i == 0) {
+                    d1 = 0;
+                } else {
+                    d1 += Double.parseDouble(String.valueOf(prizes.get(i - 1).getProbability())) / sumWeight;
+                }
+                if (randomNumber >= d1 && randomNumber <= d2) {
+                    random = i;
+                    break;
+                }
+            }
+        } catch (Exception e) {
+            System.out.println("生成抽奖随机数出错，出错原因：" + e.getMessage());
+        }
+        return random;
+    }
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/ActivityAttendanceRecordTotalVo.java

+package com.xxfc.platform.activity.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/4 15:21
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityAttendanceRecordTotalVo {
+     private Integer attendNum;
+     private Integer finishNum;
+     private BigDecimal amount;
+
+    public Integer getAttendNum() {
+        return attendNum==null?0:attendNum;
+    }
+
+    public Integer getFinishNum() {
+        return finishNum==null?0:finishNum;
+    }
+
+    public BigDecimal getAmount() {
+        return amount==null?BigDecimal.ZERO:amount;
+    }
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/ActivityAttendanceRecordVo.java

+package com.xxfc.platform.activity.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/4 15:20
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityAttendanceRecordVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String userName;
+    private String phone;
+    private String positionName;
+    private Integer status;
+    private BigDecimal amount;
+    private Integer inviteNum;
+    private String prizes;
+    private Long attendTime;
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/ActivityPrizeVo.java

+package com.xxfc.platform.activity.vo;
+
+import com.xxfc.platform.activity.entity.ActivityPrize;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/3 17:27
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityPrizeVo {
+    private List<ActivityPrize> onlinePrize;
+    private List<ActivityPrize> localePrize;
+
+    public List<ActivityPrize> getOnlinePrize() {
+        return CollectionUtils.isEmpty(onlinePrize)? Collections.EMPTY_LIST:onlinePrize;
+    }
+
+    public List<ActivityPrize> getLocalePrize() {
+        return CollectionUtils.isEmpty(localePrize)? Collections.EMPTY_LIST:localePrize;
+    }
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/ActivityWinningRecordVo.java

+package com.xxfc.platform.activity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/4 9:47
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityWinningRecordVo {
+
+    private String userName;
+    private String phone;
+    private String positionName;
+    @ApiModelProperty("1:线上 2：现场")
+    private Integer prizeType;
+    private String prizeName;
+    private String iconPath;
+    @ApiModelProperty("是否中奖 1：是 0:否")
+    private Integer hasWinning;
+    @ApiModelProperty("兑奖码")
+    private String expiryDateCode;
+    private Date lotteryTime;
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/LotteryVo.java

+package com.xxfc.platform.activity.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/3 19:49
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LotteryVo {
+
+     private String prizeName;
+     private Integer serialNumber;
+     private String expiryDateCode;
+     private String message;
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/popularize/PopularizeVO.java

 package com.xxfc.platform.activity.vo.popularize;
 
 import com.xxfc.platform.activity.entity.ActivityPopularize;
-import com.xxfc.platform.activity.entity.ActivityPopularizeItem;
+import com.xxfc.platform.activity.entity.ActivityPopularizeUser;
 import lombok.Data;
 
 import java.util.List;
@@ -10,4 +10,5 @@ import java.util.List;
 public class PopularizeVO extends ActivityPopularize {
     List<ItemVO> items;
     List<UserVO> userVOs;
+	ActivityPopularizeUser activityPopularizeUser;
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/ActivityApplication.java

@@ -9,6 +9,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import tk.mybatis.spring.annotation.MapperScan;
 
@@ -22,8 +24,11 @@ import tk.mybatis.spring.annotation.MapperScan;
         "com.xxfc.platform",
         "com.github.wxiaoqi.security.common.handler",
         "com.github.wxiaoqi.security.common.log",
-        "com.github.wxiaoqi.security.admin.support.aop"
+        "com.github.wxiaoqi.security.admin.support.aop",
+        "com.github.wxiaoqi.security.common.support"
 })
+@EnableAspectJAutoProxy(exposeProxy = true)
+@EnableAsync
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityLuckyDrawBiz.java

+package com.xxfc.platform.activity.biz;
+
+import cn.hutool.core.date.DateUtil;
+import com.github.wxiaoqi.security.common.util.excel.ExcelUtils;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.activity.dto.ActivityLuckDrawFindDTO;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.activity.entity.ActivityLuckyDraw;
+import com.xxfc.platform.activity.mapper.ActivityLuckyDrawMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.ServletOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 活动抽奖报名表
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-12-03 16:46:02
+ */
+@Transactional(rollbackFor = Exception.class)
+@Service
+public class ActivityLuckyDrawBiz extends BaseBiz<ActivityLuckyDrawMapper, ActivityLuckyDraw> {
+
+    /**
+     * 报名
+     *
+     * @param activityLuckyDraw
+     */
+    public void signUp(ActivityLuckyDraw activityLuckyDraw) {
+        activityLuckyDraw.setCrtTime(new Date());
+        mapper.insertSelective(activityLuckyDraw);
+    }
+
+    /**
+     * 分页查询报名列表
+     *
+     * @param activityLuckDrawFindDTO
+     * @return
+     */
+    public PageDataVO<ActivityLuckyDraw> listLuckDrawWithPage(ActivityLuckDrawFindDTO activityLuckDrawFindDTO) {
+        PageDataVO<ActivityLuckyDraw> dataVO = PageDataVO.pageInfo(activityLuckDrawFindDTO.getPage(), activityLuckDrawFindDTO.getLimit(), () -> mapper.listLuckDrawWithPage(activityLuckDrawFindDTO));
+        List<ActivityLuckyDraw> data = dataVO.getData();
+        if (CollectionUtils.isEmpty(data)) {
+            PageDataVO<ActivityLuckyDraw> activityLuckyDrawPageDataVO = new PageDataVO<>();
+            activityLuckyDrawPageDataVO.setPageNum(activityLuckDrawFindDTO.getPage());
+            activityLuckyDrawPageDataVO.setPageSize(activityLuckDrawFindDTO.getLimit());
+            return activityLuckyDrawPageDataVO;
+        }
+        return dataVO;
+    }
+
+    public void exportActivityLuckDrawData(ActivityLuckDrawFindDTO activityLuckDrawFindDTO, ServletOutputStream outputStream) throws IOException {
+        List<ActivityLuckyDraw> activityLuckyDraws = listActivityLuckDraw(activityLuckDrawFindDTO);
+        ExcelUtils excelUtils = new ExcelUtils("报名列表");
+        XSSFWorkbook hssfWorkbook = excelUtils.getHssfWorkbook();
+        XSSFSheet sheet = excelUtils.getSheet();
+
+        Row headerRow = sheet.createRow(0);
+        CellStyle headerCellStyle = excelUtils.createHeaderCellStyle();
+        String[] headers = {"姓名","电话","人数","报名时间"};
+        excelUtils.createHeader(headerRow,0,headers,headerCellStyle);
+
+        CellStyle generalCellStyle = excelUtils.createGeneralCellStyle();
+        List<String[]> activityLuckDrawDataList = getActivityLuckDrawDataList(activityLuckyDraws);
+        excelUtils.createCellData(sheet,1,generalCellStyle,activityLuckDrawDataList);
+
+        hssfWorkbook.write(outputStream);
+        hssfWorkbook.close();
+
+
+    }
+
+    private List<String[]> getActivityLuckDrawDataList(List<ActivityLuckyDraw> activityLuckyDraws){
+         List<String[]> activityLuckDrawDataList = new ArrayList<>(activityLuckyDraws.size());
+        for (ActivityLuckyDraw activityLuckyDraw : activityLuckyDraws) {
+            String[] activityLuckDrawData = getActivityLuckDrawData(activityLuckyDraw);
+            activityLuckDrawDataList.add(activityLuckDrawData);
+        }
+        return activityLuckDrawDataList;
+    }
+
+    private String[] getActivityLuckDrawData(ActivityLuckyDraw activityLuckyDraw){
+        Date crtTime = activityLuckyDraw.getCrtTime();
+        String timeStr = DateUtil.format(crtTime, "yyyy-MM-dd HH:mm:ss");
+        return new String[]{activityLuckyDraw.getUserName(),activityLuckyDraw.getPhone(),activityLuckyDraw.getTicketNum()+"",timeStr};
+    }
+
+    public List<ActivityLuckyDraw> listActivityLuckDraw(ActivityLuckDrawFindDTO activityLuckDrawFindDTO){
+        List<ActivityLuckyDraw> activityLuckyDraws = mapper.listLuckDrawWithPage(activityLuckDrawFindDTO);
+        if (CollectionUtils.isEmpty(activityLuckyDraws)){
+            return Collections.EMPTY_LIST;
+        }
+        return activityLuckyDraws;
+    }
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeItemBiz.java

 package com.xxfc.platform.activity.biz;
 
-import org.springframework.stereotype.Service;
-
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.activity.entity.ActivityPopularizeItem;
 import com.xxfc.platform.activity.mapper.ActivityPopularizeItemMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
 
 /**
  * 推广活动项，一个活动对应多个项
@@ -15,4 +17,12 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  */
 @Service
 public class ActivityPopularizeItemBiz extends BaseBiz<ActivityPopularizeItemMapper,ActivityPopularizeItem> {
+
+	public List<ActivityPopularizeItem> selectByPopularizeId(Integer popularizeId) {
+		Example example = new Example(ActivityPopularizeItem.class);
+		example.createCriteria().andEqualTo("popularizeId", popularizeId);
+		example.orderBy("sort").asc();
+		return  mapper.selectByExample(example);
+	}
+
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeLogBiz.java

 package com.xxfc.platform.activity.biz;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.activity.dto.ApLogDTO;
-import com.xxfc.platform.activity.entity.ActivityPopularizeItem;
+import com.xxfc.platform.activity.dto.QueryLogDto;
+import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
+import com.xxfc.platform.activity.mapper.ActivityPopularizeLogMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
 
-import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
-import com.xxfc.platform.activity.mapper.ActivityPopularizeLogMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 用户参与推广活动（邀请有礼）的活动记录的记录（日志）
@@ -18,11 +26,18 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  * @date 2019-07-05 15:23:04
  */
 @Service
-public class ActivityPopularizeLogBiz extends BaseBiz<ActivityPopularizeLogMapper,ActivityPopularizeLog> {
+@Slf4j
+public class ActivityPopularizeLogBiz extends BaseBiz<ActivityPopularizeLogMapper,ActivityPopularizeLog>{
 
     @Autowired
     ActivityPopularizeItemBiz activityPopularizeItemBiz;
 
+    @Autowired
+	UserFeign userFeign;
+
+	@Autowired
+	HttpServletRequest request;
+
     public ApLogDTO selectOneApLogDTO(ActivityPopularizeLog entity){
         ActivityPopularizeLog apl = mapper.selectOne(entity);
         if(null != apl) {
@@ -33,4 +48,36 @@ public class ActivityPopularizeLogBiz extends BaseBiz<ActivityPopularizeLogMappe
             return null;
         }
     }
+
+    public ActivityPopularizeLog selectByUserIdAndPopularIdAndItemId(ActivityPopularizeLog entity) {
+		Example example = new Example(ActivityPopularizeLog.class);
+		example.createCriteria().andEqualTo("userId", entity.getUserId()).andEqualTo("itemId", entity.getItemId()).andEqualTo("popularizeId", entity.getPopularizeId());
+		return mapper.selectOneByExample(example);
+	}
+    public PageDataVO<ApLogDTO> selectByUserId(QueryLogDto queryLogDto) {
+		String token = request.getHeader("Authorization");
+		AppUserDTO appUserDTO = null;
+		if (StringUtils.isNotBlank(token)) {
+			appUserDTO = userFeign.userDetailByToken(token).getData();
+		} else {
+			return new PageDataVO<>();
+		}
+
+		Integer page = queryLogDto.getPage() == null ? 1 : queryLogDto.getPage();
+		Integer limit = queryLogDto.getLimit() == null ? 5 : queryLogDto.getLimit();
+		queryLogDto.setUserId(appUserDTO.getUserid());
+		queryLogDto.setPage(page);
+		queryLogDto.setLimit(limit);
+		Query query = new Query(queryLogDto);
+		PageDataVO<ApLogDTO> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByUserId(query.getSuper()));
+		if (pageDataVO.getData() != null) {
+			pageDataVO.getData().parallelStream().forEach(result -> {
+				result.setItem(activityPopularizeItemBiz.selectById(result.getItemId()));
+			});
+		}
+		return pageDataVO;
+	}
+
+
+
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeRelationBiz.java

 package com.xxfc.platform.activity.biz;
 
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.activity.dto.ActivityPopularizeRelationDTO;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.stereotype.Service;
-
 import com.xxfc.platform.activity.entity.ActivityPopularizeRelation;
 import com.xxfc.platform.activity.mapper.ActivityPopularizeRelationMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,4 +28,9 @@ public class ActivityPopularizeRelationBiz extends BaseBiz<ActivityPopularizeRel
         }
         return activityPopularizeRelationDTOS;
     }
+
+    public Integer getByUserIdAndPopularizeId(ActivityPopularizeRelation activityPopularizeRelation) {
+        Integer num = mapper.getByUserIdAndPopularizeId(activityPopularizeRelation);
+        return num == null ? 1 : num + 1 ;
+    }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeUserBiz.java

 package com.xxfc.platform.activity.biz;
 
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import org.springframework.stereotype.Service;
-
+import com.google.common.collect.Maps;
 import com.xxfc.platform.activity.entity.ActivityPopularizeUser;
 import com.xxfc.platform.activity.mapper.ActivityPopularizeUserMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户与推广活动（邀请有礼）的关系表
@@ -19,19 +20,39 @@ import java.util.List;
  * @date 2019-07-05 15:23:04
  */
 @Service
-public class ActivityPopularizeUserBiz extends BaseBiz<ActivityPopularizeUserMapper,ActivityPopularizeUser> {
-    public ActivityPopularizeUser insertSelectiveReT(ActivityPopularizeUser entity) {
-        if(insertSelectiveRe(entity) > 0) {
-            return selectById(entity.getId());
-        }else {
-            throw new BaseException(ResultCode.DB_OPERATION_FAIL_CODE);
-        }
-    }
+public class ActivityPopularizeUserBiz extends BaseBiz<ActivityPopularizeUserMapper, ActivityPopularizeUser> {
+	public ActivityPopularizeUser insertSelectiveReT(ActivityPopularizeUser entity) {
+		if (insertSelectiveRe(entity) > 0) {
+			return selectById(entity.getId());
+		} else {
+			throw new BaseException(ResultCode.DB_OPERATION_FAIL_CODE);
+		}
+	}
+
+	public void deleteByUserIds(List<Integer> userIds) {
+		Example example = new Example(ActivityPopularizeUser.class);
+		Example.Criteria criteria = example.createCriteria();
+		criteria.andIn("userId", userIds);
+		mapper.deleteByExample(example);
+	}
 
-    public void deleteByUserIds(List<Integer> userIds) {
-        Example example  = new Example(ActivityPopularizeUser.class);
-        Example.Criteria criteria = example.createCriteria();
-        criteria.andIn("userId",userIds);
-        mapper.deleteByExample(example);
-    }
+	public Map<Integer, Boolean> getByUserIdAndPopularizeId(Integer userId, List<Integer> popularizeIds) {
+		Map<Integer, Boolean> activityIds = Maps.newHashMap();
+		if (userId == null || popularizeIds == null) {
+			return activityIds;
+		}
+        popularizeIds.parallelStream().forEach(id -> {
+            Example example = new Example(ActivityPopularizeUser.class);
+            Example.Criteria criteria = example.createCriteria();
+            criteria.andEqualTo("userId", userId);
+            criteria.andEqualTo("popularizeId", id);
+            ActivityPopularizeUser activityPopularizeUsers = mapper.selectOneByExample(example);
+            if (activityPopularizeUsers != null) {
+				activityIds.put(id, true);
+            } else {
+				activityIds.put(id, false);
+            }
+        });
+		return activityIds;
+	}
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopupBiz.java

@@ -7,6 +7,7 @@ import com.xxfc.platform.activity.entity.ActivityPopup;
 import com.xxfc.platform.activity.entity.ActivityPopupUser;
 import com.xxfc.platform.activity.mapper.ActivityPopupMapper;
 import com.xxfc.platform.activity.mapper.ActivityPopupUserMapper;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -16,10 +17,8 @@ import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import javax.swing.plaf.synth.SynthEditorPaneUI;
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
+import java.time.Instant;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -38,6 +37,9 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
     @Autowired
     private ActivityPopupUserBiz activityPopupUserBiz;
 
+    @Autowired
+    private ActivityPopularizeUserBiz activityPopularizeUserBiz;
+
     /**
      * 获取活动弹窗,根据是否登录
      *
@@ -50,7 +52,7 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
             if (activityPopups == null || activityPopups.size() == 0) {
                 return activityPopups;
             }
-            List<Integer> collect = activityPopups.parallelStream().map(ActivityPopup::getId).collect(Collectors.toList());
+/*            List<Integer> collect = activityPopups.parallelStream().map(ActivityPopup::getId).collect(Collectors.toList());
             Example exaple = Example.builder(ActivityPopupUser.class)
                     .where(WeekendSqls.<ActivityPopupUser>custom()
                             .andEqualTo(ActivityPopupUser::getUserId, userInfo.getUserid())
@@ -60,13 +62,22 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
             if (activityPopupUsers == null || activityPopupUsers.size() == 0) {
                 return activityPopups;
             }
-            Set<Integer> popupIdSet = activityPopupUsers.parallelStream().map(ActivityPopupUser::getPopupId).collect(Collectors.toSet());
+            Set<Integer> popupIdSet = activityPopupUsers.parallelStream().map(ActivityPopupUser::getPopupId).collect(Collectors.toSet());*/
             List<ActivityPopup> result = new ArrayList<>();
+            List<Integer> activityIds = activityPopups.stream().map(ActivityPopup::getActivityId).collect(Collectors.toList());
+            activityIds = CollectionUtils.isEmpty(activityIds)? Collections.EMPTY_LIST:activityIds;
+            Map<Integer, Boolean> activityPopularizeUserMap = activityPopularizeUserBiz.getByUserIdAndPopularizeId(userInfo.getUserid(), activityIds);
             for (ActivityPopup activityPopup : activityPopups) {
-                if (popupIdSet.add(activityPopup.getId())) {
-                    result.add(activityPopup);
-                }
+                /*if (popupIdSet.add(activityPopup.getId())) {*/
+                    boolean flag = activityPopularizeUserMap.isEmpty() ||
+                            activityPopularizeUserMap.get(activityPopup.getActivityId()) == null ||
+                            activityPopularizeUserMap.get(activityPopup.getActivityId()).equals(Boolean.FALSE);
+                    if (flag) {
+                        result.add(activityPopup);
+                    }
+//                }
             }
+
             return result;
         } else {
 
@@ -85,17 +96,16 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
     private List<ActivityPopup> getActivityPopupByTypes(String Types) {
         long timeMillis = System.currentTimeMillis();
         //获取有期限的弹窗timeType=1
-        Example exa = Example.builder(ActivityPopup.class)
-                .where(
-                        WeekendSqls.<ActivityPopup>custom()
-                                .andEqualTo(ActivityPopup::getTimeType, 1)
-                                .andGreaterThanOrEqualTo(ActivityPopup::getEndTime, BigInteger.valueOf(timeMillis))
-                                .andLessThanOrEqualTo(ActivityPopup::getStartTime, BigInteger.valueOf(timeMillis))
-                                .andIn(ActivityPopup::getType, Arrays.asList(Types.split(",")))
-                                .andEqualTo(ActivityPopup::getStatus, 1)
-                                .andEqualTo(ActivityPopup::getIsDel, 0)
+        Example exa = new Example(ActivityPopup.class);
+        Example.Criteria criteria = exa.createCriteria();
+        exa.orderBy("sort").asc();
+        criteria.andEqualTo("timeType",1);
+        criteria.andIn("type",Arrays.asList(Types.split(",")));
+        criteria.andEqualTo("status",1);
+        criteria.andEqualTo("isDel",0);
+        criteria.andLessThanOrEqualTo("startTime",BigInteger.valueOf(timeMillis));
+        criteria.andGreaterThanOrEqualTo("endTime",BigInteger.valueOf(timeMillis));
 
-                ).orderByAsc("sort").build();
         List<ActivityPopup> activityPopups = mapper.selectByExample(exa);
 
         //获取永久的弹窗timeType=0

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityWinningRecordBiz.java

+package com.xxfc.platform.activity.biz;
+
+import cn.hutool.core.date.DateUtil;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.util.excel.ExcelUtils;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.google.common.collect.Lists;
+import com.xxfc.platform.activity.bo.ActivityWinningRecordBo;
+import com.xxfc.platform.activity.bo.ActivityWinningRecordTotalVo;
+import com.xxfc.platform.activity.constant.PrizeTypeEnum;
+import com.xxfc.platform.activity.dto.ActivityWinningRecordDTO;
+import com.xxfc.platform.activity.dto.ActivityWinningRecordFindDTO;
+import com.xxfc.platform.activity.dto.ActivityWinningRecordPageDTO;
+import com.xxfc.platform.activity.entity.ActivityWinningRecord;
+import com.xxfc.platform.activity.mapper.ActivityWinningRecordMapper;
+import com.xxfc.platform.activity.vo.ActivityWinningRecordVo;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import javax.servlet.ServletOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * 中奖记录
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-12-03 16:46:02
+ */
+@Transactional(rollbackFor = Exception.class)
+@Service
+public class ActivityWinningRecordBiz extends BaseBiz<ActivityWinningRecordMapper, ActivityWinningRecord> {
+
+    /**
+     * 保存
+     *
+     * @param activityWinningRecord
+     */
+    public void saveRecord(ActivityWinningRecord activityWinningRecord) {
+        activityWinningRecord.setCrtTime(new Date());
+        mapper.insertSelective(activityWinningRecord);
+    }
+
+
+    public ActivityWinningRecordBo listActivityWinningRecordWithPage(ActivityWinningRecordFindDTO activityWinningRecordFindDTO) {
+        ActivityWinningRecordBo activityWinningRecordBo = new ActivityWinningRecordBo();
+        PageDataVO<ActivityWinningRecordPageDTO> dataVO = PageDataVO.pageInfo(activityWinningRecordFindDTO.getPage(), activityWinningRecordFindDTO.getLimit(),
+                () -> mapper.selectActivityWinningRecord(activityWinningRecordFindDTO));
+        ActivityWinningRecordTotalVo activityWinningRecordTotalVo = getActivityWinningRecordTotal(activityWinningRecordFindDTO);
+        List<ActivityWinningRecordPageDTO> data = dataVO.getData();
+        if (CollectionUtils.isEmpty(data)){
+            activityWinningRecordBo.setActivityWinningRecordTotalVo(activityWinningRecordTotalVo);
+            return activityWinningRecordBo;
+        }
+        List<ActivityWinningRecordVo> activityWinningRecordVos = new ArrayList<>();
+        ActivityWinningRecordVo activityWinningRecordVo = null;
+
+        for (ActivityWinningRecordPageDTO activityWinningRecord : data) {
+
+            activityWinningRecordVo = new ActivityWinningRecordVo();
+            BeanUtils.copyProperties(activityWinningRecord,activityWinningRecordVo);
+            activityWinningRecordVos.add(activityWinningRecordVo);
+        }
+        activityWinningRecordBo.setPageNum(dataVO.getPageNum());
+        activityWinningRecordBo.setPageSize(dataVO.getPageSize());
+        activityWinningRecordBo.setTotalPage(dataVO.getTotalPage());
+        activityWinningRecordBo.setTotalCount(dataVO.getTotalCount());
+        activityWinningRecordBo.setActivityWinningRecordTotalVo(activityWinningRecordTotalVo);
+        activityWinningRecordBo.setActivityWinningRecords(activityWinningRecordVos);
+        return activityWinningRecordBo;
+    }
+
+    private ActivityWinningRecordTotalVo getActivityWinningRecordTotal(ActivityWinningRecordFindDTO activityWinningRecordFindDTO){
+        activityWinningRecordFindDTO.setHasWinning(null);
+        ActivityWinningRecordTotalVo activityWinningRecordTotalVo = new ActivityWinningRecordTotalVo();
+        List<ActivityWinningRecordPageDTO> activityWinningRecords = mapper.selectActivityWinningRecord(activityWinningRecordFindDTO);
+        if (CollectionUtils.isEmpty(activityWinningRecords)){
+            return  activityWinningRecordTotalVo;
+        }
+        AtomicInteger onlineCounter = new AtomicInteger(0);
+        AtomicInteger onlineWinCounter= new AtomicInteger(0);
+        AtomicInteger localeCounter = new AtomicInteger(0);
+        AtomicInteger localeWineCounter = new AtomicInteger(0);
+        for (ActivityWinningRecordPageDTO activityWinningRecord : activityWinningRecords) {
+            if (activityWinningRecord.getPrizeType()==1){
+                onlineCounter.incrementAndGet();
+                if (activityWinningRecord.getHasWinning()==1){
+                    onlineWinCounter.incrementAndGet();
+                }
+            }
+            if (activityWinningRecord.getPrizeType()==2){
+                localeCounter.incrementAndGet();
+                if (activityWinningRecord.getHasWinning()==1){
+                    localeWineCounter.incrementAndGet();
+                }
+            }
+        }
+        activityWinningRecordTotalVo.setOnLineNum(onlineCounter.get());
+        activityWinningRecordTotalVo.setOnLineWineNum(onlineWinCounter.get());
+        activityWinningRecordTotalVo.setLocaleNum(localeCounter.get());
+        activityWinningRecordTotalVo.setLocaleWineNum(localeWineCounter.get());
+        return activityWinningRecordTotalVo;
+    }
+
+    public void exportActivityWinngingData(ActivityWinningRecordFindDTO activityWinningRecordFindDTO, ServletOutputStream outputStream) throws IOException {
+        ExcelUtils excelUtils = new ExcelUtils("中奖列表");
+        XSSFWorkbook hssfWorkbook = excelUtils.getHssfWorkbook();
+        XSSFSheet sheet = excelUtils.getSheet();
+        List<ActivityWinningRecordPageDTO> activityWinningRecordPageDTOS = mapper.selectActivityWinningRecord(activityWinningRecordFindDTO);
+        ActivityWinningRecordTotalVo activityWinningRecordTotal = getActivityWinningRecordTotal(activityWinningRecordFindDTO);
+
+        String[] header1 = {"线上抽奖触发数","线上中奖个数","现场上抽奖触发数","现场中奖个数"};
+        Row headerRow1 = sheet.createRow(0);
+        CellStyle headerCellStyle = excelUtils.createHeaderCellStyle();
+        excelUtils.createHeader(headerRow1,0,header1,headerCellStyle);
+
+        String[] headerValue = {activityWinningRecordTotal.getOnLineNum()+"",activityWinningRecordTotal.getOnLineWineNum()+"",activityWinningRecordTotal.getLocaleNum()+"",activityWinningRecordTotal.getLocaleWineNum()+""};
+        CellStyle generalCellStyle = excelUtils.createGeneralCellStyle();
+        ArrayList<String[]> headerData = Lists.newArrayList();
+        headerData.add(headerValue);
+        excelUtils.createCellData(sheet,1,generalCellStyle,headerData);
+
+        CellRangeAddress cellRangeAddress = new CellRangeAddress(2, 2, 0, 6);
+        sheet.addMergedRegion(cellRangeAddress);
+
+        String[] header2 = {"用户名","电话","身份","发放类型","抽奖礼品","兑奖码","中奖时间"};
+        Row header2Row = sheet.createRow(3);
+        excelUtils.createHeader(header2Row,0,header2,headerCellStyle);
+
+        List<String[]> activityWinngingDataList = getActivityWinngingDataList(activityWinningRecordPageDTOS);
+        excelUtils.createCellData(sheet,4,generalCellStyle,activityWinngingDataList);
+
+        hssfWorkbook.write(outputStream);
+        hssfWorkbook.close();
+    }
+
+    private List<String[]> getActivityWinngingDataList(List<ActivityWinningRecordPageDTO> activityWinningRecordDTOS){
+         List<String[]> activityWinngingDataList = new ArrayList<>();
+        for (ActivityWinningRecordPageDTO activityWinningRecordDTO : activityWinningRecordDTOS) {
+            String[] activityWinngingData = getActivityWinngingData(activityWinningRecordDTO);
+            activityWinngingDataList.add(activityWinngingData);
+        }
+        return activityWinngingDataList;
+    }
+
+    private String[] getActivityWinngingData(ActivityWinningRecordPageDTO activityWinningRecordPageDTO){
+        String prizeType= activityWinningRecordPageDTO.getPrizeType()== PrizeTypeEnum.ONLINE.getCode()?"线上":"现场";
+        String expiryDateCode = StringUtils.hasText(activityWinningRecordPageDTO.getExpiryDateCode())?activityWinningRecordPageDTO.getExpiryDateCode():"无";
+        String timeStr = DateUtil.format(activityWinningRecordPageDTO.getLotteryTime(),"yyyy-MM-dd HH:mm:ss");
+        return new String[]{activityWinningRecordPageDTO.getUserName(),activityWinningRecordPageDTO.getPhone(),
+                activityWinningRecordPageDTO.getPositionName(),prizeType,activityWinningRecordPageDTO.getPrizeName(),
+                expiryDateCode,timeStr};
+    }
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/CouponBiz.java

@@ -143,4 +143,12 @@ public class CouponBiz extends BaseBiz<CouponMapper, Coupon> {
 
        return mapper.couponsByTickerNoList(tickerNoList);
     }
+
+    public List<CouponDTO> findCouponsByIds(List<Integer> ids){
+       List<CouponDTO> couponDTOS =  mapper.findCouponsByIds(ids);
+       if (CollectionUtils.isEmpty(couponDTOS)){
+           return Collections.EMPTY_LIST;
+       }
+       return couponDTOS;
+    }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/TicketCollectionRecordBiz.java

+package com.xxfc.platform.activity.biz;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.activity.entity.TicketCollectionRecord;
+import com.xxfc.platform.activity.mapper.TicketCollectionRecordMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@Service
+@Slf4j
+public class TicketCollectionRecordBiz extends BaseBiz<TicketCollectionRecordMapper, TicketCollectionRecord> {
+
+
+	@Autowired
+	UserFeign userFeign;
+
+	@Autowired
+	HttpServletRequest request;
+
+	public ObjectRestResponse<List<TicketCollectionRecord>> selectAllByType(Integer type) {
+		Integer newType = type == null ? 1 : type;
+		List<TicketCollectionRecord> list = mapper.selectAllByType(new TicketCollectionRecord() {{
+				setType(newType);
+			}});
+		return ObjectRestResponse.succ(list);
+	}
+
+	public ObjectRestResponse add(TicketCollectionRecord ticketCollectionRecord) {
+		if (ticketCollectionRecord == null) {
+			return ObjectRestResponse.paramIsEmpty();
+		}
+		if (ticketCollectionRecord.getPhone() == null && request.getHeader("Authorization") != null) {
+			AppUserDTO appUserDTO = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
+			if (appUserDTO != null) {
+				ticketCollectionRecord.setPhone(appUserDTO.getUsername());
+			}
+		}
+		if (ticketCollectionRecord.getType() == null){
+			ticketCollectionRecord.setType(1);
+		}
+		TicketCollectionRecord oldValue = selectByPhoneAndType(ticketCollectionRecord.getPhone(), ticketCollectionRecord.getType());
+		if (oldValue == null) {
+			insertSelectiveRe(ticketCollectionRecord);
+		} else {
+			BeanUtil.copyProperties(ticketCollectionRecord, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+			updateSelectiveByIdRe(oldValue);
+		}
+		return ObjectRestResponse.succ();
+	}
+
+	public TicketCollectionRecord selectByPhoneAndType(String phone, Integer type) {
+		Example example = new Example(TicketCollectionRecord.class);
+		example.createCriteria().andEqualTo("phone", phone).andEqualTo("type", type);
+		return mapper.selectOneByExample(example);
+	}
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/config/RedisConfiguration.java

+package com.xxfc.platform.activity.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.nio.charset.Charset;
+
+/**
+ * ${DESCRIPTION}
+ *
+ * @author wanghaobin
+ * @create 2017-06-21 8:39
+ */
+
+@Configuration
+@Primary
+public class RedisConfiguration {
+
+    @Bean
+    public RedisTemplate<String, Object>  redisTemplate(RedisConnectionFactory factory) {
+        RedisTemplate redisTemplate = new RedisTemplate();
+        redisTemplate.setConnectionFactory(factory);
+        RedisSerializer<String> stringSerializer = new StringRedisSerializer(Charset.forName("UTF-8"));
+        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
+        redisTemplate.setKeySerializer(stringSerializer);
+        redisTemplate.setValueSerializer(jackson2JsonRedisSerializer);
+        redisTemplate.setHashKeySerializer(stringSerializer);
+        redisTemplate.setHashValueSerializer(jackson2JsonRedisSerializer);
+        return redisTemplate;
+    }
+
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/config/RedissonLock.java

+package com.xxfc.platform.activity.config;
+
+import org.redisson.api.*;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description TODO
+ * @data 2019/6/20 16:51
+ */
+@Component
+public class RedissonLock {
+
+    @Resource
+    private RedissonClient redissonClient;
+
+
+    /**
+     * 获取锁
+     * @param key
+     * @return
+     */
+    public RLock getRLock(String key){
+        return redissonClient.getLock(key);
+    }
+
+    /**
+     * 获取读写锁
+     * @param key
+     * @return
+     */
+    public RReadWriteLock getRWLock(String key){
+        return redissonClient.getReadWriteLock(key);
+    }
+
+    /**
+     * 获取记数锁
+     * @param key
+     * @return
+     */
+    public RCountDownLatch getRCountDownLatch(String key){
+        return redissonClient.getCountDownLatch(key);
+    }
+
+    /**
+     * 获取消息的Topic
+     * @param key
+     * @return
+     */
+    public RTopic getRTopic(String key){
+        RTopic rTopic =  redissonClient.getTopic(key);
+        return rTopic;
+    }
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityAttendanceRecordMapper.java

+package com.xxfc.platform.activity.mapper;
+
+import com.xxfc.platform.activity.dto.ActivityAttendanceRecordDTO;
+import com.xxfc.platform.activity.dto.ActivityAttendanceRecordFindDTO;
+import com.xxfc.platform.activity.entity.ActivityAttendanceRecord;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * 参与活动数据
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-12-04 14:54:06
+ */
+public interface ActivityAttendanceRecordMapper extends Mapper<ActivityAttendanceRecord> {
+
+    List<ActivityAttendanceRecordDTO> selectActivityAttendanceRecord(ActivityAttendanceRecordFindDTO activityAttendanceRecordFindDTO);
+
+    void updateLotteryNumByActivityIdAndUserIdAndPrizeType(@Param("activityId") Integer activityId,
+                                                           @Param("userId") Integer userId,
+                                                           @Param("prizeType") Integer prizeType);
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityLuckyDrawMapper.java

+package com.xxfc.platform.activity.mapper;
+
+import com.xxfc.platform.activity.dto.ActivityLuckDrawFindDTO;
+import com.xxfc.platform.activity.entity.ActivityLuckyDraw;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * 活动抽奖报名表
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-12-03 16:46:02
+ */
+public interface ActivityLuckyDrawMapper extends Mapper<ActivityLuckyDraw> {
+
+    List<ActivityLuckyDraw> listLuckDrawWithPage(ActivityLuckDrawFindDTO activityLuckDrawFindDTO);
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityPopularizeLogMapper.java

 package com.xxfc.platform.activity.mapper;
 
+import com.xxfc.platform.activity.dto.ApLogDTO;
 import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 用户参与推广活动（邀请有礼）的活动记录的记录（日志）
  * 
@@ -11,5 +15,5 @@ import tk.mybatis.mapper.common.Mapper;
  * @date 2019-07-05 15:23:04
  */
 public interface ActivityPopularizeLogMapper extends Mapper<ActivityPopularizeLog> {
-	
+	List<ApLogDTO> selectByUserId(Map<String, Object> param);
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityPopularizeRelationMapper.java

@@ -17,4 +17,6 @@ import java.util.List;
 public interface ActivityPopularizeRelationMapper extends Mapper<ActivityPopularizeRelation> {
 
     List<ActivityPopularizeRelationDTO> findActivityPopularizeRelationsByActivityIdAndTime(@Param("activityId") Integer activityId, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
+
+    Integer getByUserIdAndPopularizeId(ActivityPopularizeRelation activityPopularizeRelation);
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityPrizeMapper.java

+package com.xxfc.platform.activity.mapper;
+
+import com.xxfc.platform.activity.entity.ActivityPrize;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.additional.insert.InsertListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 奖品设置
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-12-03 16:46:02
+ */
+public interface ActivityPrizeMapper extends Mapper<ActivityPrize>, InsertListMapper<ActivityPrize> {
+
+    void updatePrizeStock(@Param("prizeType") Integer prizeType,
+                          @Param("serialNumber") Integer serialNumber);
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityWinningRecordMapper.java

+package com.xxfc.platform.activity.mapper;
+
+import com.xxfc.platform.activity.dto.ActivityWinningRecordFindDTO;
+import com.xxfc.platform.activity.dto.ActivityWinningRecordPageDTO;
+import com.xxfc.platform.activity.entity.ActivityWinningRecord;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * 中奖记录
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-12-03 16:46:02
+ */
+public interface ActivityWinningRecordMapper extends Mapper<ActivityWinningRecord> {
+
+    List<ActivityWinningRecordPageDTO> selectActivityWinningRecord(ActivityWinningRecordFindDTO activityWinningRecordFindDTO);
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/CouponMapper.java

 package com.xxfc.platform.activity.mapper;
 
+import com.xxfc.platform.activity.dto.CouponDTO;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.vo.CouponTitleVo;
 import org.apache.ibatis.annotations.Param;
@@ -24,4 +25,6 @@ public interface CouponMapper extends Mapper<Coupon> {
 
 
     List<Coupon> couponsByTickerNoList(@Param(value = "tickerNoList") List<String> tickerNoList);
+
+    List<CouponDTO> findCouponsByIds(@Param("ids") List<Integer> ids);
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/TicketCollectionRecordMapper.java

+package com.xxfc.platform.activity.mapper;
+
+import com.xxfc.platform.activity.entity.TicketCollectionRecord;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+public interface TicketCollectionRecordMapper extends Mapper<TicketCollectionRecord> {
+	List<TicketCollectionRecord> selectAllByType(TicketCollectionRecord ticketCollectionRecord);
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityAttendanceRecordController.java

+package com.xxfc.platform.activity.rest;
+
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.activity.biz.ActivityAttendanceRecordBiz;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/4 14:56
+ */
+@RestController
+@RequestMapping("activityAttendanceRecord")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class ActivityAttendanceRecordController {
+   private final ActivityAttendanceRecordBiz activityAttendanceRecordBiz;
+
+    /**
+     * 判断是否还有抽奖机会
+     *
+     * @param activityId
+     * @param prizeType
+     * @param appUserDTO
+     * @return
+     */
+    @GetMapping("/number_of_luckydraw/{activityId}/{prizeType}")
+    public ObjectRestResponse<Boolean> hasNumberOfLuckyDrawByType(@PathVariable(value = "activityId") Integer activityId,
+                                                                  @PathVariable(value = "prizeType") Integer prizeType,
+                                                                  AppUserDTO appUserDTO) {
+        Boolean state = activityAttendanceRecordBiz.hasNumberOfLuckyDrawByType(activityId,prizeType,appUserDTO.getUserid());
+        return ObjectRestResponse.succ(state);
+    }
+
+    @PostMapping("/attend/{activityId}")
+    public ObjectRestResponse<Void> attendActivity(@PathVariable(value = "activityId") Integer activityId,
+                                                   @RequestParam(value = "activityName",required = false) String activityName, AppUserDTO appUserDTO){
+        activityAttendanceRecordBiz.attendActivity(activityId,activityName,appUserDTO);
+        return ObjectRestResponse.succ();
+    }
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityLuckyDrawController.java

+package com.xxfc.platform.activity.rest;
+
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.activity.biz.ActivityLuckyDrawBiz;
+import com.xxfc.platform.activity.entity.ActivityLuckyDraw;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/3 16:51
+ */
+
+@RestController
+@RequestMapping("activityLuckyDraw")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class ActivityLuckyDrawController {
+   private final ActivityLuckyDrawBiz activityLuckyDrawBiz;
+
+   /**
+    * 报名
+    * @param activityLuckyDraw
+    * @param appUserDTO
+    * @return
+    */
+   @PostMapping("/sign_up")
+   public ObjectRestResponse<Void> signUP(@RequestBody ActivityLuckyDraw activityLuckyDraw, AppUserDTO appUserDTO){
+      activityLuckyDraw.setUserId(appUserDTO.getUserid());
+      activityLuckyDraw.setPhone(appUserDTO.getUsername());
+      activityLuckyDrawBiz.signUp(activityLuckyDraw);
+      return ObjectRestResponse.succ();
+   }
+
+
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeController.java

@@ -28,13 +28,14 @@ import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
-import java.util.ArrayList;
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 
 @RestController
 @RequestMapping("activityPopularize")
@@ -101,6 +102,7 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
                     UserVO userVO = BeanUtil.toBean(userFeign.userDetailById(pr.getMinorUserId()).getData(), UserVO.class);
                     return userVO;
                 }).collect(Collectors.toList()));
+                vo.setActivityPopularizeUser(apu[0]);
             }
 
             //设置任务项
@@ -111,12 +113,23 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
                     .stream().map(item -> {
                         ItemVO itemVO = BeanUtil.toBean(item, ItemVO.class);
                         itemVO.setStatus(SYS_FALSE);
+
                         if(null != apu[0]) {
                             ActivityPopularizeLog log = aplMap[0].get(item.getId());
                             if(null != log && SYS_TRUE.equals(log.getStatus())) {
                                 itemVO.setStatus(SYS_TRUE);
                             }
                         }
+                        if (null != appUserDTO) {
+                            ActivityPopularizeLog activityPopularizeLog = popularizeLogBiz.selectByUserIdAndPopularIdAndItemId(new ActivityPopularizeLog(){{
+                                setUserId(appUserDTO.getUserid());
+                                setPopularizeId(v.getId());
+                                setItemId(item.getId());
+                            }});
+                            if (activityPopularizeLog != null) {
+                                itemVO.setStatus(activityPopularizeLog.getStatus());
+                            }
+                        }
                         return itemVO;
                     }).collect(Collectors.toList()));
             return vo;
@@ -149,14 +162,17 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
             activityPopularizeUser = popularizeUserBiz.insertSelectiveReT(new ActivityPopularizeUser(){{
                 setPopularizeId(itemAddDTO.getPopularizeId());
                 setUserId(getAppUser().getUserid());
-                setEndProgress(ap.getProgress());
+                setEndProgress(new BigDecimal(ap.getProgress()));
             }});
         }
 
         //判断是否已经添加过
         ActivityPopularizeLog itemLog = BeanUtil.toBean(itemAddDTO, ActivityPopularizeLog.class);
         itemLog.setUserId(getAppUser().getUserid());
-        XxBizAssert.isNull(popularizeLogBiz.selectOne(itemLog));
+        ActivityPopularizeLog activityPopularizeLog = popularizeLogBiz.selectOne(itemLog);
+        if(activityPopularizeLog != null) {
+            return ObjectRestResponse.createFailedResult(1023, "参加成功，请勿重复参加！");
+        }
 
         //添加活动日志
         itemLog.setStatus(SYS_TRUE);
@@ -176,7 +192,7 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
             ActivityPopularizeItem item1 = popularizeItemBiz.selectById(al.getItemId());
             progress += item1.getProgress();
         }
-        activityPopularizeUser.setCurrentProgress(progress);
+        activityPopularizeUser.setCurrentProgress(new BigDecimal(progress));
         popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
         return ObjectRestResponse.succ();
     }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeLogController.java

 package com.xxfc.platform.activity.rest;
 
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.activity.biz.ActivityPopularizeLogBiz;
+import com.xxfc.platform.activity.dto.QueryLogDto;
 import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -11,4 +13,9 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("activityPopularizeLog")
 public class ActivityPopularizeLogController extends BaseController<ActivityPopularizeLogBiz,ActivityPopularizeLog> {
 
+	@GetMapping(value = "/getByUser")
+	public ObjectRestResponse selectByUserId(QueryLogDto queryLogDto) {
+		return ObjectRestResponse.succ(baseBiz.selectByUserId(queryLogDto));
+	}
+
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPrizeController.java

+package com.xxfc.platform.activity.rest;
+
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.activity.biz.ActivityPrizeBiz;
+import com.xxfc.platform.activity.entity.ActivityPrize;
+import com.xxfc.platform.activity.vo.LotteryVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/3 19:44
+ */
+@RestController
+@RequestMapping("activityPrize")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class ActivityPrizeController {
+
+    private final ActivityPrizeBiz activityPrizeBiz;
+
+
+    /**
+     * 奖品类型获取
+     *
+     * @param prizeType
+     * @return
+     */
+    @GetMapping("/find_prize")
+    public ObjectRestResponse<List<ActivityPrize>> findActivityPrizeByType(@RequestParam(value = "prizeType") Integer prizeType) {
+        List<ActivityPrize> activityPrizes = activityPrizeBiz.findActivityPrizeByType(prizeType);
+        return ObjectRestResponse.succ(activityPrizes);
+    }
+
+    /**
+     * 抽奖
+     *
+     * @param activityId
+     * @param appUserDTO
+     * @return
+     */
+    @PostMapping("/lottery/{activityId}/{prizeType}")
+    public ObjectRestResponse<LotteryVo> activityLottery(@PathVariable(value = "activityId") Integer activityId,
+                                                         @PathVariable(value = "prizeType") Integer prizeType,
+                                                         @RequestParam(value = "lottery") String lottery,
+                                                         AppUserDTO appUserDTO) {
+        LotteryVo lotteryVo = activityPrizeBiz.activityLottery(activityId,prizeType,lottery,appUserDTO);
+        return ObjectRestResponse.succ(lotteryVo);
+    }
+
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityWinningRecordController.java

+package com.xxfc.platform.activity.rest;
+
+import com.xxfc.platform.activity.biz.ActivityAttendanceRecordBiz;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/3 19:44
+ */
+@RestController
+@RequestMapping("activityWinningRecord")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class ActivityWinningRecordController {
+
+     private final ActivityAttendanceRecordBiz activityAttendanceRecordBiz;
+
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/TicketCollectionRecordController.java

+package com.xxfc.platform.activity.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.activity.biz.TicketCollectionRecordBiz;
+import com.xxfc.platform.activity.entity.TicketCollectionRecord;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "ticketCollection")
+public class TicketCollectionRecordController extends BaseController<TicketCollectionRecordBiz, TicketCollectionRecord> {
+
+	@PostMapping(value = "/app/unauth/add")
+	public ObjectRestResponse add(@RequestBody TicketCollectionRecord ticketCollectionRecord) {
+		return baseBiz.add(ticketCollectionRecord);
+	}
+
+	@GetMapping(value = "/app/unauth/getAll")
+	public ObjectRestResponse<List<TicketCollectionRecord>> getAll(Integer type) {
+		return baseBiz.selectAllByType(type);
+	}
+
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/admin/ActivityAttendanceRecordAdminController.java

+package com.xxfc.platform.activity.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.activity.biz.ActivityAttendanceRecordBiz;
+import com.xxfc.platform.activity.bo.ActivityAttendanceRecordBo;
+import com.xxfc.platform.activity.dto.ActivityAttendanceRecordFindDTO;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/4 14:56
+ */
+@RestController
+@RequestMapping("admin/activityAttendanceRecord")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class ActivityAttendanceRecordAdminController {
+   private final ActivityAttendanceRecordBiz activityAttendanceRecordBiz;
+
+   @PostMapping("/page")
+   public ObjectRestResponse<ActivityAttendanceRecordBo> listActivityAttendanceRecordWithPage(@RequestBody ActivityAttendanceRecordFindDTO activityAttendanceRecordFindDTO){
+       ActivityAttendanceRecordBo activityAttendanceRecordBo = activityAttendanceRecordBiz.listActivityAttendanceRecord(activityAttendanceRecordFindDTO);
+       return ObjectRestResponse.succ(activityAttendanceRecordBo);
+   }
+
+   @PostMapping("/export")
+    public void exportActivityAttendanceRecordData(@RequestBody ActivityAttendanceRecordFindDTO activityAttendanceRecordFindDTO, HttpServletResponse response){
+       try {
+           String name = DateTimeFormatter.ofPattern("YYYYMMddHHmmss").format(LocalDateTime.now());
+           response.setContentType("application/vnd.ms-excel;charset=utf-8");
+           String filename = String.format("%s-activity-attendance-record.xlsx",name);
+           response.setHeader("Content-Disposition","attachment;filename="+ new String(filename.getBytes(), "iso8859-1"));
+           ServletOutputStream outputStream = response.getOutputStream();
+           activityAttendanceRecordBiz.exportActivityAttendanceRecordData(activityAttendanceRecordFindDTO,outputStream);
+           response.setCharacterEncoding("UTF-8");
+       }catch (Exception ex){
+           throw  new BaseException("导出数据失败");
+       }
+   }
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/admin/ActivityLuckyDrawAdminController.java

+package com.xxfc.platform.activity.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.activity.biz.ActivityLuckyDrawBiz;
+import com.xxfc.platform.activity.dto.ActivityLuckDrawFindDTO;
+import com.xxfc.platform.activity.entity.ActivityLuckyDraw;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/3 16:51
+ */
+
+@RestController
+@RequestMapping("admin/activityLuckyDraw")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class ActivityLuckyDrawAdminController {
+    private final ActivityLuckyDrawBiz activityLuckyDrawBiz;
+
+    /**
+     * 分页查询报名列表
+     *
+     * @param activityLuckDrawFindDTO
+     * @return
+     */
+    @PostMapping("/page")
+    public ObjectRestResponse<PageDataVO<ActivityLuckyDraw>> listActivtyLuckyDrawWithPage(@RequestBody ActivityLuckDrawFindDTO activityLuckDrawFindDTO) {
+        PageDataVO<ActivityLuckyDraw> activityLuckyDrawPageDataVO = activityLuckyDrawBiz.listLuckDrawWithPage(activityLuckDrawFindDTO);
+        return ObjectRestResponse.succ(activityLuckyDrawPageDataVO);
+    }
+
+    @PostMapping("/export")
+    public void  exportActivityLuckyDrawData(@RequestBody ActivityLuckDrawFindDTO activityLuckDrawFindDTO, HttpServletResponse response){
+        try {
+            String name = DateTimeFormatter.ofPattern("YYYYMMddHHmmss").format(LocalDateTime.now());
+            response.setContentType("application/vnd.ms-excel;charset=utf-8");
+            String filename = String.format("%s-activity-luckdraw.xlsx",name);
+            response.setHeader("Content-Disposition","attachment;filename="+ new String(filename.getBytes(), "iso8859-1"));
+            ServletOutputStream outputStream = response.getOutputStream();
+            activityLuckyDrawBiz.exportActivityLuckDrawData(activityLuckDrawFindDTO,outputStream);
+            response.setCharacterEncoding("UTF-8");
+        }catch (Exception ex){
+            throw  new BaseException("导出数据失败");
+        }
+
+    }
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/admin/ActivityPrizeAdminController.java

+package com.xxfc.platform.activity.rest.admin;
+
+import com.github.wxiaoqi.security.common.annotation.BeanValid;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.activity.biz.ActivityPrizeBiz;
+import com.xxfc.platform.activity.entity.ActivityPrize;
+import com.xxfc.platform.activity.vo.ActivityPrizeVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/3 19:44
+ */
+@RestController
+@RequestMapping("/admin/activityPrize")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class ActivityPrizeAdminController {
+
+    private final ActivityPrizeBiz activityPrizeBiz;
+
+    @PostMapping("/save")
+    public ObjectRestResponse<Void> savePrize(@BeanValid @RequestBody List<ActivityPrize> activityPrizes) {
+        activityPrizeBiz.saveActivityPrizes(activityPrizes);
+        return ObjectRestResponse.succ();
+    }
+
+    @GetMapping("/list")
+    public ObjectRestResponse<ActivityPrizeVo> listActivityPrize(){
+        ActivityPrizeVo activityPrizeVo = activityPrizeBiz.selectActivitys();
+        return ObjectRestResponse.succ(activityPrizeVo);
+    }
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/admin/ActivityWinningRecordAdminController.java

+package com.xxfc.platform.activity.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.activity.biz.ActivityWinningRecordBiz;
+import com.xxfc.platform.activity.bo.ActivityWinningRecordBo;
+import com.xxfc.platform.activity.dto.ActivityWinningRecordFindDTO;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/3 16:51
+ */
+@RestController
+@RequestMapping("admin/activityWinningRecord")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class ActivityWinningRecordAdminController {
+
+      private final ActivityWinningRecordBiz activityWinningRecordBiz;
+
+      @PostMapping("/page")
+      public ObjectRestResponse<ActivityWinningRecordBo> listActivityWinningRecordWithPage(@RequestBody ActivityWinningRecordFindDTO activityLuckDrawFindDTO){
+            ActivityWinningRecordBo activityWinningRecordBo =  activityWinningRecordBiz.listActivityWinningRecordWithPage(activityLuckDrawFindDTO);
+            return ObjectRestResponse.succ(activityWinningRecordBo);
+      }
+
+      @PostMapping("/export")
+      public void exportActivityWinningRecordData(@RequestBody ActivityWinningRecordFindDTO activityWinningRecordFindDTO, HttpServletResponse response){
+            try {
+                  String name = DateTimeFormatter.ofPattern("YYYYMMddHHmmss").format(LocalDateTime.now());
+                  response.setContentType("application/vnd.ms-excel;charset=utf-8");
+                  String filename = String.format("%s-activity-winnging-record.xlsx",name);
+                  response.setHeader("Content-Disposition","attachment;filename="+ new String(filename.getBytes(), "iso8859-1"));
+                  ServletOutputStream outputStream = response.getOutputStream();
+                  activityWinningRecordBiz.exportActivityWinngingData(activityWinningRecordFindDTO,outputStream);
+                  response.setCharacterEncoding("UTF-8");
+            }catch (Exception ex){
+                  throw  new BaseException("导出数据失败");
+            }
+      }
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/builder/generatorConfig.xml

@@ -15,7 +15,7 @@
         </plugin>
 
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://10.5.52.4:3307/xxfc_activity?useUnicode=true&amp;characterEncoding=UTF8"
+                        connectionURL="jdbc:mysql://10.5.52.3:3306/xxfc_activity?useUnicode=true&amp;characterEncoding=UTF8"
                         userId="root"
                         password="sslcloud123*()">
         </jdbcConnection>
@@ -26,6 +26,6 @@
 
         <javaClientGenerator targetPackage="${targetMapperPackage}" targetProject="${targetJavaProject}"
                              type="XMLMAPPER"/>
-        <table tableName="integral_user_status" domainObjectName="IntegralUserStatus"></table>
+        <table tableName="ticket_collection_record" domainObjectName="TicketCollectionRecord"></table>
     </context>
 </generatorConfiguration>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityAttendanceRecordMapper.xml

+<?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.xxfc.platform.activity.mapper.ActivityAttendanceRecordMapper">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.activity.entity.ActivityAttendanceRecord" id="activityAttendanceRecordMap">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="phone" column="phone"/>
+        <result property="activityId" column="activity_id"/>
+        <result property="activityName" column="activity_name"/>
+        <result property="positionId" column="position_id"/>
+        <result property="positionName" column="position_name"/>
+        <result property="onlineLotteryNum" column="online_lottery_num"/>
+        <result property="localeLotteryNum" column="locale_lottery_num"/>
+        <result property="crtTime" column="crt_time"/>
+    </resultMap>
+
+    <select id="selectActivityAttendanceRecord"
+            resultType="com.xxfc.platform.activity.dto.ActivityAttendanceRecordDTO">
+        select apu.user_id as `userId`,
+        apu.`current_progress` as `amount`,
+        apu.`status`,
+        apu.crt_time as `attendTime`,
+        aar.user_name as `userName`,
+        aar.phone,
+        aar.position_name as `positionName`,
+        IFNULL(apr.inviteNum,0) as `inviteNum`,
+        awr.prizes
+        from (select `user_id`,`popularize_id`,`current_progress`,`status`,`crt_time` from activity_popularize_user where
+        `popularize_id`=#{activityId}
+        <if test="status!=null">
+            and `status`=#{status}
+        </if>
+        <if test="startTime!=null and endTime!=null">
+            and `crt_time` between #{startTime} and #{endTime}
+        </if>
+        <if test="startTime!=null and endTime==null">
+            and <![CDATA[
+            `crt_time`>=#{startTime}
+            ]]>
+        </if>
+        <if test="startTime==null and endTime!=null">
+            and <![CDATA[
+            `crt_time`<=#{endTime}
+            ]]>
+        </if>
+        ) as `apu`
+        inner join (select * from `activity_attendance_record` where `activity_id`=#{activityId}
+        <if test="phone!=null and phone!=''">
+            and `phone`=#{phone}
+        </if>
+        ) as `aar`
+        on aar.user_id = apu.user_id and apu.popularize_id = aar.activity_id
+        left join (select `major_user_id`, count(minor_user_id) as `inviteNum`
+        from activity_popularize_relation where `popularize_id`=#{activityId}
+        group by major_user_id) as `apr` on apr.major_user_id = apu.user_id
+        left join (select `user_id`, `activity_id`, group_concat(`prize_name`) as `prizes`
+        from `activity_winning_record` where `activity_id`=#{activityId} and `has_winning`=1
+        group by user_id, `activity_id`) as `awr`
+        on awr.user_id = apu.user_id and awr.activity_id = apu.popularize_id
+        order by apu.current_progress desc
+    </select>
+
+    <update id="updateLotteryNumByActivityIdAndUserIdAndPrizeType">
+        update `activity_attendance_record`
+        <if test="prizeType==1">
+            set `online_lottery_num`=`online_lottery_num`-1
+        </if>
+        <if test="prizeType==2">
+            set `locale_lottery_num`=`locale_lottery_num`-1
+        </if>
+        where `activity_id`=#{activityId} and `user_id`=#{userId}
+        <if test="prizeType==1">
+            and  `online_lottery_num`>0
+        </if>
+        <if test="prizeType==2">
+            and `locale_lottery_num`>0
+        </if>
+    </update>
+
+</mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityLuckyDrawMapper.xml

+<?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.xxfc.platform.activity.mapper.ActivityLuckyDrawMapper">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.activity.entity.ActivityLuckyDraw" id="activityLuckyDrawMap">
+        <result property="id" column="id"/>
+        <result property="userName" column="user_name"/>
+        <result property="phone" column="phone"/>
+        <result property="activityId" column="activity_id"/>
+        <result property="activityName" column="activity_name"/>
+        <result property="ticketNum" column="ticket_num"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="userId" column="user_id"/>
+    </resultMap>
+
+    <select id="listLuckDrawWithPage" resultMap="activityLuckyDrawMap">
+        select * from `activity_lucky_draw` where 1=1
+        <if test="activityId!=null">
+           and `activity_id`=#{activityId}
+        </if>
+        <if test="phone!=null and phone!=''">
+            and `phone`=#{phone}
+        </if>
+        <if test="startTime!=null and endTime!=null">
+            and `crt_time` between #{startTime} and #{endTime}
+        </if>
+        <if test="startTime!=null and endTime==null">
+            and <![CDATA[
+            `crt_time`>=#{startTime}
+            ]]>
+        </if>
+        <if test="startTime==null and endTime!=null">
+            and <![CDATA[
+            `crt_time`<=#{endTime}
+            ]]>
+        </if>
+        order by `crt_time` desc
+    </select>
+
+</mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityPopularizeLogMapper.xml

@@ -15,4 +15,9 @@
         <result property="itemId" column="item_id"/>
     </resultMap>
 
+    <select id="selectByUserId" resultType="com.xxfc.platform.activity.dto.ApLogDTO" parameterType="Map">
+        select * from activity_log_list where user_id = #{userId} and popularize_id = #{popularizeId}
+        ORDER BY crt_time DESC
+    </select>
+
 </mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityPopularizeRelationMapper.xml

@@ -25,4 +25,8 @@
             and <![CDATA[ `crt_time` <= #{endTime}]]>
         </if>
     </select>
+
+    <select id="getByUserIdAndPopularizeId" parameterType="com.xxfc.platform.activity.entity.ActivityPopularizeRelation" resultType="Integer">
+        select num from activity_popularize_relation where major_user_id = #{majorUserId} and popularize_id = #{popularizeId} ORDER BY crt_time DESC LIMIT 1
+    </select>
 </mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityPrizeMapper.xml

+<?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.xxfc.platform.activity.mapper.ActivityPrizeMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.activity.entity.ActivityPrize" id="activityPrizeMap">
+        <result property="id" column="id"/>
+        <result property="serialNumber" column="serial_number"/>
+        <result property="name" column="name"/>
+        <result property="iconPath" column="icon_path"/>
+        <result property="dayMaxUse" column="day_max_use"/>
+        <result property="totalStock" column="total_stock"/>
+        <result property="probability" column="probability"/>
+        <result property="type" column="type"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="prizeGoodsType" column="prize_goods_type"/>
+    </resultMap>
+
+    <update id="updatePrizeStock">
+        update `activity_prize` set `total_stock`=`total_stock`-1 where `type`=#{prizeType} and `serial_number`=#{serialNumber} and `total_stock`>0;
+    </update>
+
+</mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityWinningRecordMapper.xml

+<?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.xxfc.platform.activity.mapper.ActivityWinningRecordMapper">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.activity.entity.ActivityWinningRecord" id="activityWinningRecordMap">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="activityId" column="activity_id"/>
+        <result property="prizeType" column="prize_type"/>
+        <result property="prizeName" column="prize_name"/>
+        <result property="iconPath" column="icon_path"/>
+        <result property="hasWinning" column="has_winning"/>
+        <result property="expiryDateCode" column="expiry_date_code"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="lotteryTime" column="lottery_time"/>
+        <result property="goodsId" column="goods_id"/>
+    </resultMap>
+
+    <select id="selectActivityWinningRecord" resultType="com.xxfc.platform.activity.dto.ActivityWinningRecordPageDTO">
+        select aar.user_id as `userId`,aar.user_name as `userName`, aar.phone as `phone`,aar.position_name as `positionName`,awr.* from `activity_winning_record` as `awr`
+        left join `activity_attendance_record` as `aar` ON aar.user_id=awr.user_id and aar.activity_id=awr.activity_id
+        where 1=1
+        <if test="activityId!=null">
+            and awr.`activity_id`=#{activityId}
+        </if>
+        <if test="hasWinning!=null">
+            and awr.`has_winning`=#{hasWinning}
+        </if>
+        <if test="phone!=null and phone!=''">
+            and aar.`phone`=#{phone}
+        </if>
+        <if test="prizeType!=null">
+            and awr.`prize_type`=#{prizeType}
+        </if>
+        <if test="startTime!=null and endTime!=null">
+            and awr.`lottery_time` between #{startTime} and #{endTime}
+        </if>
+        <if test="startTime!=null and endTime==null">
+            and <![CDATA[
+           awr.`lottery_time` >=#{startTime}
+          ]]>
+        </if>
+        <if test="startTime==null and endTime!=null">
+            and <![CDATA[
+           awr.`lottery_time` <=#{endTime}
+          ]]>
+        </if>
+        order by awr.`lottery_time` desc
+    </select>
+
+</mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/CouponMapper.xml

@@ -57,4 +57,13 @@
       </where>
 
   </select>
+
+    <select id="findCouponsByIds" resultType="com.xxfc.platform.activity.dto.CouponDTO">
+     select `id`,`title` from  `coupon` where is_del=0
+     <if test="ids!=null and ids.size>0">
+       and id in <foreach collection="ids" item="id" open="(" close=")" separator=",">
+         #{id}
+     </foreach>
+     </if>
+    </select>
 </mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/TicketCollectionRecordMapper.xml

+<?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.xxfc.platform.activity.mapper.TicketCollectionRecordMapper" >
+  <resultMap id="BaseResultMap" type="com.xxfc.platform.activity.entity.TicketCollectionRecord" >
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="phone" property="phone" jdbcType="VARCHAR" />
+    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
+    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
+    <result column="type" property="type" jdbcType="BIT" />
+  </resultMap>
+
+  <select id="selectAllByType" resultType="com.xxfc.platform.activity.entity.TicketCollectionRecord" parameterType="com.xxfc.platform.activity.entity.TicketCollectionRecord">
+      select * from ticket_collection_record where type = #{type}
+  </select>
+</mapper>
\ No newline at end of file

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/Banner.java

@@ -80,6 +80,10 @@ public class Banner {
     @ApiModelProperty(value = "跳转链接")
     private String url;
 
+    @Column(name = "ios_url")
+    @ApiModelProperty(value = "ios跳转地址")
+    private String iosUrl;
+
     /**
      * 是否删除，0否，1是
      */

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/vo/BannerVo.java

@@ -24,6 +24,8 @@ public class BannerVo {
      */
     private String url;
 
+    private String iosUrl;
+
     /**
      * seo html标签优化
      */

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BannerBiz.java

@@ -31,6 +31,7 @@ public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
             bannerVo.setTitle(banner.getTitle());
             bannerVo.setId(banner.getId());
             bannerVo.setAlt(banner.getAlt());
+            bannerVo.setIosUrl(banner.getIosUrl());
             bannerVos.add(bannerVo);
         });
         return bannerVos;

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/StatisticsStatusEnum.java

@@ -137,7 +137,6 @@ public enum StatisticsStatusEnum {
                     feeTypeBo.setNoDeductibleAmount(feeTypeBo.getNoDeductibleAmount().add(dameSafeAmount));
                 }
                 //订单金额(不包含免赔和押金)
-
                 feeTypeBo.setTotalAmount(feeTypeBo.getTotalAmount().add(accountDetailEntity.getOrderAmount()).subtract(feeTypeBo.getNoDeductibleAmount()));
             } else {
                 //退款订单押金
@@ -154,7 +153,6 @@ public enum StatisticsStatusEnum {
                         feeTypeBo.setNoDeductibleRefundAmount(feeTypeBo.getNoDeductibleRefundAmount().add(dameSafeAmount));
                     }
                 }
-
                 //遍历消费明细
                 for (OrderAccountDeduction deduction : deductions) {
                     BigDecimal deductionAmount = deduction.getAmount();
@@ -189,6 +187,12 @@ public enum StatisticsStatusEnum {
                 feeTypeBo.setOrderRefundAmount(feeTypeBo.getOrderRefundAmount().add(accountDetailEntity.getOrderAmount()).subtract(feeTypeBo.getNoDeductibleRefundAmount()));
             }
         }
+/*        //订单支付金额(不包含免赔，押金)减去退款的金额
+        feeTypeBo.setTotalAmount(feeTypeBo.getTotalAmount().subtract(feeTypeBo.getOrderRefundAmount()));
+        //订单押金减去退款押金
+        feeTypeBo.setDepositAmount(feeTypeBo.getDepositAmount().subtract(feeTypeBo.getDepositRefundAmount()));
+        //订单免赔金额减去退款的免赔金额
+        feeTypeBo.setNoDeductibleAmount(feeTypeBo.getNoDeductibleAmount().subtract(feeTypeBo.getDepositRefundAmount()));*/
         return feeTypeBo;
     }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderMemberReceivedStatisticsBiz.java

@@ -44,8 +44,16 @@ public class OrderMemberReceivedStatisticsBiz extends BaseBiz<OrderMemberReceive
      * @param orderReceivedStatisticsFindDTO
      * @return
      */
-    public List<OrderMemberReceivedStatistics> selectOrderReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderMemberReceivedStatistics(orderReceivedStatisticsFindDTO);
+    public List<OrderMemberReceivedStatistics> selectOrderReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderMemberReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+    }
+
+    public List<OrderMemberReceivedStatistics> selectOrderReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderMemberReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+    }
+
+    public List<OrderMemberReceivedStatistics> selectOrderReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderMemberReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
     }
 
     /**

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderRentVehicleReceivedStatisticsBiz.java

@@ -41,8 +41,16 @@ public class OrderRentVehicleReceivedStatisticsBiz extends BaseBiz<OrderRentVehi
      * @param orderReceivedStatisticsFindDTO
      * @return
      */
-    public List<OrderRentVehicleReceivedStatistics> selectOrderReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderRentVehicleReceivedStatistics(orderReceivedStatisticsFindDTO);
+    public List<OrderRentVehicleReceivedStatistics> selectOrderReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderRentVehicleReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+    }
+
+    public List<OrderRentVehicleReceivedStatistics> selectOrderReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderRentVehicleReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+    }
+
+    public List<OrderRentVehicleReceivedStatistics> selectOrderReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderRentVehicleReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
     }
 
     /**

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTourReceivedStatisticsBiz.java

@@ -31,8 +31,14 @@ public class OrderTourReceivedStatisticsBiz extends BaseBiz<OrderTourReceivedSta
     private final BaseOrderBiz baseOrderBiz;
     private final OrderAccountBiz orderAccountBiz;
 
-    public List<OrderTourReceivedStatistics> selectOrderReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderTourReceivedStatistics(orderReceivedStatisticsFindDTO);
+    public List<OrderTourReceivedStatistics> selectOrderReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderTourReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+    }
+    public List<OrderTourReceivedStatistics> selectOrderReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderTourReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+    }
+    public List<OrderTourReceivedStatistics> selectOrderReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderTourReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
     }
 
     /**

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderMemberReceivedStatisticsMapper.java

@@ -17,7 +17,8 @@ import java.util.List;
  */
 public interface OrderMemberReceivedStatisticsMapper extends Mapper<OrderMemberReceivedStatistics>, InsertListMapper<OrderMemberReceivedStatistics> {
 
-    List<OrderMemberReceivedStatistics> selectOrderMemberReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderMemberReceivedStatistics> selectOrderMemberReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderMemberReceivedStatistics> selectOrderMemberReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderMemberReceivedStatistics> selectOrderMemberReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
 
-    void inserMemberReceivedtList(@Param("orderMembers") List<OrderMemberReceivedStatistics> orderMemberReceivedStatistics);
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderReceivedStatisticsMapper.java

@@ -18,7 +18,9 @@ import java.util.List;
  */
 public interface OrderReceivedStatisticsMapper extends Mapper<OrderReceivedStatistics>, InsertListMapper<OrderReceivedStatistics> {
 
-    List<OrderReceivedStatistics> selectOrderReceivedStatisticsList(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderReceivedStatistics> selectOrderReceivedStatisticsDateList(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderReceivedStatistics> selectOrderReceivedStatisticsMonthList(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderReceivedStatistics> selectOrderReceivedStatisticsWeekOfYearList(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
 
     List<CompanyPerformanceBo> selectCompanyPerformanceWithDay(CompanyPerformanceFindDTO companyPerformanceFindDTO);
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderRentVehicleReceivedStatisticsMapper.java

@@ -16,5 +16,7 @@ import java.util.List;
  */
 public interface OrderRentVehicleReceivedStatisticsMapper extends Mapper<OrderRentVehicleReceivedStatistics>, InsertListMapper<OrderRentVehicleReceivedStatistics> {
 
-    List<OrderRentVehicleReceivedStatistics> selectOrderRentVehicleReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderRentVehicleReceivedStatistics> selectOrderRentVehicleReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderRentVehicleReceivedStatistics> selectOrderRentVehicleReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderRentVehicleReceivedStatistics> selectOrderRentVehicleReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderTourReceivedStatisticsMapper.java

@@ -16,5 +16,7 @@ import java.util.List;
  */
 public interface OrderTourReceivedStatisticsMapper extends Mapper<OrderTourReceivedStatistics>, InsertListMapper<OrderTourReceivedStatistics> {
 
-    List<OrderTourReceivedStatistics> selectOrderTourReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderTourReceivedStatistics> selectOrderTourReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderTourReceivedStatistics> selectOrderTourReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderTourReceivedStatistics> selectOrderTourReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
 }

xx-order/xx-order-server/src/main/resources/mapper/OrderMemberReceivedStatisticsMapper.xml

@@ -29,10 +29,12 @@
         <result property="crtTime" column="crt_time"/>
     </resultMap>
 
-    <select id="selectOrderMemberReceivedStatistics" resultMap="orderMemberReceivedStatisticsMap">
-        select  * from  `order_member_received_statistics` where 1=1
+    <select id="selectOrderMemberReceivedStatisticsGroupByDate" resultType="com.xxfc.platform.order.entity.OrderMemberReceivedStatistics">
+        select `date`,`year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity`,IFNULL(sum(`toal_common_ammount`),0) as `toalCommonAmmount`,
+         IFNULL(sum(`total_common_quantity`),0) as `totalCommonQuantity`,IFNULL(sum(`total_gold_amount`),0) as `totalGoldAmount`,IFNULL(sum(`total_gold_quantity`),0),
+         IFNULL(sum(`total_diamond_ammount`),0) as `totalDiamondAmmount`,IFNULL(sum(`total_diamond_quantity`),0) as `totalDiamondQuantity` from  `order_member_received_statistics` where 1=1
         <if test="orderState!=null">
-            and `is_finish`=#{orderState}
+            and `has_pay`=#{orderState}
         </if>
         <if test="orderOrigin!=null">
             and `order_origin`=#{orderOrigin}
@@ -53,9 +55,67 @@
                 `date` <= #{endDate}
             ]]>
         </if>
+        group  by `year`, `date`
+        order by null
     </select>
 
-    <delete id="inserMemberReceivedtList">
+    <select id="selectOrderMemberReceivedStatisticsGroupByMonth" resultType="com.xxfc.platform.order.entity.OrderMemberReceivedStatistics">
+        select `year`,`month`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity`,IFNULL(sum(`toal_common_ammount`),0) as `toalCommonAmmount`,
+        IFNULL(sum(`total_common_quantity`),0) as `totalCommonQuantity`,IFNULL(sum(`total_gold_amount`),0) as `totalGoldAmount`,IFNULL(sum(`total_gold_quantity`),0),
+        IFNULL(sum(`total_diamond_ammount`),0) as `totalDiamondAmmount`,IFNULL(sum(`total_diamond_quantity`),0) as `totalDiamondQuantity` from  `order_member_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `month`
+        order by null
+    </select>
 
-    </delete>
+    <select id="selectOrderMemberReceivedStatisticsGroupByWeekOfYear" resultType="com.xxfc.platform.order.entity.OrderMemberReceivedStatistics">
+        select `year`,`week_of_year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity`,IFNULL(sum(`toal_common_ammount`),0) as `toalCommonAmmount`
+        ,IFNULL(sum(`total_common_quantity`),0) as `totalCommonQuantity`,IFNULL(sum(`total_gold_amount`),0) as `totalGoldAmount`,IFNULL(sum(`total_gold_quantity`),0),
+        IFNULL(sum(`total_diamond_ammount`),0) as `totalDiamondAmmount`,IFNULL(sum(`total_diamond_quantity`),0) as `totalDiamondQuantity` from  `order_member_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `week_of_year`
+        order by null
+    </select>
 </mapper>
\ No newline at end of file

xx-order/xx-order-server/src/main/resources/mapper/OrderReceivedStatisticsMapper.xml

@@ -31,10 +31,10 @@
         <result property="crtTime" column="crt_time"/>
     </resultMap>
 
-    <select id="selectOrderReceivedStatisticsList" resultMap="orderReceivedStatisticsMap">
-        select * from `order_received_statistics` where 1=1
+    <select id="selectOrderReceivedStatisticsDateList" resultType="com.xxfc.platform.order.entity.OrderReceivedStatistics">
+        select `year`,`date`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_received_statistics` where 1=1
         <if test="orderState!=null">
-            and `is_finish`=#{orderState}
+            and `has_pay`=#{orderState}
         </if>
         <if test="orderOrigin!=null">
             and `order_origin`=#{orderOrigin}
@@ -56,6 +56,66 @@
                 `date` <= #{endDate}
             ]]>
         </if>
+        group  by `year`, `date`
+        order by null
+    </select>
+
+    <select id="selectOrderReceivedStatisticsMonthList" resultType="com.xxfc.platform.order.entity.OrderReceivedStatistics">
+        select `year`,`month`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `month`
+        order by null
+    </select>
+
+    <select id="selectOrderReceivedStatisticsWeekOfYearList" resultType="com.xxfc.platform.order.entity.OrderReceivedStatistics">
+        select `year`,`week_of_year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `week_of_year`
+        order by null
     </select>
 
     <!--按日统计-->
@@ -139,17 +199,17 @@
         `count_date`
         ) AS `ovss` ON ovss.cyid = ors.companyId
         AND ovss.count_date = ors.date
-       <!-- order by ors.rentVehilceAmount desc,ors.memberAmount desc,ors.travelAmount desc,ors.depositAmount desc,ors.noDeductibleAmount desc ,rentDays desc,departureNum desc, arrivalNum desc-->
+        <!-- order by ors.rentVehilceAmount desc,ors.memberAmount desc,ors.travelAmount desc,ors.depositAmount desc,ors.noDeductibleAmount desc ,rentDays desc,departureNum desc, arrivalNum desc-->
     </select>
 
     <!--按月统计-->
     <select id="selectCompanyPerformanceWithMonth"
             resultType="com.xxfc.platform.order.bo.CompanyPerformanceBo">
         SELECT
-          ors.*,
-          IFNULL(ovss.departureNum,0) as `departureNum`,
-          IFNULL(ovss.rentDays,0) as `rentDays`,
-          IFNULL(ovss.arrivalNum,0) as `arrivalNum`
+        ors.*,
+        IFNULL(ovss.departureNum,0) as `departureNum`,
+        IFNULL(ovss.rentDays,0) as `rentDays`,
+        IFNULL(ovss.arrivalNum,0) as `arrivalNum`
         FROM
         (
         SELECT
@@ -309,11 +369,11 @@
         `count_week`
         ) AS `ovss` ON ovss.cyid = ors.companyId
         AND ovss.count_week = ors.weekOfYear
-    <!-- order by ors.rentVehilceAmount desc,ors.memberAmount desc,ors.travelAmount desc,ors.depositAmount desc,ors.noDeductibleAmount desc ,rentDays desc,departureNum desc, arrivalNum desc-->
+        <!-- order by ors.rentVehilceAmount desc,ors.memberAmount desc,ors.travelAmount desc,ors.depositAmount desc,ors.noDeductibleAmount desc ,rentDays desc,departureNum desc, arrivalNum desc-->
     </select>
 
     <select id="selectCountByDate" resultType="int">
-       select count(*) from (SELECT `date` FROM `order_received_statistics` WHERE `has_pay`=1
+        select count(*) from (SELECT `date` FROM `order_received_statistics` WHERE `has_pay`=1
         <if test="companyName!=null and companyName!=''">
             AND `company_name` LIKE CONCAT('%',#{companyName},'%')
         </if>
@@ -336,7 +396,7 @@
         GROUP BY
         company_id,
         `year`,
-         `date`
+        `date`
         ) as `ds`
     </select>
 

xx-order/xx-order-server/src/main/resources/mapper/OrderRentVehicleReceivedStatisticsMapper.xml

@@ -18,10 +18,10 @@
         <result property="companyId" column="company_id"/>
         <result property="crtTime" column="crt_time"/>
     </resultMap>
-    <select id="selectOrderRentVehicleReceivedStatistics" resultMap="orderRentVehicleReceivedStatisticsMap">
-        select * from `order_rent_vehicle_received_statistics` where 1=1
+    <select id="selectOrderRentVehicleReceivedStatisticsGroupByDate" resultType="com.xxfc.platform.order.entity.OrderRentVehicleReceivedStatistics">
+        select `year`,`date`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_rent_vehicle_received_statistics` where 1=1
         <if test="orderState!=null">
-            and `is_finish`=#{orderState}
+            and `has_pay`=#{orderState}
         </if>
         <if test="orderOrigin!=null">
             and `order_origin`=#{orderOrigin}
@@ -42,6 +42,63 @@
                 `date` <= #{endDate}
             ]]>
         </if>
+        group  by `year`, `date`
+        order by null
     </select>
 
+    <select id="selectOrderRentVehicleReceivedStatisticsGroupByMonth"  resultType="com.xxfc.platform.order.entity.OrderRentVehicleReceivedStatistics">
+        select `year`,`month`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_rent_vehicle_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `month`
+        order by null
+    </select>
+
+    <select id="selectOrderRentVehicleReceivedStatisticsGroupByWeekOfYear" resultType="com.xxfc.platform.order.entity.OrderRentVehicleReceivedStatistics">
+        select `year`,`week_of_year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_rent_vehicle_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `week_of_year`
+        order by null
+    </select>
 </mapper>
\ No newline at end of file

xx-order/xx-order-server/src/main/resources/mapper/OrderTourReceivedStatisticsMapper.xml

@@ -23,10 +23,10 @@
         <result property="crtTime" column="crt_time"/>
     </resultMap>
 
-    <select id="selectOrderTourReceivedStatistics" resultMap="orderTourReceivedStatisticsMap">
-       select * from  `order_tour_received_statistics` where 1=1
+    <select id="selectOrderTourReceivedStatisticsGroupByDate" resultType="com.xxfc.platform.order.entity.OrderTourReceivedStatistics">
+         select `year`,`date`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from  `order_tour_received_statistics` where 1=1
         <if test="orderState!=null">
-            and `is_finish`=#{orderState}
+            and `has_pay`=#{orderState}
         </if>
         <if test="orderOrigin!=null">
             and `order_origin`=#{orderOrigin}
@@ -47,6 +47,63 @@
                 `date` <= #{endDate}
             ]]>
         </if>
+        group  by `year`, `date`
+        order by null
     </select>
 
+    <select id="selectOrderTourReceivedStatisticsGroupByMonth" resultType="com.xxfc.platform.order.entity.OrderTourReceivedStatistics">
+        select `year`,`month`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from  `order_tour_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `month`
+        order by null
+    </select>
+
+    <select id="selectOrderTourReceivedStatisticsGroupByWeekOfYear" resultType="com.xxfc.platform.order.entity.OrderTourReceivedStatistics">
+        select `year`,`week_of_year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from  `order_tour_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `week_of_year`
+        order by null
+    </select>
 </mapper>
\ No newline at end of file

xx-order/xx-order-server/src/test/java/ServiceTest.java

@@ -98,7 +98,7 @@ public class ServiceTest {
 
     @Test
     public void testMemberStatistics(){
-        Date date = DateTime.parse("2019-11-15").toDate();
+        Date date = DateTime.parse("2019-11-28").toDate();
         Date startDate = DateUtil.beginOfDay(date).toJdkDate();
         Date endDate = DateUtil.endOfDay(date).toJdkDate();
         Map<Integer, String> companyMap = vehicleFeign.findCompanyMap();
@@ -128,15 +128,14 @@ public class ServiceTest {
     public void testOrderReceivedStatisticsJobHandler(){
         cn.hutool.core.date.DateTime dateTime = DateUtil.parse("2019-11-29", "yyyy-MM-dd");
      //   cn.hutool.core.date.DateTime offset = DateUtil.offset(dateTime, DateField.DAY_OF_MONTH, 1);
-        orderReceivedStatisticsJobHandler.execute("2019-11-29");
-      /*  LocalDate startLocalDate = LocalDate.of(2019, 10, 1);
-        LocalDate endLocalDate = LocalDate.of(2019,11,29);
+     /*   orderReceivedStatisticsJobHandler.execute("2019-11-29");*/
+        LocalDate startLocalDate = LocalDate.of(2019, 10, 1);
+        LocalDate endLocalDate = LocalDate.of(2019,11,30);
         while (startLocalDate.isBefore(endLocalDate)){
             String dateStr = startLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             startLocalDate = startLocalDate.plusDays(1);
             orderReceivedStatisticsJobHandler.execute(dateStr);
         }
-*/
 
     }
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -666,6 +666,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
         log.info("response: {}"+response.getBody());
         return response;
     }
+    
     public static void main(String[] args) throws AlipayApiException {
         OrderPayBiz orderPayBiz = new OrderPayBiz();
         OrderPayVo orderPayVo = new OrderPayVo();
@@ -675,12 +676,12 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
         orderPayVo.setAmount(3);
         orderPayVo.setBody("扣除租车订单费用");
         orderPayVo.setSubject("租车订单交易费用");
-        //orderPayBiz.testTradeRefund("216584713656209408", 105000, "退还违约金1050元", "2165847136562094081050");
+        //orderPayBiz.testTradeRefund("222522054304468992", 180000, "退还违约金1800元", "222522054304461800");
         //orderPayBiz.fundAuthOrderUnFreeze(orderPayVo, "");
         //orderPayBiz.alipayOrderRefund("20191024153859000003","2019102422001421530513773694", 2, "xxxx", "");
         //orderPayBiz.tradePay(orderPayVo, "");
         //orderPayBiz.fundAuthCancel(orderPayVo, "");
         //orderPayBiz.tradePay("20191114182254000019", "2019111410002001530505959461", 1,"扣除违约金", "扣除违约金");
-        orderPayBiz.fundAuthQuery("20191031172653000026");
+        //orderPayBiz.fundAuthQuery("20191031172653000026");
     }
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelHolidayPriceBiz.java

@@ -62,19 +62,8 @@ public class VehicleModelHolidayPriceBiz extends BaseBiz<VehicleModelHolidayPric
         }
         //编辑
         if (Objects.nonNull(vehicleModelHolidayPriceSaveDTO.getId())) {
-            Example example = new Example(VehicleModelHolidayPrice.class);
-            Example.Criteria criteria = example.createCriteria();
-            criteria.andEqualTo("festivalId", vehicleModelHolidayPriceSaveDTO.getId());
-            for (VehicleModelHolidayPrice modelHolidayPrice : vehicleModelHolidayPriceList) {
-                modelHolidayPrice.setUpdUserId(userId);
-                modelHolidayPrice.setUpdTime(new Date());
-                mapper.updateByExampleSelective(modelHolidayPrice, example);
-            }
-            Festival festival = new Festival();
-            festival.setName(vehicleModelHolidayPriceSaveDTO.getFestival());
-            festival.setId(vehicleModelHolidayPriceSaveDTO.getId());
-            festivalBiz.add(festival);
-        } else {
+            deleteById(vehicleModelHolidayPriceSaveDTO.getId());
+        }
             Festival festival = new Festival();
             festival.setName(vehicleModelHolidayPriceSaveDTO.getFestival());
             festivalBiz.add(festival);
@@ -83,7 +72,6 @@ public class VehicleModelHolidayPriceBiz extends BaseBiz<VehicleModelHolidayPric
                 modelHolidayPrice.setCrtUserId(userId);
                 modelHolidayPrice.setFestivalId(festival.getId());
                 mapper.insertSelective(modelHolidayPrice);
-            }
         }
     }