单宽完成提交

new-user/src/main/java/com/winsun/controller/PackageNewClothes.java

@@ -14,6 +14,7 @@ import com.winsun.constant.UserType;
 import com.winsun.mapper.*;
 import com.winsun.utils.IDCardUtil;
 import com.winsun.utils.PicturesUtil;
+import com.winsun.utils.ProduceIdUtil;
 import com.winsun.utils.XbkUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -195,10 +196,7 @@ public class PackageNewClothes {
         Date date = new Date();
         order.setCreateTime(date);
         order.setUserType(UserType.NEWCUSTOMER.getId());
-        SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd");
-        String format = yyyyMMdd.format(date);
-        String s = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
-        order.setOrderNumber("YRYM" + format + s);
+        order.setOrderNumber("YRYM" + ProduceIdUtil.getId());
         order.setHehuorenArea(sysUser.getSubstName());
         order.setHehuorenName(sysUser.getName());
         String schoolId = appMapper.selectSchoolId(partner);
@@ -302,10 +300,7 @@ public class PackageNewClothes {
         Date date = new Date();
         order.setCreateTime(date);
         order.setUserType(UserType.NEWCUSTOMER.getId());
-        SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd");
-        String format = yyyyMMdd.format(date);
-        String s = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
-        order.setOrderNumber("YRYM" + format + s);
+        order.setOrderNumber("YRYM" + ProduceIdUtil.getId());
         order.setHehuorenArea(sysUser.getSubstName());
         order.setHehuorenName(sysUser.getName());
         String schoolId = appMapper.selectSchoolId(partner);
@@ -426,10 +421,7 @@ public class PackageNewClothes {
         Date date = new Date();
         order.setCreateTime(date);
         order.setUserType(UserType.NEWCUSTOMER.getId());
-        SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd");
-        String format = yyyyMMdd.format(date);
-        String s = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
-        order.setOrderNumber("YRYM" + format + s);
+        order.setOrderNumber("YRYM" + ProduceIdUtil.getId());
         order.setHehuorenArea(sysUser.getSubstName());
         order.setHehuorenName(sysUser.getName());
         order.setHehuorenSchool(school.getSchoolName());

old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java

@@ -11,6 +11,7 @@ import com.winsun.constant.OrderStatus;
 import com.winsun.constant.UserType;
 import com.winsun.mapper.*;
 import com.winsun.utils.IDCardUtil;
+import com.winsun.utils.ProduceIdUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -329,10 +330,7 @@ public class PackageUpgradeController extends BaseController {
         order.setBusinessPackage(businessPackage);
         order.setUserId(userId);
         order.setUserType(UserType.OLDCUSTOMER.getId());
-        SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd");
-        String format = yyyyMMdd.format(date);
-        String s = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
-        order.setOrderNumber("YRYM" + format + s);
+        order.setOrderNumber("YRYM" + ProduceIdUtil.getId());
         order.setHehuorenArea(sysUser.getSubstName());
         order.setHehuorenName(sysUser.getName());
         String schoolId = appMapper.selectSchoolId(partner);
@@ -350,7 +348,7 @@ public class PackageUpgradeController extends BaseController {
             String id1 = uuid1.split("-")[0] + uuid1.split("-")[1];
             String s1 = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
             order.setId(id1);
-            order.setOrderNumber("YRYM" + format + s1);
+            order.setOrderNumber("YRYM" + ProduceIdUtil.getId());
             order.setUserType(UserType.YCTK.getId());
             order.setAddress(addRess);
             order.setBusinessPackage("天翼羊城通手机卡业务");