From 6a6ce8ef1cf660155e0336e2e2b78aaa85b93304 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 26 Aug 2024 14:23:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?=
=?UTF-8?q?=E6=89=93=E5=8D=B0=E8=8F=9C=E5=93=81=E5=B0=8F=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/cashierservice/service/OrderService.java | 4 +++-
src/main/resources/mapper/TbOrderInfoMapper.xml | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
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 8425ee4..d8793cb 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -594,6 +594,7 @@ public class OrderService {
orderInfo.setProductAmount(saleAmount);
orderInfo.setTradeDay(DateUtils.getDay());
orderInfo.setUserId(orderVo.getUserId());
+ orderInfo.setUseType(StrUtil.isNotBlank(orderVo.getTableId()) ? "postPay" : "afterPay");
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
} else {
orderInfo = new TbOrderInfo(orderNo, totalAmount, packAMount, totalAmount, saleAmount, totalAmount, feeAmount, "",
@@ -602,9 +603,10 @@ public class OrderService {
orderInfo.setMasterId(masterId);
orderInfo.setRemark(orderVo.getRemark());
orderInfo.setUserId(orderVo.getUserId());
+ orderInfo.setUseType(StrUtil.isNotBlank(orderVo.getTableId()) ? "postPay" : "afterPay");
+
if (StrUtil.isNotBlank(orderVo.getTableId())) {
orderInfo.setTableId(orderVo.getTableId());
- orderInfo.setUseType("postPay");
}
if (Objects.nonNull(tbToken)){
orderInfo.setTokenId(tbToken.getId());
diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml
index 3e33380..7d233fd 100644
--- a/src/main/resources/mapper/TbOrderInfoMapper.xml
+++ b/src/main/resources/mapper/TbOrderInfoMapper.xml
@@ -520,6 +520,10 @@
staff_id = #{staffId,jdbcType=INTEGER},
+
+
+ use_type = #{useType,jdbcType=VARCHAR},
+
where id = #{id,jdbcType=INTEGER}