Merge branch 'luck_draw_feature' into dev

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;
                             }
                         }