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

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

@@ -106,7 +106,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
                         if (jsonArray != null) {
                             JSONObject jsonObject1 = jsonArray.getJSONObject(num - 1);
                             if (jsonObject1 != null) {
-                                double amountString = jsonObject1.getInteger("amount");
+                                double amountString = jsonObject1.getDouble("amount");
                                 amount = amount + amountString;
                             }
                         }
@@ -150,7 +150,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
                     activityPopularizeUser.setCurrentProgress(bigDecimal);
                     popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
                     //任务没有完成
-                    if (SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
+                    if (!SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
 //                AwardDTO awardDTO = JSONUtil.toBean(activityPopularize.getValue(), AwardDTO.class);
                         //检查是否满足奖励
                         if (relationBiz.selectList(new ActivityPopularizeRelation() {{