Explorar o código

国际服时区问题

lyhzzz %!s(int64=2) %!d(string=hai) anos
pai
achega
a831bdbb80

+ 6 - 1
src/main/java/com/fdkankan/manage/service/impl/DownloadOrderServiceImpl.java

@@ -12,6 +12,7 @@ import com.fdkankan.manage.entity.ScenePlus;
 import com.fdkankan.manage.entity.ScenePro;
 import com.fdkankan.manage.mapper.IDownloadOrderMapper;
 import com.fdkankan.manage.service.*;
+import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.vo.request.OrderParam;
 import com.fdkankan.manage.vo.response.DownOrderVo;
 import org.apache.commons.lang3.StringUtils;
@@ -63,7 +64,11 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
             if(StringUtils.isNotBlank(record.getSceneNum())){
                 record.setSnCode(snCodeMap.get(record.getSceneNum()));
             }
-            record.setCreateTime(record.getTradeTime());
+            String tradeTime = record.getTradeTime();
+            if(record.getTimeZoneOff() != null){
+                tradeTime = Dateutils.AddMinute(record.getTradeTime(),record.getTimeZoneOff());
+            }
+            record.setCreateTime(tradeTime);
         }
         return page;
     }

+ 20 - 0
src/main/java/com/fdkankan/manage/util/Dateutils.java

@@ -160,4 +160,24 @@ public class Dateutils {
         return endTime +" 23:59:59";
     }
 
+    public static final String DEF_FMT = "yyyy-MM-dd HH:mm:ss";
+
+    public static String AddMinute(String date, Integer minute){
+        SimpleDateFormat sdf = new SimpleDateFormat(DEF_FMT);
+        try {
+            Date time =  sdf.parse(date);
+            return AddMinute(time,minute);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return date;
+    }
+
+    public static String AddMinute(Date date, Integer minute){
+        SimpleDateFormat sdf = new SimpleDateFormat(DEF_FMT);
+        Calendar nowTime = Calendar.getInstance();
+        nowTime.setTime(date);
+        nowTime.add(Calendar.MINUTE, ~minute);
+        return sdf.format(nowTime.getTime());
+    }
 }

+ 1 - 0
src/main/java/com/fdkankan/manage/vo/response/DownOrderVo.java

@@ -42,6 +42,7 @@ public class DownOrderVo {
     @ExcelProperty("付款状态")
     private String payStatus;           //付款状态(状态,0或-1表示未付款,-2表示已退款,1表示已付款
 
+    private Integer timeZoneOff;
 
     public String getPayType() {
         switch (payType){