From a2ada0db333425e95ebc688dc411921082ea9d6a Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Fri, 25 Oct 2024 11:23:31 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=8F=B0=E6=A1=8C=E5=B0=B1=E9=A4=90=E4=BA=BA?= =?UTF-8?q?=E6=95=B0=E7=AD=89=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/entity/TbShopTable.java | 7 +++++++ .../mpservice/MpShopTableService.java | 6 ++++++ .../mpservice/impl/MpShopTableServiceImpl.java | 17 +++++++++++++++++ .../cashierservice/service/CartService.java | 17 +++++++++-------- .../cashierservice/service/PayService.java | 14 ++------------ 5 files changed, 41 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopTable.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopTable.java index 8d1dca6..a4f2bcd 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopTable.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopTable.java @@ -5,6 +5,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; +import java.util.Date; @Data public class TbShopTable implements Serializable { @@ -53,6 +54,12 @@ public class TbShopTable implements Serializable { private Integer seatNum; private Integer autoClear; + private Date useTime; + private Date endTime; + private Integer productNum; + private BigDecimal totalAmount; + private BigDecimal realAmount; + private Integer useNum; diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/mpservice/MpShopTableService.java b/src/main/java/com/chaozhanggui/system/cashierservice/mpservice/MpShopTableService.java index cd13742..cc11b5a 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/mpservice/MpShopTableService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/mpservice/MpShopTableService.java @@ -17,4 +17,10 @@ public interface MpShopTableService extends IService { * @param tableId qrcode */ TbShopTable selectByQrcode(String tableId); + + /** + * 清除台桌状态 + * @param tableId 台桌id + */ + boolean clearTableState(String tableId); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/mpservice/impl/MpShopTableServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/mpservice/impl/MpShopTableServiceImpl.java index 85b7977..db06283 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/mpservice/impl/MpShopTableServiceImpl.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/mpservice/impl/MpShopTableServiceImpl.java @@ -25,4 +25,21 @@ public class MpShopTableServiceImpl extends ServiceImpl() .eq(TbShopTable::getQrcode, tableId)); } + + @Override + public boolean clearTableState(String tableId) { + TbShopTable shopTable = selectByQrcode(tableId); + if (shopTable.getAutoClear() != null && shopTable.getAutoClear() == 1) { + return update(new LambdaUpdateWrapper() + .eq(TbShopTable::getQrcode, tableId) + .set(TbShopTable::getUseTime, null) + .set(TbShopTable::getProductNum, 0) + .set(TbShopTable::getTotalAmount, 0) + .set(TbShopTable::getRealAmount, 0) + .set(TbShopTable::getUseNum, 0) + .set(TbShopTable::getStatus, TableConstant.ShopTable.State.CLEANING.getValue())); + }else { + return updateStateByQrcode(tableId, TableConstant.ShopTable.State.CLEANING); + } + } } 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 d6b5ece..97e86a1 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -1110,7 +1110,9 @@ public class CartService { // 去除餐位费信息 List outRecords = new ArrayList<>(); + int totalNum = 0; for (TbCashierCart cashierCart : cashierCartList) { + totalNum += cashierCart.getNumber(); if (!cashierCart.getProductId().equals("-999") && cashierCart.getIsVip().equals((byte) 1)) { List actInRecords = activateInRecordService.queryAllByVipIdAndShopIdAndProId( Integer.valueOf(tbShopUser.getId()), Integer.valueOf(orderInfo.getShopId()), Integer.valueOf(cashierCart.getProductId())); @@ -1143,12 +1145,6 @@ public class CartService { cashierCartList = cashierCartList.stream().filter(item -> !"-999".equals(item.getProductId())).collect(Collectors.toList()); - - // 删除旧的餐位费信息 -// if (shopEatTypeInfoDTO.isTakeout() && seatCartInfo != null) { -// cashierCartMapper.deleteByPrimaryKey(seatCartInfo.getId()); -// } - if (!CollectionUtils.isEmpty(outRecords)) outRecordMapper.insertBatch(outRecords); // 打印票据 @@ -1167,8 +1163,13 @@ public class CartService { } // 修改台桌状态 - if (!shopEatTypeInfoDTO.isTakeout() && StrUtil.isNotBlank(tableId)) { - mpShopTableService.updateStateByQrcode(tableId, TableConstant.ShopTable.State.USING); + if (!shopEatTypeInfoDTO.isTakeout() && StrUtil.isNotBlank(tableId) && shopTable != null) { + shopTable.setStatus(TableConstant.ShopTable.State.USING.getValue()); + shopTable.setProductNum(totalNum); + shopTable.setTotalAmount(totalAmount); + shopTable.setRealAmount(totalAmount); + shopTable.setSeatNum(seatNum); + mpShopTableService.updateById(shopTable); } // 发送mq消息 diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index e689d7f..1322c00 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -527,12 +527,7 @@ public class PayService { // 重置台桌状态 if (StrUtil.isNotBlank(orderInfo.getTableId())) { - TbShopTable shopTable = mpShopTableService.selectByQrcode(orderInfo.getTableId()); - if (shopTable.getAutoClear() != null && shopTable.getAutoClear() == 1) { - mpShopTableService.updateStateByQrcode(orderInfo.getTableId(), TableConstant.ShopTable.State.IDLE); - }else { - mpShopTableService.updateStateByQrcode(orderInfo.getTableId(), TableConstant.ShopTable.State.CLEANING); - } + mpShopTableService.clearTableState(orderInfo.getTableId()); } return Result.success(CodeEnum.SUCCESS, "1"); } @@ -1154,12 +1149,7 @@ public class PayService { // 重置台桌状态 if (StrUtil.isNotBlank(orderInfo.getTableId())) { - TbShopTable shopTable = mpShopTableService.selectByQrcode(orderInfo.getTableId()); - if (shopTable.getAutoClear() != null && shopTable.getAutoClear() == 1) { - mpShopTableService.updateStateByQrcode(orderInfo.getTableId(), TableConstant.ShopTable.State.IDLE); - }else { - mpShopTableService.updateStateByQrcode(orderInfo.getTableId(), TableConstant.ShopTable.State.CLEANING); - } + mpShopTableService.clearTableState(orderInfo.getTableId()); } return "SUCCESS"; From d442654c2f2580b1cf77ecc181e54998b5f33615 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Sat, 26 Oct 2024 09:16:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E6=9C=AA=E4=BC=A0=E9=80=92=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E4=B8=8D=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=A4=87?= =?UTF-8?q?=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/CartService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 97e86a1..1bb6ac7 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -1050,7 +1050,9 @@ public class CartService { orderInfo.setProductAmount(saleAmount); orderInfo.setIsBuyCoupon(isBuyYhq); orderInfo.setIsUseCoupon(isuseYhq); - orderInfo.setRemark(remark); + if (StrUtil.isNotBlank(remark)) { + orderInfo.setRemark(remark); + } orderInfo.setUserId(userId); if (hasNewInfo) { orderInfo.setPlaceNum(currentPlaceNum); @@ -1068,7 +1070,9 @@ public class CartService { orderInfo.setIsBuyCoupon(isBuyYhq); orderInfo.setIsUseCoupon(isuseYhq); orderInfo.setUserCouponAmount(couponAmount); - orderInfo.setRemark(remark); + if (StrUtil.isNotBlank(remark)) { + orderInfo.setRemark(remark); + } orderInfo.setUserId(userId); orderInfo.setPlaceNum(currentPlaceNum); orderInfo.setUseType(shopEatTypeInfoDTO.getUseType()); From 230225478344f2fcd225088159d01c4b1ae419d5 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Sat, 26 Oct 2024 14:27:49 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=82=B9=E5=8D=95=E5=8F=B0=E6=A1=8C=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E6=9C=AA=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chaozhanggui/system/cashierservice/service/CartService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1bb6ac7..6d7c2cd 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -1172,7 +1172,7 @@ public class CartService { shopTable.setProductNum(totalNum); shopTable.setTotalAmount(totalAmount); shopTable.setRealAmount(totalAmount); - shopTable.setSeatNum(seatNum); + shopTable.setSeatNum(orderInfo.getSeatCount()); mpShopTableService.updateById(shopTable); } From 1d2fdef344ceaec633db4a947470111303b5fba4 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Sat, 26 Oct 2024 14:35:27 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=82=B9=E5=8D=95=E5=8F=B0=E6=A1=8C=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E6=9C=AA=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chaozhanggui/system/cashierservice/service/CartService.java | 1 + 1 file changed, 1 insertion(+) 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 6d7c2cd..020f32d 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -1173,6 +1173,7 @@ public class CartService { shopTable.setTotalAmount(totalAmount); shopTable.setRealAmount(totalAmount); shopTable.setSeatNum(orderInfo.getSeatCount()); + shopTable.setUseNum(orderInfo.getSeatCount()); mpShopTableService.updateById(shopTable); } From 70f8dfd887fce3de7440c63c0c9e217382c43abd Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Sat, 26 Oct 2024 14:36:31 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=82=B9=E5=8D=95=E5=8F=B0=E6=A1=8C=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E6=9C=AA=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chaozhanggui/system/cashierservice/service/CartService.java | 1 + 1 file changed, 1 insertion(+) 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 020f32d..77e8159 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -1174,6 +1174,7 @@ public class CartService { shopTable.setRealAmount(totalAmount); shopTable.setSeatNum(orderInfo.getSeatCount()); shopTable.setUseNum(orderInfo.getSeatCount()); + shopTable.setUseTime(DateUtil.date()); mpShopTableService.updateById(shopTable); } From 8010ee3ffe5a3511777a8632e545c946a9231847 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Tue, 29 Oct 2024 10:52:04 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0registerType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/OrderService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 dc4c5ed..8008b70 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -464,8 +464,8 @@ public class OrderService { return Result.fail("订单不存在"); } - TbShopInfo tbShopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId())); - if (tbShopInfo == null) { + TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId())); + if (shopInfo == null) { return Result.fail("店铺不存在"); } @@ -504,10 +504,10 @@ public class OrderService { TbShopTable tbShopTable = shopTableMapper.selectQRcode(orderInfo.getTableId()); OrderVo orderVo = new OrderVo(); - orderVo.setName(tbShopInfo.getShopName()); + orderVo.setName(shopInfo.getShopName()); orderVo.setStatus(orderInfo.getStatus()); //TODO 增加商家二维码 - orderVo.setShopQrcode(tbShopInfo.getShopQrcode()); + orderVo.setShopQrcode(shopInfo.getShopQrcode()); orderVo.setDetails(list); orderVo.setOrderNo(orderInfo.getOrderNo()); orderVo.setTime(orderInfo.getCreatedAt()); @@ -526,8 +526,7 @@ public class OrderService { orderVo.setOutNumber(orderInfo.getOutNumber()); orderVo.setUseType(orderInfo.getUseType()); orderVo.setShopId(Integer.valueOf(orderInfo.getShopId())); - TbShopInfo shopInfo = mpShopInfoMapper.selectById(orderInfo.getShopId()); - orderVo.setQrcode(shopInfo == null ? null : shopInfo.getShopQrcode()); + orderVo.setQrcode(shopInfo.getShopQrcode()); Map map = new HashMap<>(); // 餐位费 map.put("seatFee", mealCashierCart); @@ -536,6 +535,7 @@ public class OrderService { map.putAll(BeanUtil.beanToMap(orderVo, false, false)); map.put("createdAt", DateUtil.formatDateTime(DateUtil.date(orderInfo.getCreatedAt()))); map.put("paidTime", orderInfo.getPaidTime() == null ? null : DateUtil.formatDateTime(DateUtil.date(orderInfo.getPaidTime()))); + map.put("registerType", shopInfo.getRegisterType()); return map; } }