b2894lxlx/yunxinwei-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复支付等相关问题

Browse Source
This commit is contained in:
geng.tang@qq.com
2024-01-26 15:30:26 +08:00
parent 31edb4775a
commit 2d1f3ed93b
61 changed files with 1283 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/gxwebsoft/open/controller/OpenOrderGoodsController.java
View File

@@ -161,7 +161,8 @@ public class OpenOrderGoodsController extends BaseController {
return fail("菜品不存在！");
}
// System.out.println("orderGoods = " + orderGoods);
final Order byId = orderService.getById(orderGoods.getOrderId());
Integer orderId = orderGoods.getOrderId();
final Order byId = orderService.getById(orderId);
// 取消报餐截止时间
orderGoodsService.removeById(orderGoods);
// System.out.println("orderGoods = " + orderGoods);
@@ -176,14 +177,15 @@ public class OpenOrderGoodsController extends BaseController {
UserBalanceLog userBalanceLog = new UserBalanceLog();
userBalanceLog.setUserId(byId.getUserId());
userBalanceLog.setScene(BALANCE_REFUND);
userBalanceLog.setSceneId(orderId);
userBalanceLog.setMoney(orderGoods.getGoodsPrice());
userBalanceLog.setBalance(balance);
userBalanceLog.setComments(orderGoods.getOrderId().toString());
userBalanceLog.setComments("取消订单：" + orderId);
userBalanceLogService.save(userBalanceLog);
final int count = orderGoodsService.count(new LambdaUpdateWrapper<OrderGoods>().eq(OrderGoods::getOrderId, orderGoods.getOrderId()).gt(OrderGoods::getTotalNum,0));
final int count = orderGoodsService.count(new LambdaUpdateWrapper<OrderGoods>().eq(OrderGoods::getOrderId, orderId).gt(OrderGoods::getTotalNum,0));
// System.out.println("count = " + count);
// 更新订单金额
System.out.println("byId = " + byId);
// System.out.println("byId = " + byId);
if (!byId.getTotalPrice().equals(0)) {
byId.setTotalPrice(byId.getTotalPrice().subtract(orderGoods.getGoodsPrice()));
orderService.updateById(byId);
@@ -192,9 +194,9 @@ public class OpenOrderGoodsController extends BaseController {
// 无菜品就把订单删除
if(count == 0){
final Order order = new Order();
order.setOrderId(orderGoods.getOrderId());
order.setOrderId(orderId);
order.setOrderStatus(ORDER_STATUS_CANCEL);
orderService.removeById(orderGoods.getOrderId());
orderService.removeById(orderId);
}
return success("菜品取消成功");
}