lyhzzz преди 2 години
родител
ревизия
d081ccb22d

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

@@ -10,6 +10,7 @@ import com.fdkankan.manage.entity.IncrementOrder;
 import com.fdkankan.manage.mapper.IIncrementOrderMapper;
 import com.fdkankan.manage.service.IExcelService;
 import com.fdkankan.manage.service.IIncrementOrderService;
+import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.vo.request.OrderParam;
 import com.fdkankan.manage.vo.response.IncrementOrderVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +38,11 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         CacheUtil.orderParam = param;
         Page<IncrementOrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         for (IncrementOrderVo record : page.getRecords()) {
-            record.setCreateTime(record.getTradeTime());
+            String tradeTime = record.getTradeTime();
+            if(record.getTimeZoneOff() != null){
+                tradeTime = Dateutils.AddMinute(record.getTradeTime(),record.getTimeZoneOff());
+            }
+            record.setCreateTime(tradeTime);
         }
         return PageInfo.PageInfo(page);
     }

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

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