Skip to content

G
gdtel-gztel-school-center
Commit e9ebfe29 by 黄森林
Options

单宽完成提交

parent e6acf8ea
Showing with 7 additions and 17 deletions
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
...@@ -14,6 +14,7 @@ import com.winsun.constant.UserType; ...@@ -14,6 +14,7 @@ import com.winsun.constant.UserType;
import com.winsun.mapper.*; import com.winsun.mapper.*;
import com.winsun.utils.IDCardUtil; import com.winsun.utils.IDCardUtil;
import com.winsun.utils.PicturesUtil; import com.winsun.utils.PicturesUtil;
import com.winsun.utils.ProduceIdUtil;
import com.winsun.utils.XbkUtil; import com.winsun.utils.XbkUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -195,10 +196,7 @@ public class PackageNewClothes { ...@@ -195,10 +196,7 @@ public class PackageNewClothes {
Date date = new Date(); Date date = new Date();
order.setCreateTime(date); order.setCreateTime(date);
order.setUserType(UserType.NEWCUSTOMER.getId()); order.setUserType(UserType.NEWCUSTOMER.getId());
SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd"); order.setOrderNumber("YRYM" + ProduceIdUtil.getId());
String format = yyyyMMdd.format(date);
String s = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
order.setOrderNumber("YRYM" + format + s);
order.setHehuorenArea(sysUser.getSubstName()); order.setHehuorenArea(sysUser.getSubstName());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName());
String schoolId = appMapper.selectSchoolId(partner); String schoolId = appMapper.selectSchoolId(partner);
...@@ -302,10 +300,7 @@ public class PackageNewClothes { ...@@ -302,10 +300,7 @@ public class PackageNewClothes {
Date date = new Date(); Date date = new Date();
order.setCreateTime(date); order.setCreateTime(date);
order.setUserType(UserType.NEWCUSTOMER.getId()); order.setUserType(UserType.NEWCUSTOMER.getId());
SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd"); order.setOrderNumber("YRYM" + ProduceIdUtil.getId());
String format = yyyyMMdd.format(date);
String s = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
order.setOrderNumber("YRYM" + format + s);
order.setHehuorenArea(sysUser.getSubstName()); order.setHehuorenArea(sysUser.getSubstName());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName());
String schoolId = appMapper.selectSchoolId(partner); String schoolId = appMapper.selectSchoolId(partner);
...@@ -426,10 +421,7 @@ public class PackageNewClothes { ...@@ -426,10 +421,7 @@ public class PackageNewClothes {
Date date = new Date(); Date date = new Date();
order.setCreateTime(date); order.setCreateTime(date);
order.setUserType(UserType.NEWCUSTOMER.getId()); order.setUserType(UserType.NEWCUSTOMER.getId());
SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd"); order.setOrderNumber("YRYM" + ProduceIdUtil.getId());
String format = yyyyMMdd.format(date);
String s = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
order.setOrderNumber("YRYM" + format + s);
order.setHehuorenArea(sysUser.getSubstName()); order.setHehuorenArea(sysUser.getSubstName());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName());
order.setHehuorenSchool(school.getSchoolName()); order.setHehuorenSchool(school.getSchoolName());
......
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
...@@ -11,6 +11,7 @@ import com.winsun.constant.OrderStatus; ...@@ -11,6 +11,7 @@ import com.winsun.constant.OrderStatus;
import com.winsun.constant.UserType; import com.winsun.constant.UserType;
import com.winsun.mapper.*; import com.winsun.mapper.*;
import com.winsun.utils.IDCardUtil; import com.winsun.utils.IDCardUtil;
import com.winsun.utils.ProduceIdUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -329,10 +330,7 @@ public class PackageUpgradeController extends BaseController { ...@@ -329,10 +330,7 @@ public class PackageUpgradeController extends BaseController {
order.setBusinessPackage(businessPackage); order.setBusinessPackage(businessPackage);
order.setUserId(userId); order.setUserId(userId);
order.setUserType(UserType.OLDCUSTOMER.getId()); order.setUserType(UserType.OLDCUSTOMER.getId());
SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd"); order.setOrderNumber("YRYM" + ProduceIdUtil.getId());
String format = yyyyMMdd.format(date);
String s = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
order.setOrderNumber("YRYM" + format + s);
order.setHehuorenArea(sysUser.getSubstName()); order.setHehuorenArea(sysUser.getSubstName());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName());
String schoolId = appMapper.selectSchoolId(partner); String schoolId = appMapper.selectSchoolId(partner);
...@@ -350,7 +348,7 @@ public class PackageUpgradeController extends BaseController { ...@@ -350,7 +348,7 @@ public class PackageUpgradeController extends BaseController {
String id1 = uuid1.split("-")[0] + uuid1.split("-")[1]; String id1 = uuid1.split("-")[0] + uuid1.split("-")[1];
String s1 = String.valueOf((int) ((Math.random() * 9 + 1) * 1000)); String s1 = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
order.setId(id1); order.setId(id1);
order.setOrderNumber("YRYM" + format + s1); order.setOrderNumber("YRYM" + ProduceIdUtil.getId());
order.setUserType(UserType.YCTK.getId()); order.setUserType(UserType.YCTK.getId());
order.setAddress(addRess); order.setAddress(addRess);
order.setBusinessPackage("天翼羊城通手机卡业务"); order.setBusinessPackage("天翼羊城通手机卡业务");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment