调整

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/AbstractCommManager.java

@@ -1,8 +1,11 @@
 package cn.com.taiji.managew.manager;
 
 import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.concurrent.Callable;
 
+import cn.com.taiji.common.pub.StringTools;
 import cn.com.taiji.common.web.util.WebTools;
 import cn.com.taiji.core.manager.cache.RedisCacheManager;
 import cn.com.taiji.core.model.comm.protocol.*;
@@ -218,4 +221,14 @@ public abstract class AbstractCommManager extends RedisCacheManager {
         }
     }
 
+    public String createOrderNo(String agentId) {
+        return StringTools
+                .hasText(agentId)
+                ? LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))
+                + agentId
+                + (int) ((Math.random() * 9 + 1) * Math.pow(10, 6))
+                : LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"))
+                + (int) ((Math.random() * 9 + 1) * Math.pow(10, 5));
+    }
+
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/DeviceResumeManagerImpl.java

@@ -1,55 +1,46 @@
 package cn.com.taiji.managew.manager.ass;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
 
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.common.pub.BeanTools;
-import cn.com.taiji.core.entity.ass.AssDeviceResume;
-import cn.com.taiji.core.entity.dict.ass.AssOrderStatus;
-import cn.com.taiji.core.entity.dict.ass.AssOrderStep;
-import cn.com.taiji.core.entity.dict.basic.*;
-import cn.com.taiji.core.entity.user.AccountInfo;
-import cn.com.taiji.core.manager.tools.issue.IssueTools;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.ResignRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.order.SignQueryResponse;
-import cn.com.taiji.core.repo.jpa.ass.AssDeviceResumeRepo;
-import cn.com.taiji.core.repo.jpa.user.AccountInfoRepo;
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.common.model.dao.Pagination;
-import cn.com.taiji.core.entity.ass.AssDeviceLoss;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
+import cn.com.taiji.common.pub.BeanTools;
+import cn.com.taiji.core.entity.ass.AssDeviceResume;
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
 import cn.com.taiji.core.entity.basic.QtkCardInfo;
 import cn.com.taiji.core.entity.basic.QtkCustomerInfo;
 import cn.com.taiji.core.entity.basic.QtkObuInfo;
 import cn.com.taiji.core.entity.basic.QtkVehicleInfo;
+import cn.com.taiji.core.entity.dict.ass.AssOrderStatus;
+import cn.com.taiji.core.entity.dict.ass.AssOrderStep;
 import cn.com.taiji.core.entity.dict.ass.AssOrderType;
-import cn.com.taiji.core.entity.dict.log.OperateType;
-import cn.com.taiji.core.entity.user.Staff;
-import cn.com.taiji.core.model.comm.protocol.ias.ass.DeviceLossRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.ass.DeviceLossResponse;
-import cn.com.taiji.core.repo.jpa.ass.AssDeviceLossRepo;
+import cn.com.taiji.core.entity.dict.basic.CardStatus;
+import cn.com.taiji.core.entity.dict.basic.CardType;
+import cn.com.taiji.core.entity.dict.basic.ObuStatus;
+import cn.com.taiji.core.entity.dict.basic.VehicleType;
+import cn.com.taiji.core.entity.user.AccountInfo;
+import cn.com.taiji.core.manager.tools.issue.IssueTools;
+import cn.com.taiji.core.repo.jpa.ass.AssDeviceResumeRepo;
 import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkCardInfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkCustomerInfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkObuInfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkVehicleInfoRepo;
+import cn.com.taiji.core.repo.jpa.user.AccountInfoRepo;
 import cn.com.taiji.core.repo.jpa.user.StaffRepo;
-import cn.com.taiji.managew.dto.ass.*;
-import cn.com.taiji.managew.manager.AbstractManagewManager;
-import cn.com.taiji.managew.model.ass.AssDeviceLossModel;
-import cn.com.taiji.managew.model.ass.AssOrderInfoModel;
-import cn.com.taiji.managew.repo.jpa.request.ass.AssOrderInfoPageRequest;
+import cn.com.taiji.managew.dto.ass.DeviceResumeAddRequestDTO;
+import cn.com.taiji.managew.dto.ass.DeviceResumeAddResponseDTO;
+import cn.com.taiji.managew.dto.ass.DeviceResumeViewRequestDTO;
+import cn.com.taiji.managew.dto.ass.DeviceResumeViewResponseDTO;
+import cn.com.taiji.managew.manager.AbstractCommManager;
 
 @Service
-public class DeviceResumeManagerImpl extends AbstractManagewManager implements DeviceResumeManager {
+public class DeviceResumeManagerImpl extends AbstractCommManager implements DeviceResumeManager {
 
     @Autowired
     private QtkVehicleInfoRepo vehicleInfoRepo;
@@ -176,6 +167,7 @@ public class DeviceResumeManagerImpl extends AbstractManagewManager implements D
         AccountInfo accountInfo = accountInfoRepo.findByMobile(reqDto.getCustomerTel());
         AssOrderinfo orderinfo = new AssOrderinfo();
         BeanTools.copyProperties(reqDto, orderinfo);
+        orderinfo.setOrderNo(createOrderNo(cardInfo.getAgencyId()));
         orderinfo.setOrderType(AssOrderType.DEVICE_RESUME);
         orderinfo.setOrderSource(reqDto.getOrderSource());
         orderinfo.setAgencyId(cardInfo.getAgencyId());
@@ -185,6 +177,7 @@ public class DeviceResumeManagerImpl extends AbstractManagewManager implements D
         orderinfo.setApplyTime(LocalDateTime.now());
         orderinfo.setOpenId(accountInfo.getOpenId());
         orderinfo.setCustomerId(cardInfo.getCustomerId());
+        orderinfo.setCustomerIdType(customerInfo.getCustomerIdType());
         orderinfo.setCustomerName(reqDto.getCustomerName());
         orderinfo.setCustomerTel(reqDto.getCustomerTel());
         orderinfo.setUserType(customerInfo.getUserType());