czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

支付修改

Browse Source
This commit is contained in:
SongZhang
2024-10-10 11:14:01 +08:00
parent 2a398bedde
commit f893e2e3bf
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
View File

@@ -1144,7 +1144,7 @@ public class CartService {
} }
cashierCart.setUpdatedAt(System.currentTimeMillis()); cashierCart.setUpdatedAt(System.currentTimeMillis());
cashierCart.setOrderId(orderId + ""); cashierCart.setOrderId(orderId + "");
if (!shopEatTypeInfoDTO.isDineInAfter()) { if (TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId()) && !shopEatTypeInfoDTO.isDineInAfter()) {
cashierCart.setStatus("closed"); cashierCart.setStatus("closed");
} }
cashierCart.setPlaceNum(cashierCart.getPlaceNum() == null ? currentPlaceNum : cashierCart.getPlaceNum()); cashierCart.setPlaceNum(cashierCart.getPlaceNum() == null ? currentPlaceNum : cashierCart.getPlaceNum());

6
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -468,7 +468,7 @@ public class PayService {
int cartCount = mpCashierCartMapper.update(null, new LambdaUpdateWrapper<TbCashierCart>() int cartCount = mpCashierCartMapper.update(null, new LambdaUpdateWrapper<TbCashierCart>()
.eq(TbCashierCart::getOrderId, orderId) .eq(TbCashierCart::getOrderId, orderId)
.eq(TbCashierCart::getUseType, orderInfo.getUseType()) .eq(TbCashierCart::getUseType, orderInfo.getUseType())
.eq(TbCashierCart::getStatus, "create") .in(TbCashierCart::getStatus, "create", "closed")
.set(TbCashierCart::getStatus, "final")); .set(TbCashierCart::getStatus, "final"));
mpOrderDetailMapper.update(null, new LambdaUpdateWrapper<TbOrderDetail>().eq(TbOrderDetail::getId, orderId) mpOrderDetailMapper.update(null, new LambdaUpdateWrapper<TbOrderDetail>().eq(TbOrderDetail::getId, orderId)
@@ -1076,7 +1076,7 @@ public class PayService {
int cartCount = mpCashierCartMapper.update(null, new LambdaUpdateWrapper<TbCashierCart>() int cartCount = mpCashierCartMapper.update(null, new LambdaUpdateWrapper<TbCashierCart>()
.eq(TbCashierCart::getOrderId, orderInfo.getId()) .eq(TbCashierCart::getOrderId, orderInfo.getId())
.eq(TbCashierCart::getUseType, orderInfo.getUseType()) .eq(TbCashierCart::getUseType, orderInfo.getUseType())
.eq(TbCashierCart::getStatus, "create") .in(TbCashierCart::getStatus, "create", "closed")
.set(TbCashierCart::getStatus, "final")); .set(TbCashierCart::getStatus, "final"));
log.info("更新购物车:{}", cartCount); log.info("更新购物车:{}", cartCount);
@@ -1084,7 +1084,7 @@ public class PayService {
mpOrderDetailMapper.update(null, new LambdaUpdateWrapper<TbOrderDetail>().eq(TbOrderDetail::getId, orderInfo.getId()) mpOrderDetailMapper.update(null, new LambdaUpdateWrapper<TbOrderDetail>().eq(TbOrderDetail::getId, orderInfo.getId())
.eq(TbOrderDetail::getUseType, orderInfo.getUseType()) .eq(TbOrderDetail::getUseType, orderInfo.getUseType())
.eq(TbOrderDetail::getStatus, "unpaid") .in(TbOrderDetail::getStatus, "unpaid")
.set(TbOrderDetail::getStatus, "closed")); .set(TbOrderDetail::getStatus, "closed"));
//修改主单状态 //修改主单状态