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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempDTO.java

@@ -26,8 +26,7 @@ public class AppUserPositionTempDTO {
     @ApiModelProperty(value = "姓名")
     private String name;
 
-
-    @ApiModelProperty(value = "身份id")
+   @ApiModelProperty(value = "身份id")
     private Integer positionId;
 
     @ApiModelProperty(value = "员工职位id")
@@ -48,6 +47,9 @@ public class AppUserPositionTempDTO {
     @ApiModelProperty(value = "是否删除：0-正常；1-删除")
     private Integer isDel;
 
+    @ApiModelProperty(value = "员工职位状态：0-正常；1-离职")
+    private Integer isQuit;
+
     @ApiModelProperty(value = "用户id")
     private Integer userId;
 

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPositionTemp.java

@@ -76,4 +76,8 @@ public class AppUserPositionTemp implements Serializable {
     private Integer isDel;
 
 
+    @Column(name = "is_quit")
+    @ApiModelProperty(value = "员工职位状态：0-正常；1-离职")
+    private Integer isQuit;
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserPositionTempVo.java

@@ -51,4 +51,7 @@ public class AppUserPositionTempVo {
 
     @ApiModelProperty(value = "分公司名称")
     private String companyName;
+
+  @ApiModelProperty(value = "员工职位状态 0：在职 1：离职")
+    private Integer idQuit;
 }

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

@@ -66,14 +66,14 @@ public class AppStaffUserBiz extends BaseBiz<AppStaffUserMapper, AppStaffUser> {
             BeanUtils.copyProperties(staffUser, appStaffUserVo);
             Integer suId = staffUser.getSuId();
             //上级员工信息
-            if (suId!=null||suId!=0||appStaffUser.getPhone()!=null){
+            if (suId != null && suId != 0 && appStaffUser.getPhone() != null){
                 AppUserVo spuser = appUserDetailBiz.getUserInfoById(suId);
                 appStaffUserVo.setEmployeeName(spuser.getRealname());
                 appStaffUserVo.setEmployeePhone(spuser.getUsername());
             }
             //客户信息
             Integer uid = staffUser.getUid();
-            if (uid!=null||uid!=0){
+            if (uid != null && uid > 0){
                 AppUserVo user = appUserDetailBiz.getUserInfoById(uid);
                 appStaffUserVo.setUName(StringUtil.isEmpty(user.getRealname())?user.getNickname():user.getRealname());
                 appStaffUserVo.setPhone(user.getUsername());

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

@@ -49,7 +49,7 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
     public void addPositionChangeRecord(AppUserPositionTemp userPositionTemp, AppUserPositionTemp oldData, Integer operatorId, Timestamp relTime) {
         AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
 
-        if (!(userPositionTemp.getIsDel().equals(oldData.getIsDel()))) {
+        if (!(userPositionTemp.getIsQuit().equals(oldData.getIsQuit()))) {
             appUserPositionChangeRecord.setJobRemark(USER_LEAVE_COMPANT);
         }
 

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

@@ -168,6 +168,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
             String jobName = jobMap == null ? "" : jobMap.get(appUserPositionTemp.getJobId()) == null ? "" : jobMap.get(appUserPositionTemp.getJobId()).getName();
             appUserPositionTempVo.setPositionName(postionName);
             appUserPositionTempVo.setJobName(jobName);
+            appUserPositionTempVo.setIdQuit(appUserPositionTemp.getIsQuit());
             appUserPositionTempVo.setStatus(appUserPositionTemp.getUserId() == null ? DataStatus.NO_USERED.code : appUserPositionTemp.getUserId() == 0 ? DataStatus.NO_USERED.code : DataStatus.USERED.code);
             appUserPositionTempVos.add(appUserPositionTempVo);
         }
@@ -421,8 +422,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
      * 员工复职
      */
     public ObjectRestResponse andAddUserPositionChangeRecord(AppUserPositionTempDTO appUserPositionTempDTO, Integer operatorId) {
-        if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone()) || StringUtils.isBlank(appUserPositionTempDTO.getName())
-        ) {
+        if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone())) {
             return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
         }
         AppUserPositionTemp userPositionTemp = new AppUserPositionTemp();

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

@@ -24,4 +24,6 @@ public class ActivityLuckDrawFindDTO extends PageParam {
      private Date endTime;
      private String phone;
      private Integer activityId;
+     private String parentPhone;
+
 }

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

+package com.xxfc.platform.activity.vo;
+
+import com.xxfc.platform.activity.entity.ActivityLuckyDraw;
+import lombok.Data;
+
+@Data
+public class ActivityLuckyDrawListVo extends ActivityLuckyDraw {
+	private String positionName;
+	private String parentPhone;
+	private String parentName;
+}

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.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.Query;
 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 com.xxfc.platform.activity.entity.ActivityLuckyDraw;
+import com.xxfc.platform.activity.mapper.ActivityLuckyDrawMapper;
+import com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo;
 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;
@@ -50,7 +51,7 @@ public class ActivityLuckyDrawBiz extends BaseBiz<ActivityLuckyDrawMapper, Activ
      *
      * @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();
@@ -106,4 +107,15 @@ public class ActivityLuckyDrawBiz extends BaseBiz<ActivityLuckyDrawMapper, Activ
         }
         return activityLuckyDraws;
     }
+
+    public ObjectRestResponse<PageDataVO<ActivityLuckyDrawListVo>> getAll(ActivityLuckDrawFindDTO activityLuckDrawFindDTO) {
+        Integer page = activityLuckDrawFindDTO.getPage() == null ? 1 : activityLuckDrawFindDTO.getPage();
+        Integer limit = activityLuckDrawFindDTO.getLimit() == null ? 10 : activityLuckDrawFindDTO.getLimit();
+        activityLuckDrawFindDTO.setPage(page);
+        activityLuckDrawFindDTO.setLimit(limit);
+        Query query = new Query(activityLuckDrawFindDTO);
+        PageDataVO<ActivityLuckyDrawListVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getAllByPage(query.getSuper()));
+        return ObjectRestResponse.succ(pageDataVO);
+        //添加个人积分状态
+    }
 }
\ No newline at end of file

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

@@ -11,18 +11,22 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
+import com.xxfc.platform.activity.config.RedissonLock;
 import com.xxfc.platform.activity.dto.ApLogDTO;
 import com.xxfc.platform.activity.entity.*;
 import com.xxfc.platform.activity.mapper.ActivityPopularizeMapper;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.redisson.api.RLock;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
@@ -36,144 +40,165 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TR
  */
 @Service
 @Slf4j
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, ActivityPopularize> {
 
-    @Autowired
-    ActivityPopularizeRelationBiz relationBiz;
-
-    @Autowired
-    ActivityPopularizeBiz popularizeBiz;
-
-    @Autowired
-    ActivityPopularizeUserBiz popularizeUserBiz;
-
-    @Autowired
-    ActivityPopularizeLogBiz popularizeLogBiz;
-
-    @Autowired
-    ActivityPopularizeItemBiz activityPopularizeItemBiz;
-
-    @Autowired
-    UserFeign userFeign;
-
-    @Autowired
-    MQSenderFeign mqSenderFeign;
-
-    public static final String POPULARIZE_0101 = "0101";
-
-    public static final String PREFIX = "P";
-
-    public static final Integer INVITE_ITEMID = 3;
-
-    public void handleRegister(RegisterQueueDTO registerQueueDTO) {
-        log.info("活动码注册成功：registerQueueDTO = {}", registerQueueDTO.toString());
-        if (StringUtils.isNotBlank(registerQueueDTO.getInParamDTO().getActivityCode())) {
-            String activityCode = registerQueueDTO.getInParamDTO().getActivityCode().replace(PREFIX, "").replace("p", "");
-            AppUserDTO appUserDTO = userFeign.userDetailById(registerQueueDTO.getAppUserId()).getData();
-            //获取活动code,并且注册来源是app 并且 非普通登录
-            if (!RegisterQueueDTO.SIGN_LOGIN.equals(registerQueueDTO.getSign()) && StringUtils.isNotBlank(activityCode)) {
-                //查询出活动
-                ActivityPopularize activityPopularize = popularizeBiz.selectOne(new ActivityPopularize() {{
-                    setCode(activityCode);
-                }});
-                log.info("活动邀请注册：activityPopularize = {}", activityPopularize.toString());
-                if (activityPopularize != null) {
-                    List<ActivityPopularizeItem> activityPopularizeItems = activityPopularizeItemBiz.selectByPopularizeId(activityPopularize.getId());
-                    ActivityPopularizeItem activityPopularizeItem = activityPopularizeItems.get(activityPopularizeItems.size() - 1);
-                    Date now = DateUtil.date();
-                    Date start = DateUtil.date(activityPopularize.getStartTime());
-                    Date end = DateUtil.date(activityPopularize.getEndTime());
-
-                    //判断是否活动超时
-                    if (now.before(start) || now.after(end)) {
-                        log.error("不在活动范围内 入参Json：" + JSONUtil.toJsonStr(registerQueueDTO));
-                        return;
-                    }
-
-                    Integer majorUserId = Integer.valueOf(appUserDTO.getInviterAccount());
-                    ActivityPopularizeRelation activityPopularizeRelation = new ActivityPopularizeRelation() {{
-                        setMajorUserId(majorUserId);
-                        setPopularizeId(activityPopularize.getId());
-                    }};
-
-                    //新增第几个邀请人和邀请金额字段
-                    Integer num = relationBiz.getByUserIdAndPopularizeId(activityPopularizeRelation);
-
-                    double amount = 0;
-                    JSONObject jsonObject = JSONObject.parseObject(activityPopularizeItem.getDetail());
-                    if (jsonObject != null && StringUtils.isNotBlank(jsonObject.getString("detail"))) {
-                        JSONArray jsonArray = JSONArray.parseArray(jsonObject.getString("detail"));
-                        if (jsonArray != null) {
-                            JSONObject jsonObject1 = jsonArray.getJSONObject(num - 1);
-                            if (jsonObject1 != null) {
-                                double amountString = jsonObject1.getDouble("amount");
-                                amount = amount + amountString;
-                            }
-                        }
-                    }
-                    double a = amount;
-                    //添加活动关系
-                    relationBiz.insertSelective(new ActivityPopularizeRelation() {{
-                        setPopularizeId(activityPopularize.getId());
-                        setMajorUserId(majorUserId);
-                        setMinorUserId(appUserDTO.getUserid());
-                        setNum(num);
-                        setAmount(new BigDecimal(a));
-                    }});
-
-                    ApLogDTO apLogDTO = popularizeLogBiz.selectOneApLogDTO(new ActivityPopularizeLog() {{
-                        setUserId(majorUserId);
-                        setItemId(activityPopularizeItem.getId());
-                    }});
-
-                    //生成任务项
-                    if (null == apLogDTO) {
-                        popularizeLogBiz.insertSelectiveRe(new ActivityPopularizeLog() {{
-                            setItemId(activityPopularizeItem.getId());
-                            setUserId(majorUserId);
-                            setStatus(SYS_FALSE);
-                            setPopularizeId(activityPopularize.getId());
-                        }});
-                    }
-
-                    //查出majorUser参与活动信息
-                    ActivityPopularizeUser activityPopularizeUser = popularizeUserBiz.selectOne(new ActivityPopularizeUser() {{
-                        setUserId(majorUserId);
-                        setPopularizeId(activityPopularize.getId());
-                    }});
-                    double currentProgress =  activityPopularizeUser.getCurrentProgress().doubleValue();
-                    log.info("用户原活动进度：currentProgress = {}", activityPopularizeUser.toString());
-                    currentProgress += Double.parseDouble(a + "");
-                    BigDecimal bigDecimal = new BigDecimal(currentProgress);
-                    log.info("用户现活动进度：newCurrentProgress = {}", currentProgress);
-                    //修改当前进度
-                    activityPopularizeUser.setCurrentProgress(bigDecimal);
-                    popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
-                    //任务没有完成
-                    if (!SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
+	@Autowired
+	ActivityPopularizeRelationBiz relationBiz;
+
+	@Autowired
+	ActivityPopularizeBiz popularizeBiz;
+
+	@Autowired
+	ActivityPopularizeUserBiz popularizeUserBiz;
+
+	@Autowired
+	ActivityPopularizeLogBiz popularizeLogBiz;
+
+	@Autowired
+	ActivityPopularizeItemBiz activityPopularizeItemBiz;
+
+	private final RedissonLock redissonLock;
+
+
+	@Autowired
+	UserFeign userFeign;
+
+	@Autowired
+	MQSenderFeign mqSenderFeign;
+
+	public static final String POPULARIZE_0101 = "0101";
+
+	public static final String PREFIX = "P";
+
+	public static final Integer INVITE_ITEMID = 3;
+
+	public void handleRegister(RegisterQueueDTO registerQueueDTO) {
+		log.info("活动码注册成功：registerQueueDTO = {}", registerQueueDTO.toString());
+		if (StringUtils.isNotBlank(registerQueueDTO.getInParamDTO().getActivityCode())) {
+			String activityCode = registerQueueDTO.getInParamDTO().getActivityCode().replace(PREFIX, "").replace("p", "");
+			AppUserDTO appUserDTO = userFeign.userDetailById(registerQueueDTO.getAppUserId()).getData();
+			//获取活动code,并且注册来源是app 并且 非普通登录
+			if (!RegisterQueueDTO.SIGN_LOGIN.equals(registerQueueDTO.getSign()) && StringUtils.isNotBlank(activityCode)) {
+				//查询出活动
+				ActivityPopularize activityPopularize = popularizeBiz.selectOne(new ActivityPopularize() {{
+					setCode(activityCode);
+				}});
+				log.info("活动邀请注册：activityPopularize = {}", activityPopularize.toString());
+				if (activityPopularize != null) {
+                    String lockKey = String.format("%s%d:%d:%d", registerQueueDTO.getAppUserId(), registerQueueDTO.getInParamDTO().getUsername(), activityPopularize.getId());
+                    RLock rLock = redissonLock.getRLock(lockKey);
+                    try {
+                        boolean isSuccess = rLock.tryLock(5, 5, TimeUnit.SECONDS);
+                        if (isSuccess) {
+					List<ActivityPopularizeItem> activityPopularizeItems = activityPopularizeItemBiz.selectByPopularizeId(activityPopularize.getId());
+					ActivityPopularizeItem activityPopularizeItem = activityPopularizeItems.get(activityPopularizeItems.size() - 1);
+					Date now = DateUtil.date();
+					Date start = DateUtil.date(activityPopularize.getStartTime());
+					Date end = DateUtil.date(activityPopularize.getEndTime());
+
+					//判断是否活动超时
+					if (now.before(start) || now.after(end)) {
+						log.error("不在活动范围内 入参Json：" + JSONUtil.toJsonStr(registerQueueDTO));
+						return;
+					}
+
+					Integer majorUserId = Integer.valueOf(appUserDTO.getInviterAccount());
+					ActivityPopularizeRelation activityPopularizeRelation = new ActivityPopularizeRelation() {{
+						setMajorUserId(majorUserId);
+						setPopularizeId(activityPopularize.getId());
+					}};
+
+					//新增第几个邀请人和邀请金额字段
+					Integer num = relationBiz.getByUserIdAndPopularizeId(activityPopularizeRelation);
+
+					double amount = 0;
+					JSONObject jsonObject = JSONObject.parseObject(activityPopularizeItem.getDetail());
+					if (jsonObject != null && StringUtils.isNotBlank(jsonObject.getString("detail"))) {
+						JSONArray jsonArray = JSONArray.parseArray(jsonObject.getString("detail"));
+						if (jsonArray != null) {
+							JSONObject jsonObject1 = jsonArray.getJSONObject(num - 1);
+							if (jsonObject1 != null) {
+								double amountString = jsonObject1.getDouble("amount");
+								amount = amount + amountString;
+							}
+						}
+					}
+					double a = amount;
+					//添加活动关系
+					relationBiz.insertSelective(new ActivityPopularizeRelation() {{
+						setPopularizeId(activityPopularize.getId());
+						setMajorUserId(majorUserId);
+						setMinorUserId(appUserDTO.getUserid());
+						setNum(num);
+						setAmount(new BigDecimal(a));
+					}});
+
+					ApLogDTO apLogDTO = popularizeLogBiz.selectOneApLogDTO(new ActivityPopularizeLog() {{
+						setUserId(majorUserId);
+						setItemId(activityPopularizeItem.getId());
+					}});
+
+					//生成任务项
+					if (null == apLogDTO) {
+						popularizeLogBiz.insertSelectiveRe(new ActivityPopularizeLog() {{
+							setItemId(activityPopularizeItem.getId());
+							setUserId(majorUserId);
+							setStatus(SYS_FALSE);
+							setPopularizeId(activityPopularize.getId());
+						}});
+					}
+
+					//查出majorUser参与活动信息
+					ActivityPopularizeUser activityPopularizeUser = popularizeUserBiz.selectOne(new ActivityPopularizeUser() {{
+						setUserId(majorUserId);
+						setPopularizeId(activityPopularize.getId());
+					}});
+					double currentProgress = activityPopularizeUser.getCurrentProgress().doubleValue();
+					log.info("用户原活动进度：currentProgress = {}", currentProgress);
+					currentProgress += Double.parseDouble(a + "");
+					BigDecimal bigDecimal = new BigDecimal(currentProgress);
+					log.info("用户现活动进度：newCurrentProgress = {}", currentProgress);
+					//修改当前进度
+					activityPopularizeUser.setCurrentProgress(bigDecimal);
+					popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
+					//任务没有完成 加锁
+
+							if (!SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
 //                AwardDTO awardDTO = JSONUtil.toBean(activityPopularize.getValue(), AwardDTO.class);
-                        //检查是否满足奖励
-                        if (relationBiz.selectList(new ActivityPopularizeRelation() {{
-                            setMajorUserId(majorUserId);
-                            setPopularizeId(activityPopularize.getId());
-                        }}).size() >= 10) {
-                            apLogDTO.setStatus(SYS_TRUE);
-                            popularizeLogBiz.updateSelectiveById(BeanUtil.toBean(apLogDTO, ActivityPopularizeLog.class));
-                            activityPopularizeUser.setStatus(SYS_TRUE);
-                            popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
-                            mqSenderFeign.sendMessage(RabbitConstant.ADMIN_TOPIC, RabbitConstant.KEY_WALLET_ADD, JSONUtil.toJsonStr(new MyWalletDetail() {{
-                                setAmount(new BigDecimal("50"));
-                                setSource(SOURCE_ACTIVITY);
-                                setUserId(majorUserId);
-                                setActivityId(activityPopularize.getId());
-                                setActivityName(activityPopularize.getName());
-                                setType(TYPE_POPULARIZE);
-                                setItype(ITYPE_IN);
-                            }}));
-                        }
-                    }
-                }
-            }
-        }
-    }
+								//检查是否满足奖励
+								if (relationBiz.selectList(new ActivityPopularizeRelation() {{
+									setMajorUserId(majorUserId);
+									setPopularizeId(activityPopularize.getId());
+								}}).size() >= 10 && popularizeUserBiz.selectCount(new ActivityPopularizeUser() {{
+									setPopularizeId(activityPopularize.getId());
+									setCurrentProgress(new BigDecimal("50"));
+								}}) <= activityPopularize.getNumLimit()) {
+									apLogDTO.setStatus(SYS_TRUE);
+									popularizeLogBiz.updateSelectiveById(BeanUtil.toBean(apLogDTO, ActivityPopularizeLog.class));
+									activityPopularizeUser.setStatus(SYS_TRUE);
+									popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
+
+									mqSenderFeign.sendMessage(RabbitConstant.ADMIN_TOPIC, RabbitConstant.KEY_WALLET_ADD, JSONUtil.toJsonStr(new MyWalletDetail() {{
+										setAmount(new BigDecimal("50"));
+										setSource(SOURCE_ACTIVITY);
+										setUserId(majorUserId);
+										setActivityId(activityPopularize.getId());
+										setActivityName(activityPopularize.getName());
+										setType(TYPE_POPULARIZE);
+										setItype(ITYPE_IN);
+									}}));
+								}
+							}
+						} else {
+							// 获取锁失败
+							log.info("tryLock fail, key = [{}]", lockKey);
+						}
+					} catch (InterruptedException e) {
+						log.error("tryLock fail, key = [{}]", lockKey);
+					}
+				}
+			}
+		}
+	}
 }
\ No newline at end of file

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

@@ -2,15 +2,11 @@ package com.xxfc.platform.activity.handler;
 
 
 import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.dto.RegisterQueueDTO;
 import com.rabbitmq.client.Channel;
 import com.xxfc.platform.activity.biz.ActivityPopularizeBiz;
 import com.xxfc.platform.activity.biz.ActivityUserJoinBiz;
-import com.xxfc.platform.activity.biz.IntegralUserRecordBiz;
 import com.xxfc.platform.activity.config.RabbitActivityConfig;
-import com.xxfc.platform.activity.entity.ActivityPopularize;
-import com.xxfc.platform.activity.vo.IntegralUserRecordDto;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.core.Message;

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

@@ -2,9 +2,11 @@ package com.xxfc.platform.activity.mapper;
 
 import com.xxfc.platform.activity.dto.ActivityLuckDrawFindDTO;
 import com.xxfc.platform.activity.entity.ActivityLuckyDraw;
+import com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 活动抽奖报名表
@@ -16,4 +18,6 @@ import java.util.List;
 public interface ActivityLuckyDrawMapper extends Mapper<ActivityLuckyDraw> {
 
     List<ActivityLuckyDraw> listLuckDrawWithPage(ActivityLuckDrawFindDTO activityLuckDrawFindDTO);
+
+    List<ActivityLuckyDrawListVo> getAllByPage(Map<String, Object> param);
 }

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

 package com.xxfc.platform.activity.rest;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
@@ -29,6 +30,7 @@ import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -156,7 +158,14 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
             setUserId(getAppUser().getUserid());
             setPopularizeId(itemAddDTO.getPopularizeId());
         }});
+        Date now = DateUtil.date();
+        Date start = DateUtil.date(ap.getStartTime());
+        Date end = DateUtil.date(ap.getEndTime());
 
+        //判断是否活动超时
+        if (now.before(start) || now.after(end)) {
+            return ObjectRestResponse.createFailedResult(2005,"活动已结束");
+        }
         //添加用户活动关系
         if(null == activityPopularizeUser) {
             activityPopularizeUser = popularizeUserBiz.insertSelectiveReT(new ActivityPopularizeUser(){{

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.exception.BaseException;
 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 com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -38,9 +38,8 @@ public class ActivityLuckyDrawAdminController {
      * @return
      */
     @PostMapping("/page")
-    public ObjectRestResponse<PageDataVO<ActivityLuckyDraw>> listActivtyLuckyDrawWithPage(@RequestBody ActivityLuckDrawFindDTO activityLuckDrawFindDTO) {
-        PageDataVO<ActivityLuckyDraw> activityLuckyDrawPageDataVO = activityLuckyDrawBiz.listLuckDrawWithPage(activityLuckDrawFindDTO);
-        return ObjectRestResponse.succ(activityLuckyDrawPageDataVO);
+    public ObjectRestResponse<PageDataVO<ActivityLuckyDrawListVo>> listActivtyLuckyDrawWithPage(@RequestBody ActivityLuckDrawFindDTO activityLuckDrawFindDTO) {
+        return activityLuckyDrawBiz.getAll(activityLuckDrawFindDTO);
     }
 
     @PostMapping("/export")

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

@@ -39,4 +39,32 @@
         order by `crt_time` desc
     </select>
 
+    <select id="getAllByPage" resultType="com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo" parameterType="Map">
+        select * from `activity_lucky_draw_list` where 1=1
+        <if test="activityId != null">
+            and `activity_id`=#{activityId}
+        </if>
+        <if test= "phone != null and phone != ''">
+            and `phone`=#{phone}
+        </if>
+        <if test="parentPhone!=null and parentPhone!=''">
+            and `parentPhone`=#{parentPhone}
+        </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