售后订单编号规则

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/ass/AssOrderinfoRepo.java

@@ -11,11 +11,4 @@ public interface AssOrderinfoRepo extends AbstractJpaRepo<AssOrderinfo, String>{
     @Query("from AssOrderinfo where vehicleId = ?1 and orderStatus = ?2 and orderType = ?3 ")
     AssOrderinfo findByVehicleIdAndOrderStatusAndOrderType(String vehicleId, AssOrderStatus orderStatus,
                                                            AssOrderType orderType);
-
-    @Query(
-            nativeQuery = true,
-            value = "select * from (select * from ASS_ORDERINFO where 1=1 order by id desc) where rownum <= 1"
-    )
-    AssOrderinfo getMaxId();
-
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/AbstractCommManager.java

@@ -2,10 +2,12 @@ package cn.com.taiji.ias.manager;
 
 import java.io.IOException;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
 import javax.servlet.http.HttpServletRequest;
 
+import cn.com.taiji.common.pub.StringTools;
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
 import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
 import org.apache.http.NoHttpResponseException;
@@ -149,20 +151,14 @@ public abstract class AbstractCommManager extends AbstractManager {
         return null;
     }
 
-    public String queryMaxId(int num) {
-//        获取当天时间
-        LocalDate nowDate = LocalDate.now();
-        DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-        String time = dateFormatter.format(nowDate);
-//        计算最大id值
-        AssOrderinfo maxOrder = orderinfoRepo.getMaxId();
-        if (maxOrder != null && maxOrder.getId().startsWith(time + ""))
-        {
-            String maxId = maxOrder.getId();
-            num = Integer.parseInt(maxId.replace(time, "")) + 1;
-            String.format("%05d",num);
-        }
-        return time + String.format("%05d",num);
+    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));
     }