调整订单编号

src/main/java/com/minpay/common/action/GamePayAction.java

@@ -9,6 +9,7 @@ import java.util.List;
 import com.min.util.DateUtil;
 import com.min.util.OffSetUtil;
 import com.minpay.common.bean.User;
+import com.minpay.common.constant.Constant;
 import com.minpay.common.format.IFormatService;
 import com.minpay.common.service.IPublicService;
 import com.minpay.common.util.CommonUtil;
@@ -134,7 +135,8 @@ public class GamePayAction implements IMINAction {
 		//获取操作员
 		User user = session.getUser();
 		//获取订单主键
-		String ordId = Service.lookup(IPublicService.class).getSequence("VM_ORDER_INF_ID");
+		//String ordId = Service.lookup(IPublicService.class).getSequence("VM_ORDER_INF_ID");
+		String ordId = Constant.getOrderId();
 		//初始化订单数据
 		VmOrderInf ordInf = new VmOrderInf();
 		ordInf.setId(ordId);						//订单编号

src/main/java/com/minpay/common/constant/Constant.java

@@ -1,11 +1,13 @@
 package com.minpay.common.constant;
 
 import com.minpay.common.service.IPropertiesService;
+import com.minpay.common.util.DateUtil;
 import com.startup.minpay.frame.constant.IMINBusinessConstant;
 import com.startup.minpay.frame.service.base.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 
 /**
@@ -891,6 +893,38 @@ public class Constant implements IMINBusinessConstant {
 	public static final String PROEQUREL_STT_01 = "01";
 	public static final String PROEQUREL_STT_02 = "02";
 	public static final String EQUIPMENT_STT_03= "03";
+
+	/**
+	 * 生成随机数
+	 * @param length
+	 * @return
+	 */
+	public static String getRandomNickname(int length) {
+		String val = "";
+		Random random = new Random();
+		for (int i = 0; i < length; i++) {
+			val += String.valueOf(random.nextInt(10));
+		}
+		return val;
+	}
+	/**
+	 * 生成订单号
+	 * @return
+	 */
+	public static String getOrderId() {
+		String val = "";
+		//获取当前时间
+		String time = DateUtil.getCurrentDateTimeString();
+		String sj = getRandomNickname(6);
+		val = time.concat(sj);
+		return val;
+	}
+
+
+
+
+
+
 }
 
 

src/main/java/com/minpay/common/service/impl/DrawServiceImpl.java

@@ -1,6 +1,7 @@
 package com.minpay.common.service.impl;
 
 import com.minpay.common.bean.DrawDto;
+import com.minpay.common.constant.Constant;
 import com.minpay.common.exception.BusinessCodeException;
 import com.minpay.common.service.IAccountService;
 import com.minpay.common.service.IDrawService;
@@ -75,8 +76,8 @@ public class DrawServiceImpl implements IDrawService {
             BigDecimal bigUse = new BigDecimal(useOrderId);
             useOrderId = bigUse.setScale(0, BigDecimal.ROUND_HALF_DOWN).toString();
         }else{
-            String ordid = getRandomNickname(10);
-            System.out.println("生成随机数字10位数：" + getRandomNickname(10));
+            String ordid = Constant.getRandomNickname(10);
+            System.out.println("生成随机数字10位数：" + ordid);
             useOrderId = ordid;
         }
 
@@ -240,13 +241,4 @@ public class DrawServiceImpl implements IDrawService {
     }
 
 
-    public static String getRandomNickname(int length) {
-        String val = "";
-        Random random = new Random();
-        for (int i = 0; i < length; i++) {
-            val += String.valueOf(random.nextInt(10));
-        }
-        return val;
-    }
-
 }

src/main/java/com/minpay/common/service/impl/OrderServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Random;
 
 import com.min.util.CommonUtil;
 import com.minpay.common.bean.User;
+import com.minpay.common.constant.Constant;
 import com.minpay.common.exception.BusinessCodeException;
 import com.minpay.common.service.IOrderService;
 import com.minpay.common.service.IPropertiesService;
@@ -59,7 +60,8 @@ public class OrderServiceImpl implements IOrderService {
 		}
 		
 		//获取订单主键
-		String ordId = Service.lookup(IPublicService.class).getSequence("VM_ORDER_INF_ID");
+		//String ordId = Service.lookup(IPublicService.class).getSequence("VM_ORDER_INF_ID");
+		String ordId = Constant.getOrderId();
 		//初始化订单数据
 		VmOrderInf ordInf = new VmOrderInf();
 		ordInf.setId(ordId);						//订单编号

src/main/java/com/minpay/shouhuo/orderaction/PayManageAction.java

@@ -2,6 +2,7 @@ package com.minpay.shouhuo.orderaction;
 
 import com.min.util.DateUtil;
 import com.minpay.common.bean.User;
+import com.minpay.common.constant.Constant;
 import com.minpay.common.exception.BusinessCodeException;
 import com.minpay.common.pay.ShouhuoPay;
 import com.minpay.common.pay.bean.Huilianpay;
@@ -100,7 +101,8 @@ public class PayManageAction implements IMINAction {
 
 		//创建订单
 		//获取订单主键
-		String ordId = Service.lookup(IPublicService.class).getSequence("VM_ORDER_INF_ID");
+		//String ordId = Service.lookup(IPublicService.class).getSequence("VM_ORDER_INF_ID");
+		String ordId = Constant.getOrderId();
 		//初始化订单数据
 		VmOrderInf ordInf = new VmOrderInf();
 		ordInf.setId(ordId);						//订单编号