Ver código fonte

修改工具类

杨杰 6 anos atrás
pai
commit
11d797c1b7

+ 2 - 4
src/main/java/com/llisoft/service/pay/service/OrderService.java

@@ -1,6 +1,5 @@
 package com.llisoft.service.pay.service;
 
-import java.util.Date;
 import java.util.Objects;
 
 import org.slf4j.Logger;
@@ -10,10 +9,9 @@ import org.springframework.stereotype.Service;
 
 import com.llisoft.common.exception.MtaException;
 import com.llisoft.common.util.BeanUtil;
-import com.llisoft.common.util.DateUtil;
+import com.llisoft.common.util.CodeUtil;
 import com.llisoft.common.util.HttpUtil;
 import com.llisoft.common.util.JsonUtil;
-import com.llisoft.common.util.RandomUtil;
 import com.llisoft.service.pay.dao.OrderDao;
 import com.llisoft.service.pay.entity.App;
 import com.llisoft.service.pay.entity.Order;
@@ -55,7 +53,7 @@ public class OrderService {
 			throw new MtaException("appKey不存在: " + appKey);
 		}
 		// 生成订单号, 当前时间+5位随机数
-		String orderNum = DateUtil.formatMillisecond(new Date()) + RandomUtil.getRandomInt(5);
+		String orderNum = CodeUtil.time();
 		if(Objects.isNull(orderTitle) || orderTitle.trim().isEmpty()) {
 			orderTitle = app.getAppName(); // 没有传title时使用业务名称
 		}

+ 2 - 2
src/main/java/com/llisoft/service/pay/service/PayService.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.llisoft.common.exception.MtaException;
-import com.llisoft.common.util.RandomUtil;
+import com.llisoft.common.util.CodeUtil;
 import com.llisoft.service.pay.dao.ItemDao;
 import com.llisoft.service.pay.entity.Item;
 import com.llisoft.service.pay.entity.Order;
@@ -68,7 +68,7 @@ public class PayService {
 	 * @return 返回支付跳转地址
 	 */
 	public String add(int orderId, byte payType){
-		String payNum = String.valueOf(System.currentTimeMillis()) + RandomUtil.getRandomInt(5);
+		String payNum = CodeUtil.uuid();
 		Item pay = new Item();
 		pay.setPayNum(payNum);
 		pay.setPayType(payType);