From dfdeca9612d823e266603b10ea258bde7fce8e3c Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 2 Jul 2024 16:37:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=8F=91=E9=80=81create?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=EF=BC=8C=E5=A4=84=E7=90=86=E8=80=97=E6=9D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/CartService.java         | 7 +++++++
 .../system/cashierservice/service/LoginService.java        | 1 +
 2 files changed, 8 insertions(+)

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 08812ea..8a5f96a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -678,6 +678,7 @@ public class CartService {
                 orderInfo.setIsUseCoupon(isuseYhq);
 //                orderInfo.setRemark(StringUtils.isBlank(jsonObject.getString("remark"))?"":jsonObject.getString("remark"));
                 orderInfoMapper.updateByPrimaryKeySelective(orderInfo);
+
             } else {
                 orderInfo = getOrder(totalAmount, packAMount, shopTable, tbMerchantAccount.getId().toString(), jsonObject, originAmount);
                 orderInfo.setMerchantId(String.valueOf(tbMerchantAccount.getId()));
@@ -707,6 +708,12 @@ public class CartService {
                 redisUtil.saveMessage(RedisCst.OUT_NUMBER.concat(jsonObject.getString("shopId")), object.toString());
                 orderInfoMapper.insert(orderInfo);
                 orderId = orderInfo.getId();
+
+                // 发送mq消息
+                JSONObject jsonObject2=new JSONObject();
+                jsonObject2.put("orderId",orderInfo.getId());
+                jsonObject2.put("type","create");
+                producer.cons(jsonObject2.toString());
             }
             for (TbOrderDetail orderDetail : orderDetails) {
                 orderDetail.setOrderId(orderId);
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
index b45e52b..a36fb42 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
@@ -87,6 +87,7 @@ public class LoginService {
             shopOpenId.setOpenId(openId);
             shopOpenId.setCreateTime(DateUtil.date());
             shopOpenId.setShopId(Integer.valueOf(shopId));
+            shopOpenId.setStatus(1);
             shopOpenIdMapper.insert(shopOpenId);
         }
         return Result.success(CodeEnum.SUCCESS,shopMsg);