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

审核订单取消申请接口修改

dev
徐杰盟 2024-04-17 11:07:55 +08:00
parent 36b27b95b1
commit 668c6c7d5d
1 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -585,17 +585,17 @@ public class SyncTaskService {
String sn = o.getStr("sn"); String sn = o.getStr("sn");
Record first = Db.findFirst("select * from " + tablename + " where sn = ?", sn); Record first = Db.findFirst("select * from " + tablename + " where sn = ?", sn);
if (first != null ) { if (first != null ) {
Object create_time = first.get("create_time");
Object change_time = first.get("change_time");
System.out.println(String.valueOf(create_time));
System.out.println(String.valueOf(change_time));
if (o.toJson().equals(first.toJson())){ log.info("===============================================");
log.info("主键冲突");
log.info(tablename);
log.info(JSONObject.toJSONString(o));
log.info("===============================================");
removeList.add(o); removeList.add(o);
} }
} }
} }
}
if ("ticket_log".equals(tablename)) { if ("ticket_log".equals(tablename)) {
// id // id
@ -604,19 +604,17 @@ public class SyncTaskService {
Record first = Db.findFirst("select * from " + tablename + " where id = ?", id); Record first = Db.findFirst("select * from " + tablename + " where id = ?", id);
if (first != null ) { if (first != null ) {
Object create_time = first.get("create_time");
Object change_time = first.get("change_time");
Object invalid_time = first.get("invalid_time");
System.out.println(String.valueOf(create_time));
System.out.println(String.valueOf(change_time));
System.out.println(String.valueOf(invalid_time));
if (o.toJson().equals(first.toJson())){ log.info("===============================================");
log.info("主键冲突");
log.info(tablename);
log.info(JSONObject.toJSONString(o));
log.info("===============================================");
removeList.add(o); removeList.add(o);
} }
} }
} }
}
if ("action_cmd_log".equals(tablename)) { if ("action_cmd_log".equals(tablename)) {
// id // id
@ -625,15 +623,17 @@ public class SyncTaskService {
Record first = Db.findFirst("select * from " + tablename + " where id = ?", id); Record first = Db.findFirst("select * from " + tablename + " where id = ?", id);
if (first != null ) { if (first != null ) {
Object create_time = first.get("create_time");
System.out.println(String.valueOf(create_time));
if (o.toJson().equals(first.toJson())){ log.info("===============================================");
log.info("主键冲突");
log.info(tablename);
log.info(JSONObject.toJSONString(o));
log.info("===============================================");
removeList.add(o); removeList.add(o);
} }
} }
} }
}
if ("transport".equals(tablename)) { if ("transport".equals(tablename)) {
// id // id
@ -641,19 +641,17 @@ public class SyncTaskService {
String id = o.getStr("id"); String id = o.getStr("id");
Record first = Db.findFirst("select * from " + tablename + " where id = ?", id); Record first = Db.findFirst("select * from " + tablename + " where id = ?", id);
if (first != null ) { if (first != null ) {
Object inTime = first.get("in_time");
Object outTime = first.get("out_time");
Object changeTime = first.get("change_time");
System.out.println(String.valueOf(inTime));
System.out.println(String.valueOf(outTime));
System.out.println(String.valueOf(changeTime));
if (o.toJson().equals(first.toJson())){ log.info("===============================================");
log.info("主键冲突");
log.info(tablename);
log.info(JSONObject.toJSONString(o));
log.info("===============================================");
removeList.add(o); removeList.add(o);
} }
} }
} }
}
// if (CollectionUtils.isNotEmpty(removeList)) { // if (CollectionUtils.isNotEmpty(removeList)) {
// log.debug("新增条数" + list.size()); // log.debug("新增条数" + list.size());