ccjgmwz 3 years ago
parent
commit
f08a8d4445

+ 3 - 3
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/AdminCheckQuartz.java

@@ -172,7 +172,7 @@ public class AdminCheckQuartz {
                             }
                             }
                             tmp.setDangOrder(dangOrder);
                             tmp.setDangOrder(dangOrder);
                             tmp.setAccountId(shopAccount.getId());
                             tmp.setAccountId(shopAccount.getId());
-                            Long time  = Long.parseLong(tmp.getShippingTime());
+                            Long time  = Long.parseLong(tmp.getShippingTime())+8*60*60;
                             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                             sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
                             sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
                             String time1 = sdf.format(new Date(time * 1000));
                             String time1 = sdf.format(new Date(time * 1000));
@@ -262,7 +262,7 @@ public class AdminCheckQuartz {
                                 }
                                 }
                                 tmp.setDangOrder(dangOrder);
                                 tmp.setDangOrder(dangOrder);
                                 tmp.setAccountId(shopAccount.getId());
                                 tmp.setAccountId(shopAccount.getId());
-                                Long time  = Long.parseLong(tmp.getShippingTime());
+                                Long time  = Long.parseLong(tmp.getShippingTime())+8*60*60;
                                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                                 sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
                                 sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
                                 String time1 = sdf.format(new Date(time * 1000));
                                 String time1 = sdf.format(new Date(time * 1000));
@@ -633,7 +633,7 @@ public class AdminCheckQuartz {
                                 }
                                 }
                                 tmp.setDangOrder(dangOrder);
                                 tmp.setDangOrder(dangOrder);
                                 tmp.setAccountId(shopAccount.getId());
                                 tmp.setAccountId(shopAccount.getId());
-                                Long time  = Long.parseLong(tmp.getShippingTime());
+                                Long time  = Long.parseLong(tmp.getShippingTime())+8*60*60;
                                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                                 sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
                                 sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
                                 String time1 = sdf.format(new Date(time * 1000));
                                 String time1 = sdf.format(new Date(time * 1000));

+ 1 - 2
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/user/AdminUserServiceImpl.java

@@ -547,9 +547,8 @@ public class AdminUserServiceImpl implements AdminUserService {
                                 }
                                 }
                                 tmp.setDangOrder(dangOrder);
                                 tmp.setDangOrder(dangOrder);
                                 tmp.setAccountId(shopAccount.getId());
                                 tmp.setAccountId(shopAccount.getId());
-                                Long time  = Long.parseLong(tmp.getShippingTime());
+                                Long time  = Long.parseLong(tmp.getShippingTime())+8*60*60;
                                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                                sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
                                 String time1 = sdf.format(new Date(time * 1000));
                                 String time1 = sdf.format(new Date(time * 1000));
                                 tmp.setShippingTime(time1);
                                 tmp.setShippingTime(time1);
                                 tmp.setDeleteFlag(0);
                                 tmp.setDeleteFlag(0);