From 5c4ebfecff7daf87e83ff85ee724d64ac7aa7cf0 Mon Sep 17 00:00:00 2001
From: Penny <2500338766@qq.com>
Date: Mon, 15 May 2023 23:44:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E9=95=BF=E5=BA=A6=E9=97=AE=E9=A2=98=EF=BC=8C=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E6=B3=A8=E9=87=8A=E9=98=B2=E9=87=8D=E5=A4=8D=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bnyer/common/core/utils/OrderUtil.java    | 6 +++---
 .../main/java/com/bnyer/order/bean/dto/AddVipOrderDto.java  | 2 +-
 .../java/com/bnyer/pay/controller/UnifiedPayController.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/OrderUtil.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/OrderUtil.java
index 562ad5b..2c5ade2 100644
--- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/OrderUtil.java
+++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/OrderUtil.java
@@ -7,10 +7,10 @@ import java.util.Random;
 public class OrderUtil {
 
     /**
-     * 生成流水（不超过32位）
+     * 生成流水（不超过40位）
      *
      * @frontStr 费用类型 RV=充值会员
-     * @return 2费用类型+14时间+2客户端类型+11userId+3随机位
+     * @return 2费用类型+14时间+2客户端类型+19userId+3随机位
      */
     public static String getOrderNo(String frontStr, Date curTime, String userClientType, String userId) {
         SimpleDateFormat simple = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -25,6 +25,6 @@ public class OrderUtil {
     }
 
     public static void main(String[] args) {
-        System.out.println(getOrderNo("RV",new Date(),"DU","12345678910"));
+        System.out.println(getOrderNo("RV",new Date(),"DU","1234567891012345697"));
     }
 }
diff --git a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/bean/dto/AddVipOrderDto.java b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/bean/dto/AddVipOrderDto.java
index 4913664..f22fe95 100644
--- a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/bean/dto/AddVipOrderDto.java
+++ b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/bean/dto/AddVipOrderDto.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 public class AddVipOrderDto extends BaseDto<VipOrder> implements Serializable {
 
-    @NotBlank(message = "手机号不能为空！")
+    //@NotBlank(message = "手机号不能为空！")
     @ApiModelProperty(value="手机号")
     private String phone;
 
diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/controller/UnifiedPayController.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/controller/UnifiedPayController.java
index 1296451..6086845 100644
--- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/controller/UnifiedPayController.java
+++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/controller/UnifiedPayController.java
@@ -38,7 +38,7 @@ public class UnifiedPayController {
     @Autowired
     private UnifiedPayService unifiedPayService;
 
-    @LimitRepeatRequest(bodyAllParam = true, message = "您的订单已提交,请勿频繁操作")
+    //@LimitRepeatRequest(bodyAllParam = true, message = "您的订单已提交,请勿频繁操作")
     @PostMapping("/unifiedOrder")
     @Operation(summary = "统一下单，并生成支付订单" , description = "生成支付订单,返回前端支付所需参数")
     public R<UnifiedOrderVo> unifiedOrder(@Valid @RequestBody UnifiedOrderDto dto, HttpServletRequest request){