From 5094cbf9b8d42efd458e7d2c440a517be9eeb613 Mon Sep 17 00:00:00 2001
From: 199901012 <hurui@shinwoten.com>
Date: Mon, 22 Mar 2021 22:13:41 +0800
Subject: [PATCH] =?UTF-8?q?'=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bweb/controller/HighCouponController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java b/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java
index b01bfde8..9b5ef465 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java
@@ -116,7 +116,7 @@ public class HighCouponController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOF_FOUND, "");
             }
 
-            String setCouponKey = DateUtil.date2String(new Date(), "yyyyMMddhhmmss");	//订单号生成  年月日小时分秒 + 5位随机数
+            String setCouponKey = DateUtil.date2String(new Date(), "yyyyMMddHHmmss");	//订单号生成  年月日小时分秒 + 5位随机数
             highCoupon.setCouponKey(setCouponKey);
             highCoupon.setCompanyId(merchant.getCompanyId());
             highCoupon.setOperatorId(userInfoModel.getSecUser().getId());
@@ -243,7 +243,7 @@ public class HighCouponController {
             approve.setObjectType(ApproveType.UP_SHELF_APPROVE.getType());
             approve.setObjectId(id);
             approve.setObjectName(coupon.getCouponName());
-            approve.setApproveSerialNo(DateUtil.date2String(new Date(), "MMddhhmmss") + ((Math.random()*9+1)*10000));
+            approve.setApproveSerialNo(DateUtil.date2String(new Date(), "yyyyMMddHHmmss");
             approve.setStatus(1);
             approve.setCreateTime(new Date());
             approve.setUpdateTime(new Date());