xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

dev
lisai17@sina.com 2020-10-11 01:00:02 +08:00
parent 5f9b9b400b
commit 1bbb3301bc
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java
View File

@ -226,7 +226,7 @@ public class SyncTaskService {
JSONObject data = increment_data.getJSONObject(tablename); JSONObject data = increment_data.getJSONObject(tablename);
String pks = data.getString("pks"); String pks = data.getString("pks");
JSONArray pkv = data.getJSONArray("pkv"); 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()); Record record = Db.findByIds(tablename, pks, pkv.toArray());
boolean change = false; boolean change = false;
@ -281,6 +281,8 @@ public class SyncTaskService {
err[0] = String.format("重复数据 %s", recvdata.toJSONString()); err[0] = String.format("重复数据 %s", recvdata.toJSONString());
} else { } else {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
err[0] = String.format("其他异常 %s", e.getMessage());
} }
return false; return false;

18
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java
View File

@ -129,8 +129,18 @@ public class PrepayDetailSyncService extends BaseSyncService {
// 只有在 state == 2 表示审核通过时，更新余额 // 只有在 state == 2 表示审核通过时，更新余额
if (state == 2) { if (state == 2) {
if(customer.getType() != 1){
customer.setType(1); // 标记为预付费用户 customer.setType(1); // 标记为预付费用户
ret = customer.update();
synctask.addUpdateData(customer);
if (!ret) {
return false;
}
}
PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(customer.getId()); PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(customer.getId());
if (prepayCustomer == null) { if (prepayCustomer == null) {
prepayCustomer = new PrepayCustomer(); prepayCustomer = new PrepayCustomer();
@ -156,14 +166,6 @@ public class PrepayDetailSyncService extends BaseSyncService {
new JSONObject().fluentPut("surplus", model.getAmount()) // 取消订单，在原余额上加上一个数 new JSONObject().fluentPut("surplus", model.getAmount()) // 取消订单，在原余额上加上一个数
); );
} }
if (!ret) {
return false;
}
ret = customer.update();
synctask.addUpdateData(customer);
} }
if (!ret) { if (!ret) {

2
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java
View File

@ -307,7 +307,7 @@ public class SyncTaskService {
JSONObject data = increment_data.getJSONObject(tablename); JSONObject data = increment_data.getJSONObject(tablename);
String pks = data.getString("pks"); String pks = data.getString("pks");
JSONArray pkv = data.getJSONArray("pkv"); 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()); Record record = Db.findByIds(tablename, pks, pkv.toArray());
boolean change = false; boolean change = false;