1

src/main/java/com/fdkankan/manage/service/impl/IncrementOrderServiceImpl.java

@@ -52,9 +52,16 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
                 tradeTime = Dateutils.AddMinute(record.getTradeTime(),record.getTimeZoneOff());
             }
             record.setCreateTime(tradeTime);
-            List<UserIncrement> userIncrements = userIncrementService.getByOrderSn(record.getOrderSn());
-            if(userIncrements!=null && userIncrements.size() >0){
-                UserIncrement userIncrement = userIncrements.get(0);
+            UserIncrement userIncrement = null;
+            if(record.getIncrementId() != null){
+                userIncrement = userIncrementService.getById(record.getIncrementId());
+            }else {
+                List<UserIncrement> userIncrements = userIncrementService.getByOrderSn(record.getOrderSn());
+                if(userIncrements!=null && userIncrements.size() >0){
+                    userIncrement = userIncrements.get(0);
+                }
+            }
+            if(userIncrement != null){
                 record.setIncrementStartTime(Dateutils.getDate(userIncrement.getIncrementStartTime()));
                 record.setIncrementEndTime(Dateutils.getDate(userIncrement.getIncrementEndTime()));
                 Camera camera = cameraService.getById(userIncrement.getCameraId());

src/main/java/com/fdkankan/manage/vo/response/IncrementOrderVo.java

@@ -6,6 +6,7 @@ import com.fdkankan.manage.util.Dateutils;
 import jdk.nashorn.internal.ir.annotations.Ignore;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.omg.CORBA.INTERNAL;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -98,6 +99,8 @@ public class IncrementOrderVo {
 
     @ExcelIgnore
     private Date incrementEndTime;
+    @ExcelIgnore
+    private Integer incrementId;
 
 
     public String getPayType() {