diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java index 3c546bb..1925112 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java @@ -226,7 +226,7 @@ public class SyncTaskService { JSONObject data = increment_data.getJSONObject(tablename); String pks = data.getString("pks"); JSONArray pkv = data.getJSONArray("pkv"); - JSONObject increment_data = data.getJSONObject("increment_data"); + JSONObject increment_data = data.getJSONObject("increment"); Record record = Db.findByIds(tablename, pks, pkv.toArray()); boolean change = false; @@ -281,6 +281,8 @@ public class SyncTaskService { err[0] = String.format("重复数据 %s", recvdata.toJSONString()); } else { log.error(e.getMessage(), e); + + err[0] = String.format("其他异常 %s", e.getMessage()); } return false; diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java index da63cc9..8e4e45a 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java @@ -129,7 +129,17 @@ public class PrepayDetailSyncService extends BaseSyncService { // 只有在 state == 2 表示审核通过时,更新余额 if (state == 2) { - customer.setType(1); // 标记为预付费用户 + if(customer.getType() != 1){ + customer.setType(1); // 标记为预付费用户 + + ret = customer.update(); + + synctask.addUpdateData(customer); + + if (!ret) { + return false; + } + } PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(customer.getId()); if (prepayCustomer == null) { @@ -156,14 +166,6 @@ public class PrepayDetailSyncService extends BaseSyncService { new JSONObject().fluentPut("surplus", model.getAmount()) // 取消订单,在原余额上加上一个数 ); } - - if (!ret) { - return false; - } - - ret = customer.update(); - - synctask.addUpdateData(customer); } if (!ret) { diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java index 63b01b8..048d1ed 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java @@ -307,7 +307,7 @@ public class SyncTaskService { JSONObject data = increment_data.getJSONObject(tablename); String pks = data.getString("pks"); JSONArray pkv = data.getJSONArray("pkv"); - JSONObject increment_data = data.getJSONObject("increment_data"); + JSONObject increment_data = data.getJSONObject("increment"); Record record = Db.findByIds(tablename, pks, pkv.toArray()); boolean change = false;