msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master
yuan 7 years ago
parent ed6aa9c00c ce1da924fd
commit 7850e9e36c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java
Unescape View File

@ -74,9 +74,9 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
List<JSONObject> clientLogs = actMonDelaySettleMapper.clientLog(client_id); List<JSONObject> clientLogs = actMonDelaySettleMapper.clientLog(client_id);
JSONObject res = new JSONObject(); JSONObject res = new JSONObject();
res.put("operation_pause",false); res.put("operation_pause",false);
Boolean apply = true; Boolean apply = false;
if (clientLogs.isEmpty()) { if (!clientLogs.isEmpty()) {
apply = false; apply = true;
res.put("cancel_waring",messageSource.getMessage("sys.mondelay.cancel.waring", null, RequestEnvironment.getLocale())); res.put("cancel_waring",messageSource.getMessage("sys.mondelay.cancel.waring", null, RequestEnvironment.getLocale()));
} }
if (new Date().compareTo(act.getDate("active_date")) < 0) { if (new Date().compareTo(act.getDate("active_date")) < 0) {

Write Preview
Loading…
Cancel
Save