From 4d7e6c3650c1693bdceb576e3706fb4d9bc05121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Wed, 19 Jun 2024 16:40:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8D=B0=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=96=E9=A4=90=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/entity/vo/OrderVo.java     |  2 +
 .../cashierservice/service/CartService.java   | 41 ++++++++++++++++++-
 .../cashierservice/service/OrderService.java  |  1 +
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java
index bfa60a1..03ee617 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java
@@ -35,4 +35,6 @@ public class OrderVo {
 
     private BigDecimal totalNumber;
 
+    private String outNumber;
+
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
index 94db48d..a0d1540 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -428,7 +428,25 @@ public class CartService {
                 orderInfo.setIsBuyCoupon(isBuyYhq);
                 orderInfo.setIsUseCoupon(isuseYhq);
                 orderInfo.setUserCouponAmount(couponAmount);
-//                orderInfo.setRemark(StringUtils.isBlank(jsonObject.getString("remark"))?"":jsonObject.getString("remark"));
+
+                JSONObject object=new JSONObject();
+                String outNumber= redisUtil.getMessage(RedisCst.OUT_NUMBER.concat(jsonObject.getString("shopId")));
+                Integer number=1;
+                if(Objects.isNull(outNumber)){
+                    object.put("outNumber",number);
+                    object.put("times",DateUtils.getDay());
+                }else {
+                    object=JSONObject.parseObject(outNumber);
+                    if(object.getString("times").equals(DateUtils.getDay())){
+                        number=object.getInteger("outNumber")+1;
+                        object.put("outNumber",number);
+                    }else {
+                        object.put("outNumber",number);
+                        object.put("times",DateUtils.getDay());
+                    }
+                }
+                orderInfo.setOutNumber(number+"");
+                redisUtil.saveMessage(RedisCst.OUT_NUMBER.concat(jsonObject.getString("shopId")),object.toString());
                 orderInfoMapper.insert(orderInfo);
                 orderId = orderInfo.getId();
             }
@@ -718,6 +736,27 @@ public class CartService {
                 orderInfo.setIsBuyCoupon(isBuyYhq);
                 orderInfo.setIsUseCoupon(isuseYhq);
                 orderInfo.setUserCouponAmount(couponAmount);
+
+                JSONObject object=new JSONObject();
+                String outNumber= redisUtil.getMessage(RedisCst.OUT_NUMBER.concat(jsonObject.getString("shopId")));
+                Integer number=1;
+                if(Objects.isNull(outNumber)){
+                    object.put("outNumber",number);
+                    object.put("times",DateUtils.getDay());
+                }else {
+                    object=JSONObject.parseObject(outNumber);
+                    if(object.getString("times").equals(DateUtils.getDay())){
+                        number=object.getInteger("outNumber")+1;
+                        object.put("outNumber",number);
+                    }else {
+                        object.put("outNumber",number);
+                        object.put("times",DateUtils.getDay());
+                    }
+                }
+                orderInfo.setOutNumber(number+"");
+                redisUtil.saveMessage(RedisCst.OUT_NUMBER.concat(jsonObject.getString("shopId")),object.toString());
+
+
                 orderInfoMapper.insert(orderInfo);
                 orderId = orderInfo.getId();
             }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index 9641f92..50015b5 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -207,6 +207,7 @@ public class OrderService {
         orderVo.setOrderType(orderInfo.getOrderType());
         orderVo.setOrderId(orderInfo.getId());
         orderVo.setSendType(orderInfo.getSendType());
+        orderVo.setOutNumber(orderInfo.getOutNumber());
 
         return Result.success(CodeEnum.ENCRYPT, orderVo);
     }