Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

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());