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

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