Merge branch 'pudong_jdk8' of 192.168.168.201:panzhaov5/bsth_control into pudong_jdk8

youxiw2000
2 parents 5d83333c f8106f0b
Showing 2 changed files with 4 additions and 4 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
@@ -97,8 +97,8 @@ public class XDApplication implements CommandLineRunner {
         timeDiff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
         if (timeDiff < 0)
             timeDiff += (1000 * 60 * 60 * 24);
-        // 早上07:00
-        timeDiffTraffic = (DateUtils.getTimestamp() + 1000 * 60 * 60 * 7) - System.currentTimeMillis();
+        // 早上09:00
+        timeDiffTraffic = (DateUtils.getTimestamp() + 3600000 * 9) - System.currentTimeMillis();
         if (timeDiffTraffic < 0)
             timeDiffTraffic += (1000 * 60 * 60 * 24);
     }
@@ -2396,7 +2396,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
                     } else if("jhgl".equals(itemDetails)){
                         listStr.add(df.format(c1.getJhyylc()+c1.getJhfyylc()));
                     } else if("sjbc".equals(itemDetails)){
-                        listStr.add(c1.getSjyybc()+c1.getSjfyybc()+"");
+                        listStr.add(c1.getSjyybc()+c1.getSjfyybc()+c1.getLjbc()+"");
                     } else if("jhbc".equals(itemDetails)){
                         listStr.add(c1.getJhyybc()+c1.getJhfyybc()+"");
                     }
@@ -2451,7 +2451,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				} else if("jhgl".equals(itemDetails)){
 					listEnd.add((df.format(c1.getJhyylc()+c1.getJhfyylc())));
 				} else if("sjbc".equals(itemDetails)){
-					listEnd.add(c1.getSjyybc()+c1.getSjfyybc()+"");
+					listEnd.add(c1.getSjyybc()+c1.getSjfyybc()+c1.getLjbc()+"");
 				} else if("jhbc".equals(itemDetails)){
 					listEnd.add((c1.getJhyybc()+c1.getJhfyybc())+"");
 				}