Merge branch 'luck_draw_feature' into dev

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

@@ -148,6 +148,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
                     log.info("用户现活动进度：newCurrentProgress = {}", currentProgress);
                     //修改当前进度
                     activityPopularizeUser.setCurrentProgress(bigDecimal);
+                    popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
                     //任务没有完成
                     if (!SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
 //                AwardDTO awardDTO = JSONUtil.toBean(activityPopularize.getValue(), AwardDTO.class);
@@ -159,7 +160,6 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
                             apLogDTO.setStatus(SYS_TRUE);
                             popularizeLogBiz.updateSelectiveById(BeanUtil.toBean(apLogDTO, ActivityPopularizeLog.class));
                             activityPopularizeUser.setStatus(SYS_TRUE);
-                            activityPopularizeUser.setCurrentProgress(new BigDecimal(apLogDTO.getItem().getProgress()));
                             popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
                             mqSenderFeign.sendMessage(RabbitConstant.ADMIN_TOPIC, RabbitConstant.KEY_WALLET_ADD, JSONUtil.toJsonStr(new MyWalletDetail() {{
                                 setAmount(new BigDecimal("50"));