1

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

@@ -68,6 +68,9 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
             if(record.getTimeZoneOff() != null){
                 tradeTime = Dateutils.AddMinute(record.getTradeTime(),record.getTimeZoneOff());
             }
+            if(StringUtils.isNotBlank(record.getSnCode())){
+                record.setDownTypeStr(snCodeMap.get(record.getSnCode()));
+            }
             record.setCreateTime(tradeTime);
         }
         return page;

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

@@ -29,6 +29,7 @@ public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMa
         IncrementOrderMg incrementOrderMg = new IncrementOrderMg();
         BeanUtil.copyProperties(param,incrementOrderMg);
         incrementOrderMg.setId(null);
+        incrementOrderMg.setIncrementId(param.getId());
         incrementOrderMg.setOrderSn(Dateutils.getOrderSn());
         incrementOrderMg.setPayStatus(1);
         incrementOrderMg.setIncrementType(incrementType.getId());

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

@@ -27,6 +27,7 @@ import com.fdkankan.manage.mq.param.ScenePayStatusVo;
 import com.fdkankan.manage.mq.param.SceneRestStoreVo;
 import com.fdkankan.manage.service.*;
 import com.fdkankan.manage.thread.ThreadService;
+import com.fdkankan.manage.util.CameraUtils;
 import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.util.ProvinceUtils;
 import com.fdkankan.manage.util.SceneStatusUtil;
@@ -625,6 +626,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                     snCodeMap.put(num,cameraMap.get(cameraId));
                 }
             }
+            List<CameraDetail> cameraIds1 = cameraDetailService.getByCameraIds(cameraList.stream().map(Camera::getId).collect(Collectors.toList()));
+            for (CameraDetail cameraDetail : cameraIds1) {
+                snCodeMap.put(cameraMap.get(cameraDetail.getId()), CameraUtils.getCameraTypeStr(cameraDetail.getType()));
+            }
         }
 
         return snCodeMap;

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

@@ -185,22 +185,17 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
 
         for (int i = 0 ; i<param.getCount() ;i++) {
             UserIncrement userIncrement = new UserIncrement();
-            if(param.getId() != null){ //续费
-                 userIncrement = this.getById(param.getId());
-            }
             String date = DateUtil.date2String(new Date(), DateUtil.DEFAULT_DATE_FORMAT);
             userIncrement.setId(param.getId());
             userIncrement.setUserId(param.getUserId());
             userIncrement.setKeyWord(UUID.randomUUID().toString().replace("-", ""));
             userIncrement.setIsExpired(0);
-            userIncrement.setCreateTime(date);
             userIncrement.setUpdateTime(date);
-            userIncrement.setIncrementStartTime(date);
             userIncrement.setIncrementEndTime(param.getIncrementEndTime());
             userIncrement.setIncrementTypeId(param.getIncrementTypeId());
-            if(userIncrement.getId()!= null){
-                userIncrement.setOrderSn(userIncrement.getOrderSn() +","+incrementOrderMg.getOrderSn());
-            }else {
+            if(userIncrement.getId()== null){
+                userIncrement.setIncrementStartTime(date);
+                userIncrement.setCreateTime(date);
                 userIncrement.setOrderSn(incrementOrderMg.getOrderSn());
             }
             if(incrementType.getValidTimeType() == 0){