diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java index 3613e1be1..3564187dc 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java @@ -10,6 +10,7 @@ import au.com.royalpay.payment.tools.env.PlatformEnvironment; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import au.com.royalpay.payment.tools.permission.enums.PartnerRole; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; @@ -112,7 +113,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService { } device.put("account_name", account.getString("display_name")); device.put("create_time", new Date()); - JSONObject params = act.getJSONObject("params_json"); + JSONObject params = JSON.parseObject(act.getString("params_json")); device.put("rate", params.getBigDecimal("rate") == null ? new BigDecimal(0.15) : params.getBigDecimal("rate")); device.put("expire_time", act.getDate("expire_date")); actMonDelaySettleMapper.save(device); diff --git a/src/main/resources/templates/activity/mondelay/mondelay.html b/src/main/resources/templates/activity/mondelay/mondelay.html index be88d93d8..b88c9538b 100644 --- a/src/main/resources/templates/activity/mondelay/mondelay.html +++ b/src/main/resources/templates/activity/mondelay/mondelay.html @@ -17,8 +17,16 @@ -
-

+
+
+

+
+
+ +
+
+
活动已结束
+
@@ -39,52 +47,64 @@
  • 本活动最终解释权归RoyalPay所有
    • -
    -
    -
    -
    -
    -

    补贴金额记录

    +
    +
    +
    +
    +
    +
    +
    +
    +

    补贴金额记录

    +
    -
    -
    累计补贴金额
    -
    $
    -
    +
    +
    累计补贴金额
    +
    $
    +
    -
    - - - - - - - - - - - - - -
    时间补贴金额
    >04-01 12:00$5.00
    +
    + + + + + + + + + + + + + +
    时间补贴金额
    >04-01 12:00$5.00
    +
    +
    +
    +
    +
    +
    -
    - -
    +
    -
    -