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

创建订单结束订单状态

Browse Source
This commit is contained in:
SongZhang
2024-10-14 09:02:30 +08:00
parent 0b68aa89d5
commit 2cbf160c4b
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@@ -783,6 +783,11 @@ public class OrderService {
cashierCart.setPlaceNum(currentPlaceNum); cashierCart.setPlaceNum(currentPlaceNum);
} }
// 先付费模式，结束购物车状态
if (eatTypeInfoDTO.isDineInBefore() || eatTypeInfoDTO.isTakeout()) {
cashierCart.setStatus("final");
}
TbOrderDetail orderDetail = null; TbOrderDetail orderDetail = null;
if (StrUtil.isNotBlank(cashierCart.getOrderId())) { if (StrUtil.isNotBlank(cashierCart.getOrderId())) {
orderDetail = oldOrderDetailMap.get(cashierCart.getOrderId() + cashierCart.getId()); orderDetail = oldOrderDetailMap.get(cashierCart.getOrderId() + cashierCart.getId());

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

@@ -338,6 +338,7 @@ public class PayService {
orderInfo.setStatus("paying"); orderInfo.setStatus("paying");
orderInfo.setPayOrderNo(payment.getTradeNumber()); orderInfo.setPayOrderNo(payment.getTradeNumber());
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo); tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
int cartCount = tbCashierCartMapper.updateByOrderId(orderId, "final");
payment.setUpdatedAt(System.currentTimeMillis()); payment.setUpdatedAt(System.currentTimeMillis());
tbOrderPaymentMapper.updateByPrimaryKeySelective(payment); tbOrderPaymentMapper.updateByPrimaryKeySelective(payment);
@@ -429,6 +430,7 @@ public class PayService {
orderInfo.setStatus("paying"); orderInfo.setStatus("paying");
orderInfo.setPayOrderNo(payment.getTradeNumber()); orderInfo.setPayOrderNo(payment.getTradeNumber());
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo); tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
int cartCount = tbCashierCartMapper.updateByOrderId(orderId, "final");
payment.setUpdatedAt(System.currentTimeMillis()); payment.setUpdatedAt(System.currentTimeMillis());