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-12 11:28:43 +08:00
parent e8c1ff1283
commit c6392c8474
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,8 +259,8 @@ public class CartService {
// 查询购物车所有信息 // 查询购物车所有信息
LambdaQueryWrapper<TbCashierCart> query = new LambdaQueryWrapper<TbCashierCart>() LambdaQueryWrapper<TbCashierCart> query = new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, shopEatTypeInfoDTO.getShopInfo().getId()) .eq(TbCashierCart::getShopId, shopEatTypeInfoDTO.getShopInfo().getId())
.eq(TbCashierCart::getProductId, "-999") .eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID)
.eq(TbCashierCart::getSkuId, "-999") .eq(TbCashierCart::getSkuId, TableConstant.CART_SEAT_ID)
.eq(TbCashierCart::getStatus, "create") .eq(TbCashierCart::getStatus, "create")
.gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()) .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()) .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType())

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

@@ -397,11 +397,10 @@ public class PayService {
return Result.fail("订单信息不存在"); return Result.fail("订单信息不存在");
} }
if (System.currentTimeMillis() - orderInfo.getCreatedAt() > 60 * 15 * 1000) { if (!OrderUseTypeEnum.DINE_IN_AFTER.getValue().equals(orderInfo.getUseType()) && System.currentTimeMillis() - orderInfo.getCreatedAt() > 60 * 15 * 1000) {
return Result.fail("订单十五分钟内有效,当前已超时,请重新下单。"); return Result.fail("订单十五分钟内有效,当前已超时,请重新下单。");
} }
TbUserInfo userInfo = tbUserInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getUserId())); TbUserInfo userInfo = tbUserInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getUserId()));
if (ObjectUtil.isEmpty(userInfo)) { if (ObjectUtil.isEmpty(userInfo)) {
return Result.fail("未获取到用户信息"); return Result.fail("未获取到用户信息");
@@ -839,7 +838,8 @@ public class PayService {
} }
} }
} else { } else {
PublicResp<OrderStatusQueryResp> publicResp = thirdPayService.queryOrder(thirdUrl, thirdApply.getAppId(), payment.getTradeNumber(), null, thirdApply.getAppToken()); PublicResp<OrderStatusQueryResp> publicResp = thirdPayService.queryOrder(thirdUrl, thirdApply.getAppId(),
payment.getTradeNumber(), null, thirdApply.getAppToken());
if (ObjectUtil.isNotNull(publicResp) && ObjectUtil.isNotEmpty(publicResp)) { if (ObjectUtil.isNotNull(publicResp) && ObjectUtil.isNotEmpty(publicResp)) {
if ("000000".equals(publicResp.getCode())) { if ("000000".equals(publicResp.getCode())) {
String cartStatus = ""; String cartStatus = "";