Merge branch 'luck_draw_feature' into dev

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());
@@ -146,6 +146,11 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
                     currentProgress += Double.parseDouble(a + "");
                     BigDecimal bigDecimal = new BigDecimal(currentProgress);
                     log.info("用户现活动进度：newCurrentProgress = {}", currentProgress);
+                    if (activityPopularizeUser.getEndProgress().compareTo(bigDecimal) != 0) {
+                        activityPopularizeUser.setStatus(0);
+                    } else {
+                        activityPopularizeUser.setStatus(1);
+                    }
                     //修改当前进度
                     activityPopularizeUser.setCurrentProgress(bigDecimal);
                     popularizeUserBiz.updateSelectiveById(activityPopularizeUser);