Merge remote-tracking branch 'origin/dev' into dev

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/biz/AppUserRelationBiz.java

@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRelation> {
+public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRelation> {
 
     @Autowired
     AppUserRelationTempBiz relationTempBiz;
@@ -49,23 +49,24 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
     private Long failureTime;
 
     @Autowired
-    private  AppUserDetailBiz appUserDetailBiz;
+    private AppUserDetailBiz appUserDetailBiz;
 
     @Value("${admin.validTime}")
-    private  Long  validTime;
+    private Long validTime;
 
     @Autowired
-    private  AppUserPositionTempBiz positionTempBiz;
+    private AppUserPositionTempBiz positionTempBiz;
 
     /**
      * 关系绑定
      * 规则A->B (B无有效上线+无有效下线)
+     *
      * @param userId
      * @param parentId
      */
-    public   void bindRelation(Integer userId,Integer parentId,Integer type){
-        if (userId.equals(parentId)){
-            log.info("----userId==="+userId+"----parentId===="+parentId+"----自己不能成为自己的上线");
+    public void bindRelation(Integer userId, Integer parentId, Integer type) {
+        if (userId.equals(parentId)) {
+            log.info("----userId===" + userId + "----parentId====" + parentId + "----自己不能成为自己的上线");
             return;
         }
        /* AppUserVo appUserVo=userDetailBiz.getUserInfoById(userId);
@@ -74,34 +75,34 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
             log.info("----userId==="+userId+"----parentId===="+parentId+"----该用户不存在");
             return;
         }*/
-        AppUserVo  appUserVo=userDetailBiz.getUserInfoById(parentId);
-        if (appUserVo==null){
-            log.info("----userId==="+userId+"----parentId===="+parentId+"----该上线用户不存在");
+        AppUserVo appUserVo = userDetailBiz.getUserInfoById(parentId);
+        if (appUserVo == null) {
+            log.info("----userId===" + userId + "----parentId====" + parentId + "----该上线用户不存在");
             return;
         }
-        AppUserRelation relation=getMyBiz().getRelationByUserId(parentId);
-        Long time=System.currentTimeMillis();
-         if(relation==null){
-             relation=new AppUserRelation();
-             relation.setUserId(parentId);
-             relation.setBindType(type);
-             insertSelective(relation);
-         }
-        Long bindTime=time-validTime;
-         //判断用户是否有有效的下线
-        if (getCountByParentId(userId,bindTime)==0L){
-            relation=getMyBiz().getRelationByUserId(userId);
-            if(relation==null){
-                relation=new AppUserRelation();
+        AppUserRelation relation = getMyBiz().getRelationByUserId(parentId);
+        Long time = System.currentTimeMillis();
+        if (relation == null) {
+            relation = new AppUserRelation();
+            relation.setUserId(parentId);
+            relation.setBindType(type);
+            insertSelective(relation);
+        }
+        Long bindTime = time - validTime;
+        //判断用户是否有有效的下线
+        if (getCountByParentId(userId, bindTime) == 0L) {
+            relation = getMyBiz().getRelationByUserId(userId);
+            if (relation == null) {
+                relation = new AppUserRelation();
                 relation.setUserId(userId);
                 relation.setParentId(parentId);
                 relation.setBindType(type);
                 relation.setBindTime(time);
                 insertSelective(relation);
-            }else {
+            } else {
                 //判断用户是否有有效的上线
-                log.info("----userId==="+userId+"----bindTime===="+bindTime+"----relation.getBindTime()==="+relation.getBindTime());
-                if(relation.getParentId()==null||relation.getParentId()==0||(relation.getIsForever()!=1&&validTime>0&&relation.getBindTime()<bindTime)){
+                log.info("----userId===" + userId + "----bindTime====" + bindTime + "----relation.getBindTime()===" + relation.getBindTime());
+                if (relation.getParentId() == null || relation.getParentId() == 0 || (relation.getIsForever() != 1 && validTime > 0 && relation.getBindTime() < bindTime)) {
                     relation.setParentId(parentId);
                     relation.setBindType(type);
                     relation.setBindTime(time);
@@ -110,65 +111,69 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
             }
         }
     }
+
     //首页关系绑定
-    public  ObjectRestResponse  appBindRelation(Integer userId,String code){
-        Integer parentId=0;
-        if (StringUtils.isNotBlank(code)){
+    public ObjectRestResponse appBindRelation(Integer userId, String code) {
+        Integer parentId = 0;
+        if (StringUtils.isNotBlank(code)) {
             //判断处理活动关键字
             String[] codes = code.split("_");
-            if(codes.length > 1) {
+            if (codes.length > 1) {
                 code = codes[0];
             }
-            parentId=appUserDetailBiz.getUserByCode(code);
+            parentId = appUserDetailBiz.getUserByCode(code);
         }
-        if (parentId!=null&&parentId>0&&userId!=null&&userId>0){
-            getMyBiz().bindRelation(userId,parentId,1);
+        if (parentId != null && parentId > 0 && userId != null && userId > 0) {
+            getMyBiz().bindRelation(userId, parentId, 1);
         }
-        return  ObjectRestResponse.succ();
+        return ObjectRestResponse.succ();
     }
 
     //后台关系绑定
-    public  ObjectRestResponse  adminBindRelation(UserRelationDTO relationDTO){
-        String phone=relationDTO.getPhone();
-        Integer userId=relationDTO.getUserId();
-        if (StringUtils.isBlank(phone)||userId==null||userId==0){
-            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+    public ObjectRestResponse adminBindRelation(UserRelationDTO relationDTO) {
+        String phone = relationDTO.getPhone();
+        Integer userId = relationDTO.getUserId();
+        if (StringUtils.isBlank(phone) || userId == null || userId == 0) {
+            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数不能为空");
         }
-        AppUserLogin userLogin=appUserLoginBiz.checkeUserLogin(phone);
-        if (userLogin==null){
-            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"该上级不存在");
+        AppUserLogin userLogin = appUserLoginBiz.checkeUserLogin(phone);
+        if (userLogin == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "该上级不存在");
         }
-        Integer parentId=userLogin.getId();
-        getMyBiz().bindRelation(userId,parentId,1);
-        return  ObjectRestResponse.succ();
+        Integer parentId = userLogin.getId();
+        getMyBiz().bindRelation(userId, parentId, 1);
+        return ObjectRestResponse.succ();
     }
+
     //永久稳定关系
-    public void foreverBind(Integer user_id ){
-        AppUserRelation relation=getMyBiz().getRelationByUserId(user_id);
-        if(relation!=null&&relation.getIsForever()==0&&relation.getParentId()!=null&&relation.getParentId()>0){
+    public void foreverBind(Integer user_id) {
+        AppUserRelation relation = getMyBiz().getRelationByUserId(user_id);
+        if (relation != null && relation.getIsForever() == 0 && relation.getParentId() != null && relation.getParentId() > 0) {
             relation.setIsForever(1);
             getMyBiz().updRelation(relation);
         }
 
     }
+
     /**
      * 小程序分享上下线绑定
-     * @param userid  当前人小程序id
-     * @param pid  分享人id
-     * @param platform_userid  当前人统一平台id
+     *
+     * @param userid          当前人小程序id
+     * @param pid             分享人id
+     * @param platform_userid 当前人统一平台id
      */
-    public ObjectRestResponse shareParentByUserId(Integer userid, Integer pid, Integer platform_userid){
-        if(pid==null||pid==0||((platform_userid==null||platform_userid==0)&&(userid==0||userid==null))){
+    public ObjectRestResponse shareParentByUserId(Integer userid, Integer pid, Integer platform_userid) {
+        if (pid == null || pid == 0 || ((platform_userid == null || platform_userid == 0) && (userid == 0 || userid == null))) {
             return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
         }
-        if(platform_userid==null||platform_userid==0){
-            upRelationTemp(pid,userid);
-        }else {
-            AppUserVo userVo=userDetailBiz.getUserInfoById(platform_userid);
-            if(userVo==null){
-                upRelationTemp(pid,userid);
-            }else {
-                bindRelation(platform_userid,pid,2);
+        if (platform_userid == null || platform_userid == 0) {
+            upRelationTemp(pid, userid);
+        } else {
+            AppUserVo userVo = userDetailBiz.getUserInfoById(platform_userid);
+            if (userVo == null) {
+                upRelationTemp(pid, userid);
+            } else {
+                bindRelation(platform_userid, pid, 2);
             }
         }
         return ObjectRestResponse.succ();
@@ -177,17 +182,18 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
 
     /**
      * 新增临时关系
+     *
      * @param pid
      * @param userid
      */
-    public  void upRelationTemp(Integer pid,Integer userid){
+    public void upRelationTemp(Integer pid, Integer userid) {
 
-        AppUserRelationTemp relationTemp=new AppUserRelationTemp();
+        AppUserRelationTemp relationTemp = new AppUserRelationTemp();
         relationTemp.setTempId(userid);
         relationTemp.setIsDel(0);
         relationTemp.setType(1);
-        AppUserRelationTemp relationTemp1= relationTempBiz.selectOne(relationTemp);
-        if(relationTemp1==null){
+        AppUserRelationTemp relationTemp1 = relationTempBiz.selectOne(relationTemp);
+        if (relationTemp1 == null) {
             relationTemp.setUserId(pid);
             relationTempBiz.insertSelective(relationTemp);
         }
@@ -196,68 +202,70 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
 
     /**
      * 小程序上下线绑定
+     *
      * @param platform_userid 当前人统一平台id
-     * @param userid 当前人小程序id
+     * @param userid          当前人小程序id
      */
-    public void bindByUserId(Integer platform_userid,Integer userid){
-        if(platform_userid==null||platform_userid==0||userid==null||userid==0){
+    public void bindByUserId(Integer platform_userid, Integer userid) {
+        if (platform_userid == null || platform_userid == 0 || userid == null || userid == 0) {
             return;
         }
-        AppUserRelationTemp relationTemp =new AppUserRelationTemp();
+        AppUserRelationTemp relationTemp = new AppUserRelationTemp();
         relationTemp.setTempId(userid);
         relationTemp.setIsValid(0);
         relationTemp.setType(1);
         relationTemp.setIsDel(0);
-        relationTemp=relationTempBiz.selectOne(relationTemp);
-        if(relationTemp==null){
-           return;
+        relationTemp = relationTempBiz.selectOne(relationTemp);
+        if (relationTemp == null) {
+            return;
         }
-        Integer parentId=relationTemp.getUserId();
-        bindRelation(platform_userid,parentId,2);
+        Integer parentId = relationTemp.getUserId();
+        bindRelation(platform_userid, parentId, 2);
 
     }
 
     /**
      * 获取用户的上线关系
+     *
      * @param userId
      * @return
      */
-    @Cache(key="user:relation{1}")
-    public  AppUserRelation getRelationByUserId(Integer userId){
-        AppUserRelation relation=new AppUserRelation();
+    @Cache(key = "user:relation{1}")
+    public AppUserRelation getRelationByUserId(Integer userId) {
+        AppUserRelation relation = new AppUserRelation();
         relation.setUserId(userId);
-        return  selectOne(relation);
+        return selectOne(relation);
     }
 
     //获取有效的上线
-    public  AppUserRelation getRelationByIdUserIdAndTime(Integer userId){
-        AppUserRelation userRelation= getMyBiz().getRelationByUserId(userId);
-        if (userRelation==null){
-            return   null;
+    public AppUserRelation getRelationByIdUserIdAndTime(Integer userId) {
+        AppUserRelation userRelation = getMyBiz().getRelationByUserId(userId);
+        if (userRelation == null) {
+            return null;
         }
-        log.info("---userId==="+userId+"-----isForever==="+userRelation.getIsForever());
-        if (validTime==null||validTime==0){
-            return  userRelation;
+        log.info("---userId===" + userId + "-----isForever===" + userRelation.getIsForever());
+        if (validTime == null || validTime == 0) {
+            return userRelation;
         }
-        Long time=System.currentTimeMillis()-validTime;
-        if (userRelation.getIsForever()==1||userRelation.getBindTime()>time){
-            return  userRelation;
+        Long time = System.currentTimeMillis() - validTime;
+        if (userRelation.getIsForever() == 1 || userRelation.getBindTime() > time) {
+            return userRelation;
         }
-        log.info("---userId==="+userId+"-----time==="+time+"----userRelation.getBindTime()==="+userRelation.getBindTime());
-        return  null;
+        log.info("---userId===" + userId + "-----time===" + time + "----userRelation.getBindTime()===" + userRelation.getBindTime());
+        return null;
     }
 
     //获取用户的下线总数
-    public  int getCountByParentId(Integer parentId,Long time){
-         if (validTime<=0){
-             time= validTime;
-         }
-        return  mapper.countByParentId(parentId,time);
+    public int getCountByParentId(Integer parentId, Long time) {
+        if (validTime <= 0) {
+            time = validTime;
+        }
+        return mapper.countByParentId(parentId, time);
     }
 
-     @CacheClear(key="user:relation{1.userId}")
-    public  int  updRelation(AppUserRelation appUserRelation){
-       return super.updateSelectiveByIdRe(appUserRelation);
+    @CacheClear(key = "user:relation{1.userId}")
+    public int updRelation(AppUserRelation appUserRelation) {
+        return super.updateSelectiveByIdRe(appUserRelation);
     }
 
     private AppUserRelationBiz getMyBiz() {
@@ -265,7 +273,7 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
     }
 
     public List<AppUserRelation> findMemberPageByLeaderId(Integer leaderId) {
-       return mapper.selectByLeaderId(leaderId);
+        return mapper.selectByLeaderId(leaderId);
     }
 
     public InviteMemberVo findInviteMemberByActivitState(Integer leaderId, Integer state, Integer page, Integer limit) {
@@ -273,16 +281,16 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
         InviteMemberVo inviteMemberVo = new InviteMemberVo();
         inviteMemberVo.setPage(page);
         inviteMemberVo.setLimit(limit);
-        inviteMemberVo.setFailureTime(failureTime*24*60*60);
+        inviteMemberVo.setFailureTime(failureTime * 24 * 60 * 60);
         Example example = new Example(AppUserRelation.class);
         Example.Criteria criteria = example.createCriteria();
-        if (state!=null) {
+        if (state != null) {
             criteria.andEqualTo("isForever", state);
         }
-        criteria.andEqualTo("parentId",leaderId);
+        criteria.andEqualTo("parentId", leaderId);
         PageDataVO<AppUserRelation> pageDataVO = PageDataVO.pageInfo(page, limit, () -> mapper.selectByExample(example));
         List<AppUserRelation> appUserRelations = pageDataVO.getData();
-        if (CollectionUtils.isEmpty(appUserRelations)){
+        if (CollectionUtils.isEmpty(appUserRelations)) {
             inviteMemberVo.setInviteMembers(Collections.EMPTY_LIST);
             return inviteMemberVo;
         }
@@ -294,15 +302,17 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
         List<InviteMemberBO> inviteMemberBOS = new ArrayList<>();
         InviteMemberBO inviteMemberBO;
         for (AppUserRelation appUserRelation : appUserRelations) {
-            if (userIdAndUserLoginMap==null || userIdAndUserDetailMap==null){
+            if (userIdAndUserLoginMap == null || userIdAndUserDetailMap == null) {
                 continue;
             }
-           inviteMemberBO = new InviteMemberBO();
-           inviteMemberBO.setBindTime(appUserRelation.getBindTime());
-           inviteMemberBO.setJoinTime(appUserRelation.getBindTime());
-           inviteMemberBO.setUsername(userIdAndUserLoginMap==null?"":userIdAndUserLoginMap.get(appUserRelation.getUserId())==null?"":userIdAndUserLoginMap.get(appUserRelation.getUserId()).getUsername());
-           inviteMemberBO.setHeadUrl(userIdAndUserDetailMap==null?"":userIdAndUserDetailMap.get(appUserRelation.getUserId())==null?"":userIdAndUserDetailMap.get(appUserRelation.getUserId()).getHeadimgurl());
-           inviteMemberBOS.add(inviteMemberBO);
+            inviteMemberBO = new InviteMemberBO();
+            inviteMemberBO.setUserId(appUserRelation.getUserId());
+            inviteMemberBO.setParentId(appUserRelation.getParentId());
+            inviteMemberBO.setBindTime(appUserRelation.getBindTime());
+            inviteMemberBO.setJoinTime(appUserRelation.getBindTime());
+            inviteMemberBO.setUsername(userIdAndUserLoginMap == null ? "" : userIdAndUserLoginMap.get(appUserRelation.getUserId()) == null ? "" : userIdAndUserLoginMap.get(appUserRelation.getUserId()).getUsername());
+            inviteMemberBO.setHeadUrl(userIdAndUserDetailMap == null ? "" : userIdAndUserDetailMap.get(appUserRelation.getUserId()) == null ? "" : userIdAndUserDetailMap.get(appUserRelation.getUserId()).getHeadimgurl());
+            inviteMemberBOS.add(inviteMemberBO);
         }
         inviteMemberVo.setTotalCount(pageDataVO.getTotalCount().intValue());
         inviteMemberVo.setTotalPage(pageDataVO.getTotalPage());
@@ -311,71 +321,72 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
     }
 
     public Integer findLeaderIdByMemberId(Integer userId) {
-         Example example = new Example(AppUserRelation.class);
-         Example.Criteria criteria = example.createCriteria();
-         criteria.andEqualTo("userId",userId);
-         List<AppUserRelation> appUserRelations = mapper.selectByExample(example);
-        if (CollectionUtils.isEmpty(appUserRelations)){
+        Example example = new Example(AppUserRelation.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("userId", userId);
+        List<AppUserRelation> appUserRelations = mapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(appUserRelations)) {
             return 0;
         }
         return appUserRelations.get(0).getParentId();
     }
 
     public Map<Integer, Integer> findMemberSateAndCountMapByLeaderId(Integer userId) {
-         Map<Integer,Integer> memberSateAndCountMap = new HashMap<>();
-        AppUserRelation appUserRelation = new AppUserRelation();
-        appUserRelation.setParentId(userId);
-        appUserRelation.setIsForever(0);
-        int totalCount = mapper.selectCount(appUserRelation);
-        appUserRelation.setIsForever(1);
-        int activityCount = mapper.selectCount(appUserRelation);
-        memberSateAndCountMap.put(0,totalCount);
-        memberSateAndCountMap.put(1,activityCount);
+        Map<Integer, Integer> memberSateAndCountMap = new HashMap<>();
+        List<AppUserRelation> appUserRelationList =  mapper.selectCountByLeaderId(userId);
+        if (CollectionUtils.isEmpty(appUserRelationList)){
+            memberSateAndCountMap.put(0, 0);
+            memberSateAndCountMap.put(1, 0);
+        }
+        Map<Boolean, Long> resultMap = appUserRelationList.stream().collect(Collectors.partitioningBy(x -> x.getIsForever() == 0, Collectors.counting()));
+        memberSateAndCountMap.put(0, resultMap.get(Boolean.TRUE)==null?0:resultMap.get(Boolean.TRUE).intValue());
+        memberSateAndCountMap.put(1, resultMap.get(Boolean.FALSE)==null?0:resultMap.get(Boolean.FALSE).intValue());
         return memberSateAndCountMap;
     }
 
     public void deleteByMemberIds(Collection<Integer> userIds) {
         Example example = new Example(AppUserRelation.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andIn("parentId",userIds);
-        List<AppUserRelation> list=mapper.selectByExample(example);
-        for (AppUserRelation appUserRelation:list){
+        criteria.andIn("parentId", userIds);
+        List<AppUserRelation> list = mapper.selectByExample(example);
+        for (AppUserRelation appUserRelation : list) {
             getMyBiz().delRelation(appUserRelation.getUserId());
         }
         mapper.deleteByExample(example);
         Example example2 = new Example(AppUserRelation.class);
         Example.Criteria criteria1 = example2.createCriteria();
-        criteria1.andIn("userId",userIds);
+        criteria1.andIn("userId", userIds);
         mapper.deleteByExample(example2);
-        for (Integer userId:userIds){
+        for (Integer userId : userIds) {
             getMyBiz().delRelation(userId);
         }
     }
-    @CacheClear(key="user:relation{1}")
-    public  void delRelation(Integer userId){
+
+    @CacheClear(key = "user:relation{1}")
+    public void delRelation(Integer userId) {
 
     }
 
 
     public List<AppUserRelation> findLeaderByUserIds(List<Integer> userIds) {
-          List<AppUserRelation> appUserRelationList = mapper.selectByUserIds(userIds);
-        return appUserRelationList==null?Collections.EMPTY_LIST:appUserRelationList;
+        List<AppUserRelation> appUserRelationList = mapper.selectByUserIds(userIds);
+        return appUserRelationList == null ? Collections.EMPTY_LIST : appUserRelationList;
     }
 
     public void initParentId(AppUserDTO userDTO, Integer userid) {
         AppUserRelation relation = getRelationByIdUserIdAndTime(userid);
-        Integer parentId=0;
-        if (relation!=null){
-            parentId=relation.getParentId();
+        Integer parentId = 0;
+        if (relation != null) {
+            parentId = relation.getParentId();
         }
         userDTO.setParentId(parentId);
-        if (parentId!=null&&parentId>0){
-           AppUserPositionTemp positionTemp= positionTempBiz.getOne(parentId);
-           if (positionTemp!=null){
-               userDTO.setParentPositionId(positionTemp.getPositionId());
-               userDTO.setParentPositionTempId(positionTemp.getId());
-               userDTO.setParentCompanyId(positionTemp.getCompanyId());
-           }
+        if (parentId != null && parentId > 0) {
+            AppUserPositionTemp positionTemp = positionTempBiz.getOne(parentId);
+            if (positionTemp != null) {
+                userDTO.setParentPositionId(positionTemp.getPositionId());
+                userDTO.setParentPositionTempId(positionTemp.getId());
+                userDTO.setParentCompanyId(positionTemp.getCompanyId());
+            }
         }
 
     }

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

@@ -372,4 +372,10 @@ public class AppUserController extends CommonBaseController{
     public List<UserStaffBo> findAllStaffs(){
        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/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(
@@ -149,29 +150,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/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/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;
+
+     @NotNull(message = "奖品库存不能为null")
+     @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/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-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/ActivityAttendanceRecordBiz.java

+package com.xxfc.platform.activity.biz;
+
+import cn.hutool.core.date.DateUtil;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+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.xxfc.platform.activity.bo.ActivityAttendanceRecordBo;
+import com.xxfc.platform.activity.constant.PrizeTypeEnum;
+import com.xxfc.platform.activity.dto.ActivityAttendanceRecordDTO;
+import com.xxfc.platform.activity.dto.ActivityAttendanceRecordFindDTO;
+import com.xxfc.platform.activity.entity.ActivityAttendanceRecord;
+import com.xxfc.platform.activity.mapper.ActivityAttendanceRecordMapper;
+import com.xxfc.platform.activity.vo.ActivityAttendanceRecordTotalVo;
+import com.xxfc.platform.activity.vo.ActivityAttendanceRecordVo;
+import lombok.RequiredArgsConstructor;
+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.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.assertj.core.util.Lists;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+/**
+ * 参与活动数据
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-12-04 14:54:06
+ */
+@Transactional(rollbackFor = Exception.class)
+@Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class ActivityAttendanceRecordBiz extends BaseBiz<ActivityAttendanceRecordMapper,ActivityAttendanceRecord> {
+    @Resource(name = "redisTemplate")
+    private ValueOperations<String, Object> valueOperations;
+
+    private final RedisTemplate<String,Object> redisTemplate;
+
+    @Value("${lottery.expire.days:60}")
+    private int expirDays;
+
+    public void attendActivity(Integer activityId, String activityName,AppUserDTO appUserDTO) {
+        ActivityAttendanceRecord record = new ActivityAttendanceRecord();
+        record.setActivityId(activityId);
+        record.setUserId(appUserDTO.getUserid());
+        int num = mapper.selectCount(record);
+        if (num==0) {
+            ActivityAttendanceRecord activityAttendanceRecord = new ActivityAttendanceRecord();
+            activityAttendanceRecord.setActivityId(activityId);
+            activityAttendanceRecord.setActivityName(activityName);
+            activityAttendanceRecord.setUserId(appUserDTO.getUserid());
+            activityAttendanceRecord.setPhone(appUserDTO.getUsername());
+            activityAttendanceRecord.setUserName(StringUtils.isEmpty(appUserDTO.getRealname()) ? appUserDTO.getNickname() : appUserDTO.getRealname());
+            activityAttendanceRecord.setPositionId(appUserDTO.getPositionId());
+            activityAttendanceRecord.setPositionName(appUserDTO.getPositionName());
+            activityAttendanceRecord.setCrtTime(new Date());
+            mapper.insertSelective(activityAttendanceRecord);
+            String onlineKey = String.format("%d:%d:%d", appUserDTO.getUserid(), activityId, PrizeTypeEnum.ONLINE.getCode());
+            String localeKey = String.format("%d:%d:%d", appUserDTO.getUserid(), activityId, PrizeTypeEnum.LOCALE.getCode());
+            redisTemplate.delete(Arrays.asList(onlineKey,localeKey));
+            valueOperations.set(onlineKey, 1L,expirDays, TimeUnit.DAYS);
+            valueOperations.set(localeKey, 1L,expirDays, TimeUnit.DAYS);
+        }
+    }
+
+
+     public ActivityAttendanceRecordBo listActivityAttendanceRecord(ActivityAttendanceRecordFindDTO activityAttendanceRecordFindDTO){
+         ActivityAttendanceRecordBo activityAttendanceRecordBo = new ActivityAttendanceRecordBo();
+         PageDataVO<ActivityAttendanceRecordDTO> dataVO = PageDataVO.pageInfo(activityAttendanceRecordFindDTO.getPage(), activityAttendanceRecordFindDTO.getLimit(),
+                 () -> mapper.selectActivityAttendanceRecord(activityAttendanceRecordFindDTO));
+         List<ActivityAttendanceRecordDTO> data = dataVO.getData();
+         if (CollectionUtils.isEmpty(data)){
+             return activityAttendanceRecordBo;
+         }
+         ActivityAttendanceRecordTotalVo activityAttendanceRecordTotal = getActivityAttendanceRecordTotal(activityAttendanceRecordFindDTO);
+         List<ActivityAttendanceRecordVo> activityAttendanceRecordVos = new ArrayList<>(data.size());
+         ActivityAttendanceRecordVo activityAttendanceRecordVo = null;
+         for (ActivityAttendanceRecordDTO attendanceRecordDTO : data) {
+             activityAttendanceRecordVo = new ActivityAttendanceRecordVo();
+             BeanUtils.copyProperties(attendanceRecordDTO,activityAttendanceRecordVo);
+             activityAttendanceRecordVos.add(activityAttendanceRecordVo);
+         }
+         activityAttendanceRecordBo.setPageNum(dataVO.getPageNum());
+         activityAttendanceRecordBo.setPageSize(dataVO.getPageSize());
+         activityAttendanceRecordBo.setTotalPage(dataVO.getTotalPage());
+         activityAttendanceRecordBo.setTotalCount(dataVO.getTotalCount());
+         activityAttendanceRecordBo.setActivityAttendanceRecordVos(activityAttendanceRecordVos);
+         activityAttendanceRecordBo.setActivityAttendanceRecordTotalVo(activityAttendanceRecordTotal);
+         return activityAttendanceRecordBo;
+     }
+
+     private ActivityAttendanceRecordTotalVo getActivityAttendanceRecordTotal(ActivityAttendanceRecordFindDTO activityAttendanceRecordFindDTO){
+         ActivityAttendanceRecordTotalVo activityAttendanceRecordTotalVo = new ActivityAttendanceRecordTotalVo();
+         List<ActivityAttendanceRecordDTO> activityAttendanceRecordDTOS = mapper.selectActivityAttendanceRecord(activityAttendanceRecordFindDTO);
+         if (CollectionUtils.isEmpty(activityAttendanceRecordDTOS)){
+             return activityAttendanceRecordTotalVo;
+         }
+         activityAttendanceRecordTotalVo.setAttendNum(activityAttendanceRecordDTOS.size());
+         Supplier<Stream<ActivityAttendanceRecordDTO>>  activityAttendanceRecordDTOStream = ()->activityAttendanceRecordDTOS.stream().filter(x->x.getStatus() == 1);
+         activityAttendanceRecordTotalVo.setFinishNum(Long.valueOf(activityAttendanceRecordDTOStream.get().count()).intValue());
+         activityAttendanceRecordTotalVo.setAmount(activityAttendanceRecordDTOStream.get().map(ActivityAttendanceRecordDTO::getAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
+         return activityAttendanceRecordTotalVo;
+     }
+
+    public Boolean hasNumberOfLuckyDrawByType(Integer activityId, Integer prizeType, Integer userid) {
+        Object lotteryNum = valueOperations.get(String.format("%d:%d:%d", userid, activityId, prizeType));
+        if (lotteryNum!=null){
+            return  Integer.valueOf(lotteryNum.toString()) >0;
+        }
+        ActivityAttendanceRecord activityAttendanceRecord = new ActivityAttendanceRecord();
+        activityAttendanceRecord.setActivityId(activityId);
+        activityAttendanceRecord.setUserId(userid);
+        activityAttendanceRecord = mapper.selectOne(activityAttendanceRecord);
+        if (Objects.isNull(activityAttendanceRecord)){
+            return false;
+        }
+        if (prizeType == PrizeTypeEnum.ONLINE.getCode()){
+             valueOperations.set(String.format("%d:%d:%d", userid, activityId, prizeType),activityAttendanceRecord.getOnlineLotteryNum(),expirDays, TimeUnit.DAYS);
+            return activityAttendanceRecord.getOnlineLotteryNum()>0;
+        }
+        if (prizeType ==PrizeTypeEnum.LOCALE.getCode()){
+            valueOperations.set(String.format("%d:%d:%d", userid, activityId, prizeType),activityAttendanceRecord.getLocaleLotteryNum(),expirDays, TimeUnit.DAYS);
+            return activityAttendanceRecord.getLocaleLotteryNum()>0;
+        }
+        return false;
+    }
+
+    public void exportActivityAttendanceRecordData(ActivityAttendanceRecordFindDTO activityAttendanceRecordFindDTO, ServletOutputStream outputStream) throws IOException {
+        ExcelUtils excelUtils = new ExcelUtils("中奖列表");
+        XSSFWorkbook hssfWorkbook = excelUtils.getHssfWorkbook();
+        XSSFSheet sheet = excelUtils.getSheet();
+        List<ActivityAttendanceRecordDTO> activityAttendanceRecordDTOS = mapper.selectActivityAttendanceRecord(activityAttendanceRecordFindDTO);
+        ActivityAttendanceRecordTotalVo activityAttendanceRecordTotalVo = getActivityAttendanceRecordTotal(activityAttendanceRecordFindDTO);
+
+        String[] header1 = {"参与人数","完成人数","已发放现金总额(元)"};
+        Row headerRow1 = sheet.createRow(0);
+        CellStyle headerCellStyle = excelUtils.createHeaderCellStyle();
+        excelUtils.createHeader(headerRow1,0,header1,headerCellStyle);
+
+        String[] headerValue = {activityAttendanceRecordTotalVo.getAttendNum().toString(),
+                                activityAttendanceRecordTotalVo.getFinishNum().toString(),
+                                activityAttendanceRecordTotalVo.getAmount().toString()};
+        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, 7);
+        sheet.addMergedRegion(cellRangeAddress);
+
+        String[] header2 = {"用户名","电话","身份","状态","当前金额(元)","邀请人数","抽奖礼品","参与时间"};
+        Row header2Row = sheet.createRow(3);
+        excelUtils.createHeader(header2Row,0,header2,headerCellStyle);
+
+        List<String[]> activityAttendanceRecordList = getActivityAttendanceRecordDataList(activityAttendanceRecordDTOS);
+        excelUtils.createCellData(sheet,4,generalCellStyle,activityAttendanceRecordList);
+
+        hssfWorkbook.write(outputStream);
+        hssfWorkbook.close();
+    }
+
+
+    public List<String[]> getActivityAttendanceRecordDataList(List<ActivityAttendanceRecordDTO> activityAttendanceRecordDTOS){
+        List<String[]> activityAttendanceRecordDataList = new ArrayList<>(activityAttendanceRecordDTOS.size());
+        for (ActivityAttendanceRecordDTO activityAttendanceRecordDTO : activityAttendanceRecordDTOS) {
+            String[] activityAttendanceRecordData = getActivityAttendanceRecordData(activityAttendanceRecordDTO);
+            activityAttendanceRecordDataList.add(activityAttendanceRecordData);
+        }
+        return activityAttendanceRecordDataList;
+    }
+
+    public String[] getActivityAttendanceRecordData(ActivityAttendanceRecordDTO activityAttendanceRecordDTO){
+      String state= activityAttendanceRecordDTO.getStatus() == 1?"已完成":activityAttendanceRecordDTO.getStatus()==0?"进行中":"失败";
+      String timeStr = DateUtil.format(new Date(activityAttendanceRecordDTO.getAttendTime()),"yyyy-MM-dd HH:mm:ss");
+      return new String[]{activityAttendanceRecordDTO.getUserName(),
+                          activityAttendanceRecordDTO.getPhone(),
+      activityAttendanceRecordDTO.getPositionName(),
+      state,
+      activityAttendanceRecordDTO.getAmount()==null?BigDecimal.ZERO.toString():activityAttendanceRecordDTO.getAmount().toString(),
+      activityAttendanceRecordDTO.getInviteNum()==null?"0":activityAttendanceRecordDTO.getInviteNum().toString(),
+      activityAttendanceRecordDTO.getPrizes(),
+      timeStr};
+    }
+
+    @Async
+    public void updateLotteryNumByActivityIdAndUserIdAndPrizeType(Integer activityId,Integer userId,Integer prizeType){
+         mapper.updateLotteryNumByActivityIdAndUserIdAndPrizeType(activityId,userId,prizeType);
+    }
+}
\ No newline at end of file

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/ActivityPrizeBiz.java

+package com.xxfc.platform.activity.biz;
+
+import com.ace.cache.annotation.Cache;
+import com.ace.cache.annotation.CacheClear;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.util.ReferralCodeUtil;
+import com.xxfc.platform.activity.config.RedissonLock;
+import com.xxfc.platform.activity.constant.PrizeGoodsTypeEnum;
+import com.xxfc.platform.activity.constant.PrizeTypeEnum;
+import com.xxfc.platform.activity.dto.UserCouponSendDTO;
+import com.xxfc.platform.activity.entity.ActivityPrize;
+import com.xxfc.platform.activity.entity.ActivityWinningRecord;
+import com.xxfc.platform.activity.mapper.ActivityPrizeMapper;
+import com.xxfc.platform.activity.util.LotteryUtils;
+import com.xxfc.platform.activity.vo.ActivityPrizeVo;
+import com.xxfc.platform.activity.vo.LotteryVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.redisson.api.RLock;
+import org.springframework.aop.framework.AopContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * 奖品设置
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-12-03 16:46:02
+ */
+@Slf4j
+@Transactional(rollbackFor = Exception.class)
+@Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class ActivityPrizeBiz extends BaseBiz<ActivityPrizeMapper, ActivityPrize> {
+
+    private final ActivityWinningRecordBiz activityWinningRecordBiz;
+    private final ActivityAttendanceRecordBiz activityAttendanceRecordBiz;
+    private final UserCouponBiz userCouponBiz;
+
+    private final RedisTemplate<String, Object> redisTemplate;
+    @Resource(name = "redisTemplate")
+    private ValueOperations<String, Object> valueOperations;
+    private final RedissonLock redissonLock;
+    @Value("${lottery.expire.days:60}")
+    private int expirDays;
+    private static final String LOTTERY_PRE_KEY = "lottery:";
+
+    /**
+     * 查询奖品
+     *
+     * @return
+     */
+    public ActivityPrizeVo selectActivitys() {
+        ActivityPrizeVo activityPrizeVo = new ActivityPrizeVo();
+        List<ActivityPrize> activityPrizes = mapper.selectAll();
+        if (CollectionUtils.isEmpty(activityPrizes)) {
+            return activityPrizeVo;
+        }
+        Map<Integer, List<ActivityPrize>> activityPrizeMap = activityPrizes.stream().collect(Collectors.groupingBy(ActivityPrize::getType, Collectors.toList()));
+        activityPrizeVo.setOnlinePrize(activityPrizeMap.get(PrizeTypeEnum.ONLINE.getCode()));
+        activityPrizeVo.setLocalePrize(activityPrizeMap.get(PrizeTypeEnum.LOCALE.getCode()));
+        return activityPrizeVo;
+    }
+
+    /**
+     * 保存奖品设置
+     *
+     * @param activityPrizes
+     */
+    @CacheClear(pre = LOTTERY_PRE_KEY)
+    public void saveActivityPrizes(List<ActivityPrize> activityPrizes) {
+        if (CollectionUtils.isEmpty(activityPrizes)) {
+            throw new BaseException("奖品不能为空");
+        }
+        Map<Boolean, List<ActivityPrize>> activityPrizeMap = activityPrizes.stream().collect(Collectors.partitioningBy(x -> Objects.nonNull(x.getId()), Collectors.toList()));
+        //保存
+        List<ActivityPrize> activityPrizesOfSave = activityPrizeMap.get(Boolean.FALSE);
+        if (CollectionUtils.isNotEmpty(activityPrizesOfSave)) {
+            activityPrizesOfSave.stream().peek(x -> x.setCrtTime(new Date())).count();
+            mapper.insertList(activityPrizesOfSave);
+        }
+        //更新
+        List<ActivityPrize> activityPrizesOfUpdate = activityPrizeMap.get(Boolean.TRUE);
+        if (CollectionUtils.isNotEmpty(activityPrizesOfUpdate)) {
+            for (ActivityPrize activityPrize : activityPrizesOfUpdate) {
+                activityPrize.setUpdTime(new Date());
+                mapper.updateByPrimaryKeySelective(activityPrize);
+            }
+        }
+    }
+
+    /**
+     * 根据奖品类型查询
+     *
+     * @param prizeType
+     * @return
+     */
+    @Cache(key = LOTTERY_PRE_KEY + "{1}")
+    public List<ActivityPrize> findActivityPrizeByType(Integer prizeType) {
+        Example example = new Example(ActivityPrize.class);
+        example.orderBy("serialNumber").asc();
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("type", prizeType);
+        List<ActivityPrize> activityPrizes = mapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(activityPrizes)) {
+            return Collections.EMPTY_LIST;
+        }
+
+        for (ActivityPrize activityPrize : activityPrizes) {
+            if (activityPrize.getTotalStock() != null) {
+                String prizeStockKey = String.format("%s%d:%d", LOTTERY_PRE_KEY, prizeType, activityPrize.getSerialNumber());
+                redisTemplate.delete(prizeStockKey);
+                valueOperations.set(prizeStockKey, Integer.valueOf(activityPrize.getTotalStock().toString()), expirDays, TimeUnit.DAYS);
+            }
+        }
+        return activityPrizes;
+    }
+
+
+    /**
+     * 抽奖
+     *
+     * @param activityId
+     * @param prizeType
+     * @param appUserDTO
+     * @return
+     */
+    public LotteryVo activityLottery(Integer activityId, Integer prizeType, String lotteryDate, AppUserDTO appUserDTO) {
+        LotteryVo lotteryVo = new LotteryVo();
+        List<ActivityPrize> activityPrizes = ((ActivityPrizeBiz) AopContext.currentProxy()).findActivityPrizeByType(prizeType);
+        ActivityPrize notActivityPrize = activityPrizes.stream().filter(x -> x.getPrizeGoodsType() == 0).findFirst().orElseGet(() -> {
+            ActivityPrize activityPrize = new ActivityPrize();
+            activityPrize.setName("谢谢参与");
+            activityPrize.setPrizeGoodsType(PrizeGoodsTypeEnum.NO_PRIZE.getCode());
+            activityPrize.setType(prizeType);
+            activityPrize.setSerialNumber(8);
+            return activityPrize;
+        });
+        String lotteryNumKey = String.format("%d:%d:%d", appUserDTO.getUserid(), activityId, prizeType);
+        Object lotteryNum = valueOperations.get(lotteryNumKey);
+        boolean hasLotteryNum = lotteryNum == null ? activityAttendanceRecordBiz.hasNumberOfLuckyDrawByType(activityId, prizeType, appUserDTO.getUserid()) : ((Integer) lotteryNum) > 0;
+        if (hasLotteryNum) {
+            //抽奖
+            int index = LotteryUtils.getrandomIndex(activityPrizes);
+            //获取对应的奖品
+            ActivityPrize activityPrize = activityPrizes.get(index);
+            //判断是否设置最大奖品数(谢谢参与排除)
+            if (activityPrize.getDayMaxUse() != null && activityPrize.getPrizeGoodsType() != PrizeGoodsTypeEnum.NO_PRIZE.getCode()) {
+                String key = String.format("%s:%s%d:%s", lotteryDate, LOTTERY_PRE_KEY, activityId, activityPrize.getSerialNumber());
+                Long prizeDayUseStock = valueOperations.increment(key);
+                //第一次时设置每天奖品份数的过期时间为1天
+                if (prizeDayUseStock.intValue() == 1) {
+                    redisTemplate.expire(key, 1, TimeUnit.DAYS);
+                }
+                //达到日上限
+                if (prizeDayUseStock.intValue() > activityPrize.getDayMaxUse()) {
+                    activityPrize = notActivityPrize;
+                }
+            }
+            //根据商品key获取库存
+            String prizeStockKey = String.format("%s%d:%d", LOTTERY_PRE_KEY, prizeType, activityPrize.getSerialNumber());
+            Object prizeStock = valueOperations.get(prizeStockKey);
+            if (activityPrize.getPrizeGoodsType() != PrizeGoodsTypeEnum.NO_PRIZE.getCode() && activityPrize.getTotalStock() != null) {
+                //库存为0
+                if (prizeStock == null || (Integer) prizeStock == 0) {
+                    activityPrize = notActivityPrize;
+                }
+            }
+
+            ActivityWinningRecord activityWinningRecord = new ActivityWinningRecord();
+            activityWinningRecord.setActivityId(activityId);
+            activityWinningRecord.setPrizeType(prizeType);
+            activityWinningRecord.setUserId(appUserDTO.getUserid());
+            activityWinningRecord.setHasWinning(0);
+            boolean hasStock = activityPrize.getPrizeGoodsType() != PrizeGoodsTypeEnum.NO_PRIZE.getCode() && activityPrize.getTotalStock() != 0 && prizeStock != null && (Integer) prizeStock != 0;
+            if (hasStock) {
+                String key = String.format("%s%d:%d:%d", LOTTERY_PRE_KEY, activityId, prizeType, activityPrize.getSerialNumber());
+                RLock rLock = redissonLock.getRLock(key);
+                try {
+                    boolean isSuccess = rLock.tryLock(1, 2, TimeUnit.SECONDS);
+                    if (isSuccess) {
+                        prizeStock = valueOperations.get(prizeStockKey);
+                        log.info("tryLock success, key = [{}]", key);
+                        try {
+                            if (prizeStock != null && (Integer) prizeStock > 0) {
+                                //更新库存
+                                ((ActivityPrizeBiz) AopContext.currentProxy()).updatePrizeStock(prizeType, activityPrize.getSerialNumber());
+                                //更新缓存库存
+                                valueOperations.decrement(prizeStockKey);
+                                //设置为已中奖
+                                activityWinningRecord.setHasWinning(1);
+                                activityWinningRecord.setIconPath(activityPrize.getIconPath());
+                                activityWinningRecord.setLotteryTime(new Date());
+                            } else {
+                                activityPrize = notActivityPrize;
+                            }
+                        } catch (Exception ex) {
+                            log.error("抽奖失败:【{}】", ex);
+                            rLock.unlock();
+                        } finally {
+                            rLock.unlock();
+                            log.info("releaseLock success, key = [{}]", key);
+                        }
+                    } else {
+                        // 获取锁失败
+                        log.info("tryLock fail, key = [{}]", key);
+                    }
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                if (PrizeTypeEnum.LOCALE.getCode() == prizeType) {
+                    //兑奖码生成
+                    String expireDateCodeKey = String.format("%s:%s%d",lotteryDate.substring(0,4),LOTTERY_PRE_KEY, activityId);
+                    Long expireDateCodeCounter = valueOperations.increment(expireDateCodeKey);
+                    if (expireDateCodeCounter == 1) {
+                        redisTemplate.expire(expireDateCodeKey, expirDays, TimeUnit.DAYS);
+                    }
+                    String expiryDateCode = ReferralCodeUtil.encode(expireDateCodeCounter.intValue());
+                    activityWinningRecord.setExpiryDateCode(expiryDateCode);
+                    lotteryVo.setExpiryDateCode(expiryDateCode);
+                }
+                //发放优惠券
+                if (activityPrize.getPrizeGoodsType() == PrizeGoodsTypeEnum.COUPON.getCode()) {
+                    UserCouponSendDTO userCouponSendDTO = new UserCouponSendDTO();
+                    userCouponSendDTO.setCouponId(activityPrize.getGoodsId());
+                    userCouponSendDTO.setCouponNum(1);
+                    userCouponSendDTO.setPhone(appUserDTO.getUsername());
+                    userCouponBiz.sendCoupon(userCouponSendDTO);
+                    activityWinningRecord.setGoodsId(activityPrize.getGoodsId());
+                }
+            }
+            activityWinningRecord.setPrizeName(activityPrize.getName());
+            activityWinningRecordBiz.saveRecord(activityWinningRecord);
+            lotteryVo.setSerialNumber(activityPrize.getSerialNumber());
+            //更改对应抽奖类型的抽奖次数
+            activityAttendanceRecordBiz.updateLotteryNumByActivityIdAndUserIdAndPrizeType(activityId, appUserDTO.getUserid(), prizeType);
+            valueOperations.decrement(lotteryNumKey);
+        } else {
+            lotteryVo.setMessage("抽奖次数已用完！！！");
+        }
+        return lotteryVo;
+    }
+
+    /**
+     * 更新库存
+     *
+     * @param prizeType
+     * @param serialNumber
+     */
+    @Async
+    public void updatePrizeStock(Integer prizeType, Integer serialNumber) {
+        mapper.updatePrizeStock(prizeType, serialNumber);
+    }
+}
\ No newline at end of file

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/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/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/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/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/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/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),
+        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}
+        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/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-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderRentVehicleDetail.java

@@ -357,6 +357,22 @@ public class OrderRentVehicleDetail implements Serializable {
 	@ApiModelProperty(value = "延期结束时间")
 	private Long delayAddEndTime;
 
+	public Long obtainRealEndTime() {
+		if(null != getDelayAddEndTime()) {
+			return getDelayAddEndTime();
+		}else {
+			return getEndTime();
+		}
+	}
+
+//	public Integer obtainRealDayNum() {
+//		if(null != getDelayAddDays()) {
+//			return (getDelayAddDays() + getDayNum());
+//		}else {
+//			return getDayNum();
+//		}
+//	}
+
 	public Integer obtainRealDayNum() {
 		return this.dayNum + this.delayAddDays;
 	}

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

@@ -341,8 +341,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		DedDetailDTO dedDetailDTO = new DedDetailDTO();
 		//提前还车,结束时间大于当前时间
 		Long nowTime = System.currentTimeMillis();
-		Long endTime = (null == orderPageVO.getOrderRentVehicleDetail().getDelayAddEndTime()) ?
-				orderPageVO.getOrderRentVehicleDetail().getEndTime() : orderPageVO.getOrderRentVehicleDetail().getDelayAddEndTime();
+		Long endTime = orderPageVO.getOrderRentVehicleDetail().obtainRealEndTime();
 		Long startTime = orderPageVO.getOrderRentVehicleDetail().getStartTime();
 
 		//设置使用天数

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

@@ -517,13 +517,13 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             csv.setOverAmountList(inProgressVO.getOverAmountList());
             csv.setViolateAmountList(inProgressVO.getViolateAmountList());
 
-            if(csv.getUsedDayNum() == orderMQDTO.getOrderRentVehicleDetail().getDayNum()) {
+            if(csv.getUsedDayNum() == orderMQDTO.getOrderRentVehicleDetail().obtainRealDayNum()) {
                 csv.setType(CostDetailExtend.FINLISH_ONTIME);
 
-            }else if(csv.getUsedDayNum() > orderMQDTO.getOrderRentVehicleDetail().getDayNum()){
+            }else if(csv.getUsedDayNum() > orderMQDTO.getOrderRentVehicleDetail().obtainRealDayNum()){
                 csv.setType(CostDetailExtend.FINLISH_DELAY);
 
-            }else if(csv.getUsedDayNum() < orderMQDTO.getOrderRentVehicleDetail().getDayNum()){
+            }else if(csv.getUsedDayNum() < orderMQDTO.getOrderRentVehicleDetail().obtainRealDayNum()){
                 csv.setType(CostDetailExtend.FINLISH_ADVANCE);
 
             }

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

@@ -237,7 +237,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
         if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
-            boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime(), orderRentVehicleDetail.getEndTime());
+            boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime(), orderRentVehicleDetail.obtainRealEndTime());
             if (!flag) {
                 return ObjectRestResponse.createFailedResult(3502, "已超过预定还车时间，不能进行交车操作！");
             }

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

@@ -393,43 +393,81 @@ public class OrderCalculateBiz {
         InProgressVO inProgressVO = new InProgressVO();
         BigDecimal topAmount = BigDecimal.ZERO;
 
-        //缓冲取消时间(一个小时)
-        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        Long autoCancelTime = Long.valueOf(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.CANCEL_TIME_BUFFER).getDetail());
-        autoCancelTime = autoCancelTime * 60L * 1000L;
-
-        //判断是否支付超过缓冲取消时间(一个小时)
-        Long orderCrtLag = System.currentTimeMillis() - orderPageVO.getPayTime();
-        Boolean overCancelBuffer = (orderCrtLag > autoCancelTime)? Boolean.TRUE: Boolean.FALSE;
-
-        switch (orderTypeEnum) {
-            case RENT_VEHICLE:
-
-                Long timeLag = orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis();
+        if(SYS_TRUE.equals(orderPageVO.getHasPay()) && null != orderPageVO.getPayTime()) {
+            //缓冲取消时间(一个小时)
+            Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+            Long autoCancelTime = Long.valueOf(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.CANCEL_TIME_BUFFER).getDetail());
+            autoCancelTime = autoCancelTime * 60L * 1000L;
+
+            //判断是否支付超过缓冲取消时间(一个小时)
+            Long orderCrtLag = System.currentTimeMillis() - orderPageVO.getPayTime();
+            Boolean overCancelBuffer = (orderCrtLag > autoCancelTime)? Boolean.TRUE: Boolean.FALSE;
+
+            switch (orderTypeEnum) {
+                case RENT_VEHICLE:
+
+                    Long timeLag = orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis();
+
+                    VehicleItemDTO vehicleItemDTO = BeanUtil.toBean(orderItemBiz.selectOne(new OrderItem(){{
+                        setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
+                        setOrderId(orderPageVO.getId());
+                    }}), VehicleItemDTO.class);
+
+                    //融入日期价格
+                    List<VehicleModelCalendarPriceDTO> vmcpds = JSONUtil.toList(JSONUtil.parseArray(vehicleItemDTO.getDetail()), VehicleModelCalendarPriceDTO.class);
+
+                    if(timeLag < 0 && overCancelBuffer) {
+                        Integer useDays = getIncludeDays(orderPageVO.getOrderRentVehicleDetail().getStartTime(), DateTime.now().getMillis());
+                        OrderAccountDetail oad = new OrderAccountDetail();
+                        inProgressVO = inProgressCalculate(orderPageVO, vehicleItemDTO, orderPageVO.getOrderRentVehicleDetail(), useDays, oad, Boolean.FALSE);
+
+                        topAmount = vehicleItemDTO.getTopAmount(useDays);
+                        totalDeductAmount = oad.realTotalDeduct();
+                        totalRefundAmount = oad.getOrderAmount().add(oad.getDepositAmount());
+                        refundDesc = inProgressVO.getViolateDesc();
+                    }else {
+
+                        String key = RENT_REFUND;
+
+                        BigDecimal deductionAmount = orderAccountBiz.calculateDeduction(vehicleItemDTO.getBuyAmount()
+                                , orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis()
+                                , DictionaryKey.APP_ORDER+ "_"+ key
+                                , refundDescBuilder);
+
+                        if(!overCancelBuffer) {
+                            deductionAmount = BigDecimal.ZERO;
+                            refundDescBuilder = new StringBuilder("");
+                        }
 
-                VehicleItemDTO vehicleItemDTO = BeanUtil.toBean(orderItemBiz.selectOne(new OrderItem(){{
-                    setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
-                    setOrderId(orderPageVO.getId());
-                }}), VehicleItemDTO.class);
+                        topAmount = vehicleItemDTO.getTopAmount(0);
+                        totalDeductAmount = (topAmount.compareTo(deductionAmount) < 0) ? topAmount: deductionAmount;
+                        totalRefundAmount = orderPageVO.getRealAmount().subtract(totalDeductAmount);
+                        refundDesc = refundDescBuilder.toString();
+                    }
 
-                //融入日期价格
-                List<VehicleModelCalendarPriceDTO> vmcpds = JSONUtil.toList(JSONUtil.parseArray(vehicleItemDTO.getDetail()), VehicleModelCalendarPriceDTO.class);
+                    break;
+                case TOUR:
+                    //判断是省内还是省外
+                    String key = TOUR_IN_REFUND;
+                    if(SYS_TRUE.equals(orderPageVO.getOrderTourDetail().getIsOutside())) {
+                        key = TOUR_REFUND;
+                    }
 
-                if(timeLag < 0 && overCancelBuffer) {
-                    Integer useDays = getIncludeDays(orderPageVO.getOrderRentVehicleDetail().getStartTime(), DateTime.now().getMillis());
-                    OrderAccountDetail oad = new OrderAccountDetail();
-                    inProgressVO = inProgressCalculate(orderPageVO, vehicleItemDTO, orderPageVO.getOrderRentVehicleDetail(), useDays, oad, Boolean.FALSE);
+                    OrderItem adultItem = orderItemBiz.selectOne(new OrderItem(){{
+                        setType(ItemTypeEnum.TOUR_ADULT.getCode());
+                        setOrderId(orderPageVO.getId());
+                    }});
 
-                    topAmount = vehicleItemDTO.getTopAmount(useDays);
-                    totalDeductAmount = oad.realTotalDeduct();
-                    totalRefundAmount = oad.getOrderAmount().add(oad.getDepositAmount());
-                    refundDesc = inProgressVO.getViolateDesc();
-                }else {
+                    OrderItem childItem = orderItemBiz.selectOne(new OrderItem(){{
+                        setType(ItemTypeEnum.TOUR_CHILD.getCode());
+                        setOrderId(orderPageVO.getId());
+                    }});
 
-                    String key = RENT_REFUND;
+                    BigDecimal adultItemAmount = (null == adultItem)? BigDecimal.ZERO: adultItem.getRealAmount();
+                    BigDecimal childItemAmount = (null == childItem)? BigDecimal.ZERO: childItem.getRealAmount();
 
-                    BigDecimal deductionAmount = orderAccountBiz.calculateDeduction(vehicleItemDTO.getBuyAmount()
-                            , orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis()
+                    BigDecimal deductionAmount = orderAccountBiz.calculateDeduction(adultItemAmount.add(childItemAmount)
+                            , orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis()
                             , DictionaryKey.APP_ORDER+ "_"+ key
                             , refundDescBuilder);
 
@@ -438,52 +476,17 @@ public class OrderCalculateBiz {
                         refundDescBuilder = new StringBuilder("");
                     }
 
-                    topAmount = vehicleItemDTO.getTopAmount(0);
-                    totalDeductAmount = (topAmount.compareTo(deductionAmount) < 0) ? topAmount: deductionAmount;
-                    totalRefundAmount = orderPageVO.getRealAmount().subtract(totalDeductAmount);
+                    topAmount = adultItemAmount.add(childItemAmount);
+                    totalDeductAmount = deductionAmount;
+                    totalRefundAmount = orderPageVO.getRealAmount().subtract(deductionAmount);
                     refundDesc = refundDescBuilder.toString();
-                }
-
-                break;
-            case TOUR:
-                //判断是省内还是省外
-                String key = TOUR_IN_REFUND;
-                if(SYS_TRUE.equals(orderPageVO.getOrderTourDetail().getIsOutside())) {
-                    key = TOUR_REFUND;
-                }
-
-                OrderItem adultItem = orderItemBiz.selectOne(new OrderItem(){{
-                    setType(ItemTypeEnum.TOUR_ADULT.getCode());
-                    setOrderId(orderPageVO.getId());
-                }});
-
-                OrderItem childItem = orderItemBiz.selectOne(new OrderItem(){{
-                    setType(ItemTypeEnum.TOUR_CHILD.getCode());
-                    setOrderId(orderPageVO.getId());
-                }});
-
-                BigDecimal adultItemAmount = (null == adultItem)? BigDecimal.ZERO: adultItem.getRealAmount();
-                BigDecimal childItemAmount = (null == childItem)? BigDecimal.ZERO: childItem.getRealAmount();
-
-                BigDecimal deductionAmount = orderAccountBiz.calculateDeduction(adultItemAmount.add(childItemAmount)
-                        , orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis()
-                        , DictionaryKey.APP_ORDER+ "_"+ key
-                        , refundDescBuilder);
-
-                if(!overCancelBuffer) {
-                    deductionAmount = BigDecimal.ZERO;
-                    refundDescBuilder = new StringBuilder("");
-                }
-
-                topAmount = adultItemAmount.add(childItemAmount);
-                totalDeductAmount = deductionAmount;
-                totalRefundAmount = orderPageVO.getRealAmount().subtract(deductionAmount);
-                refundDesc = refundDescBuilder.toString();
-                break;
-            default:
-                break;
+                    break;
+                default:
+                    break;
+            }
         }
 
+
         OrderRefundPriceVO orpv = new OrderRefundPriceVO();
         orpv.setRealAmount(orderPageVO.getRealAmount());
         orpv.setRefundAmount(totalRefundAmount);

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

@@ -128,8 +128,14 @@ public class OrderDelayBiz {
             List<VMCalendarPriceCostDTO> delayAmountList;
 
             if(delayAddDays > 0) {
+                VehicleItemDTO vehicleItemDTO = BeanUtil.toBean(orderItemBiz.selectOne(new OrderItem(){{
+                    setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
+                    setOrderId(orderPageVO.getId());
+                }}), VehicleItemDTO.class);
+                List<VMCalendarPriceCostDTO> vmcpcds = vehicleItemDTO.getVehicleDetail();
+
                 //获得延期天数费用
-                delayAmountList = orderItemBiz.getOverAmountList(DateUtil.date(orvd.getEndTime()), delayAddDays, orvd.getModelId(), orderPageVO.getUserId());
+                delayAmountList = orderItemBiz.getOverAmountList(vmcpcds.get(vmcpcds.size() - 1).getDate(), delayAddDays, orvd.getModelId(), orderPageVO.getUserId());
                 //处理免费天数和免费金额
                 delayAmountList.parallelStream().forEach( vmcpcd -> {
                     vmcpcd.setValidFreeDays(vmcpcd.getFreeDays());

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

@@ -506,7 +506,7 @@ public class OrderMsgBiz {
     private void handelSmsParam(OrderRentVehicleDetail orvd, BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int handelType) {
         if(RENT_DELIVERY == handelType) {
             smsParams.add(appUserDTO.obtainRealname());
-            smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getEndTime())));
+            smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.obtainRealEndTime())));
             smsParams.add(orvd.getEndAddr());
             smsParams.add(baseOrder.getName());
             smsParams.add(appUserDTO.getUsername());
@@ -516,8 +516,8 @@ public class OrderMsgBiz {
             smsParams.add(orvd.getStartAddr());
             smsParams.add(orvd.getEndAddr());
             smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
-            smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getEndTime())));
-            smsParams.add(orvd.getDayNum().toString());
+            smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.obtainRealEndTime())));
+            smsParams.add(orvd.obtainRealDayNum().toString());
             smsParams.add(appUserDTO.getUsername());
         }
     }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java

@@ -102,7 +102,8 @@ public class RentDepositJobHandler extends IJobHandler {
                     setType(crosstownTypeEnum);
                 }});
 
-                if(crosstown.getCrtTime().compareTo(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60L * 1000L)) < 0) {
+                //提前31分钟 31 * 60L * 1000L 退钱
+                if(crosstown.getCrtTime().compareTo(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60L * 1000L - (31 * 60L * 1000L))) < 0) {
                     orderAccountBiz.handleRentDepositMargin(baseOrder, orvd, crosstown);
                 }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -434,9 +434,9 @@ public class BackStageOrderController extends CommonBaseController implements Us
         bo.setOrder(orderPageVO);
         bo.setBookVehicleVO(new BookVehicleVO() {{
             setBookStartDate(YMR_SLASH_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getStartTime()), ZoneOffset.ofHours(8))));
-            setBookEndDate(YMR_SLASH_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getEndTime()), ZoneOffset.ofHours(8))));
+            setBookEndDate(YMR_SLASH_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.obtainRealEndTime()), ZoneOffset.ofHours(8))));
             setBookStartDateTime(DATE_TIME_LINE_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getStartTime()), ZoneOffset.ofHours(8))));
-            setBookEndDateTime(DATE_TIME_LINE_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getEndTime()), ZoneOffset.ofHours(8))));
+            setBookEndDateTime(DATE_TIME_LINE_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.obtainRealEndTime()), ZoneOffset.ofHours(8))));
         }});
 
         List<OrderAccompanyDTO> oads = JSONUtil.toList(JSONUtil.parseArray(orderItemBiz.selectOne(new OrderItem() {{

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

@@ -128,14 +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-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelCalendarPriceBiz.java

@@ -400,7 +400,7 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
         log.info("参数：【{}==当前时间:{}==价格:{}==折扣:{}】", festivalDayMap, current_date, vehicle_price, discount);
         Map<String, Object> vehicle_price_days_map = new HashMap<>(3);
         Integer free_days = DEFAULT_FREE_DAYS;
-        vehicle_price_days_map.put(BASE_PRICE_VAL, vehicle_price);
+        //vehicle_price_days_map.put(BASE_PRICE_VAL, vehicle_price);
         if (MapUtil.isNotEmpty(festivalDayMap)) {
             VehicleModelHolidayPriceDTO vehicleModelHolidayPriceDTO = festivalDayMap.get(current_date);
             if (Objects.nonNull(vehicleModelHolidayPriceDTO)) {
@@ -408,6 +408,7 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
                 free_days = vehicleModelHolidayPriceDTO.getFreeDays() == null ? free_days : vehicleModelHolidayPriceDTO.getFreeDays();
             }
         }
+        vehicle_price_days_map.put(BASE_PRICE_VAL, vehicle_price);
         vehicle_price = vehicle_price.multiply(new BigDecimal(Objects.toString(discount / 100.00)));
         vehicle_price_days_map.put(PRICE_VAL, vehicle_price);
         vehicle_price_days_map.put(DAYS_VAL, free_days);