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

@@ -99,19 +99,19 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
                     //新增第几个邀请人和邀请金额字段
                     Integer num = relationBiz.getByUserIdAndPopularizeId(activityPopularizeRelation);
 
-                    Integer amount = 0;
+                    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) {
-                                Integer amountString = jsonObject1.getInteger("amount");
+                                double amountString = jsonObject1.getInteger("amount");
                                 amount = amount + amountString;
                             }
                         }
                     }
-                    Integer a = amount;
+                    double a = amount;
                     //添加活动关系
                     relationBiz.insertSelective(new ActivityPopularizeRelation() {{
                         setPopularizeId(activityPopularize.getId());
@@ -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() {{