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

.

dev
lisai17@sina.com 2020-12-05 09:26:30 +08:00
parent 37069041fc
commit d57c958ef0
2 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ssjygl-xsx-local/src/main/resources/dev/db.properties
View File

@ -5,6 +5,7 @@ user=dev_ssjy_xsx
password=Ssjy_xs_890 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.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 #user=root
#password=Ssjy_xsx_890 #password=Ssjy_xsx_890

64
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/CheckUndonOrderclusterJob.java
View File

@ -114,37 +114,43 @@ public class CheckUndonOrderclusterJob implements Job {
log.debug("完成未执行完的订单 %d", undonlist.size()); log.debug("完成未执行完的订单 %d", undonlist.size());
for (Ordercluster ordercluster : undonlist) { 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 { try {
Thread.sleep(1000); int ordercluster_id = ordercluster.getId();
} catch (Exception ignored) { 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);
} }
} }