Merge branch 'luck_draw_feature' into dev

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

@@ -141,8 +141,13 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
                         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(activityPopularizeUser.getCurrentProgress().add(new BigDecimal(a)));
+                    activityPopularizeUser.setCurrentProgress(bigDecimal);
                     //任务没有完成
                     if (!SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
 //                AwardDTO awardDTO = JSONUtil.toBean(activityPopularize.getValue(), AwardDTO.class);