diff --git a/ssjygl-xsx-local/src/main/resources/dev/db.properties b/ssjygl-xsx-local/src/main/resources/dev/db.properties index ff03ab6..2540495 100644 --- a/ssjygl-xsx-local/src/main/resources/dev/db.properties +++ b/ssjygl-xsx-local/src/main/resources/dev/db.properties @@ -5,6 +5,7 @@ user=dev_ssjy_xsx password=Ssjy_xs_890 #jdbcUrl=jdbc:mysql://192.168.20.2:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +#jdbcUrl=jdbc:mysql://192.168.1.177:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true #user=root #password=Ssjy_xsx_890 diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/CheckUndonOrderclusterJob.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/CheckUndonOrderclusterJob.java index 25db692..9f2d9df 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/CheckUndonOrderclusterJob.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/CheckUndonOrderclusterJob.java @@ -114,37 +114,43 @@ public class CheckUndonOrderclusterJob implements Job { log.debug("完成未执行完的订单 %d", undonlist.size()); for (Ordercluster ordercluster : undonlist) { - int ordercluster_id = ordercluster.getId(); - BigDecimal over_weight = OrderclusterService.me.getOverWeight(ordercluster_id); // 按客户找集团订单已完成量 - BigDecimal surplus_weight = ordercluster.getTotalWeight().subtract(over_weight); // 剩余未完成量 - Sysuser user = new Sysuser(); - user.setId(0); - user.setName("system"); - - Calendar cold = Calendar.getInstance(); - cold.setTime(ordercluster.getCutoffTime()); - cold.add(Calendar.DATE, 1); - Date cutoff_time = cold.getTime(); - - Result ret; - - if (ordercluster.getCustomerId() != null) { - ret = OrderclusterSyncService.me.forwardCluster(ordercluster_id, surplus_weight, cutoff_time, user); - } else { - String trucks = Db.queryStr("select group_concat(t.truck_license) trucks from ordercluster_truck t\n" + - " where t.ordercluster_id = ?\n" + - " group by t.ordercluster_id", ordercluster_id); - ret = OrderclusterSyncService.me.forwardTemp(ordercluster_id, surplus_weight, cutoff_time, trucks, user); - } - - if (ret.getCode() != Result.SUCCESS) { - log.error("自动转结失败。ordercluster_id:%s, err msg: %s", ordercluster_id, ret.getMsg()); - } - try { - Thread.sleep(1000); - } catch (Exception ignored) { + int ordercluster_id = ordercluster.getId(); + BigDecimal over_weight = OrderclusterService.me.getOverWeight(ordercluster_id); // 按客户找集团订单已完成量 + BigDecimal surplus_weight = ordercluster.getTotalWeight().subtract(over_weight); // 剩余未完成量 + Sysuser user = new Sysuser(); + user.setId(0); + user.setName("system"); + Calendar cold = Calendar.getInstance(); + cold.setTime(ordercluster.getCutoffTime()); + cold.add(Calendar.DATE, 1); + Date cutoff_time = cold.getTime(); + + Result ret; + + if (ordercluster.getCustomerId() != null) { + ret = OrderclusterSyncService.me.forwardCluster(ordercluster_id, surplus_weight, cutoff_time, user); + } else { + String trucks = Db.queryStr("select group_concat(t.truck_license) trucks from ordercluster_truck t\n" + + " where t.ordercluster_id = ?\n" + + " group by t.ordercluster_id", ordercluster_id); + + if(trucks == null){ + log.debug("没有找到 trucks , ordercluster_id: %s", ordercluster_id); + trucks = ""; + } + + ret = OrderclusterSyncService.me.forwardTemp(ordercluster_id, surplus_weight, cutoff_time, trucks, user); + } + + if (ret.getCode() != Result.SUCCESS) { + log.error("自动转结失败。ordercluster_id:%s, err msg: %s", ordercluster_id, ret.getMsg()); + } + + Thread.sleep(1000); + } catch (Exception e) { + log.error(e.getMessage(), e); } }