bonus
/
Bonus-Cloud-Smart-Canteen
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

购物车修改

This commit is contained in:
gaowdong 2025-02-21 10:32:49 +08:00
parent 628a4d0de3
commit 55c21ea4fc
1 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderInfoServiceImpl.java
View File

@ -184,20 +184,19 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
.eq(OrderInfo::getCustId, custId).ge(OrderInfo::getOrderDate, nowDate)
.eq(OrderInfo::getOrderState, OrderStateEnum.PLACE.getKey()));
}
//
// public void initOrderCustInfo(List<OrderInfo> orderInfoList, Long custId) {
// if (!CollUtil.isEmpty(orderInfoList)) {
// if (orderInfoList.stream().anyMatch((s) -> {
// return !s.hasCustInfo(custId);
// })) {
// CustPayVO custInfo = this.orderModuleClient.custPayInfoQuery(CustPayInfoQueryParam.ofCustId(LeNumUtil.idOrDefault(custId)));
// orderInfoList.forEach((s) -> {
// s.fillCustInfo(custInfo);
// });
// }
//
// }
// }
public void initOrderCustInfo(List<OrderInfo> orderInfoList, Long custId) {
if (!CollUtil.isEmpty(orderInfoList)) {
if (orderInfoList.stream().anyMatch((s) -> {
return !s.hasCustInfo(custId);
})) {
CustPayVO custInfo = this.orderModuleClient.custPayInfoQuery(CustPayInfoQueryParam.ofCustId(LeNumUtil.idOrDefault(custId)));
orderInfoList.forEach((s) -> {
s.fillCustInfo(custInfo);
});
}
}
}
//
// public <T extends OrderInfoWithCustName> void fillOrderCustName(List<T> orderInfoList, boolean skipIfNameExists) {
// if (!CollUtil.isEmpty(orderInfoList)) {
@ -411,11 +410,26 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
// public long existReserveOrderUnPrint(Long canteenId, Long stallId, Integer mealtimeType) {
// return this.count((Wrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(OrderInfo.class).eq(ObjectUtil.isNotNull(canteenId), OrderInfo::getCanteenId, canteenId)).eq(ObjectUtil.isNotNull(stallId), OrderInfo::getStallId, stallId)).eq(ObjectUtil.isNotNull(mealtimeType), OrderInfo::getMealtimeType, mealtimeType)).between(OrderInfo::getOrderDate, LocalDate.now(), LeOrderUtil.queryDateRange().get(1))).eq(OrderInfo::getOrderType, OrderTypeEnum.RESERVE_MEAL.getKey())).eq(OrderInfo::getOrderState, OrderStateEnum.PLACE.getKey()));
// }
//
// public String getMaxMealCodeOfDate(LocalDate orderDate, Integer mealtimeType, Long canteenId, Long stallId) {
// OrderInfo orderInfo = (OrderInfo)((OrderInfoMapper)this.baseMapper).selectOne((Wrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(OrderInfo.class).select(new SFunction[]{OrderInfo::getMealCode}).eq(OrderInfo::getOrderDate, orderDate)).eq(OrderInfo::getCanteenId, LeNumUtil.isValidId(canteenId) ? canteenId : LeConstants.DATA_DEFAULT_LONG)).eq(OrderInfo::getStallId, LeNumUtil.isValidId(stallId) ? stallId : LeConstants.DATA_DEFAULT_LONG)).eq(LeNumUtil.isValidId(mealtimeType), OrderInfo::getMealtimeType, mealtimeType)).in(!LeNumUtil.isValidId(mealtimeType), OrderInfo::getMealtimeType, AllocMealtimeTypeEnum.allTypeList())).in(OrderInfo::getOrderType, OrderTypeEnum.allTypeList())).orderByDesc(OrderInfo::getOrderId)).last("limit 1"));
// return orderInfo != null ? orderInfo.getMealCode() : null;
// }
public String getMaxMealCodeOfDate(LocalDate orderDate, Integer mealtimeType, Long canteenId, Long stallId) {
//OrderInfo orderInfo = (OrderInfo)((OrderInfoMapper)this.baseMapper).selectOne((Wrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(OrderInfo.class)
// .select(new SFunction[]{OrderInfo::getMealCode})
// .eq(OrderInfo::getOrderDate, orderDate))
// .eq(OrderInfo::getCanteenId, LeNumUtil.isValidId(canteenId) ? canteenId : LeConstants.DATA_DEFAULT_LONG))
// .eq(OrderInfo::getStallId, LeNumUtil.isValidId(stallId) ? stallId : LeConstants.DATA_DEFAULT_LONG))
// .eq(LeNumUtil.isValidId(mealtimeType), OrderInfo::getMealtimeType, mealtimeType))
// .in(!LeNumUtil.isValidId(mealtimeType), OrderInfo::getMealtimeType, AllocMealtimeTypeEnum.allTypeList()))
// .in(OrderInfo::getOrderType, OrderTypeEnum.allTypeList())).orderByDesc(OrderInfo::getOrderId)).last("limit 1"));
OrderInfo orderInfo = (OrderInfo)((OrderInfoMapper)this.baseMapper).selectOne(Wrappers.lambdaQuery(OrderInfo.class)
.select(OrderInfo::getMealCode)
.eq(OrderInfo::getOrderDate, orderDate)
.eq(OrderInfo::getCanteenId, LeNumUtil.isValidId(canteenId) ? canteenId : LeConstants.DATA_DEFAULT_LONG)
.eq(OrderInfo::getStallId, LeNumUtil.isValidId(stallId) ? stallId : LeConstants.DATA_DEFAULT_LONG)
.eq(LeNumUtil.isValidId(mealtimeType), OrderInfo::getMealtimeType, mealtimeType)
.in(!LeNumUtil.isValidId(mealtimeType), OrderInfo::getMealtimeType, AllocMealtimeTypeEnum.allTypeList())
.in(OrderInfo::getOrderType, OrderTypeEnum.allTypeList()).orderByDesc(OrderInfo::getOrderId).last("limit 1"));
return orderInfo != null ? orderInfo.getMealCode() : null;
}
protected LambdaQueryWrapper<OrderInfo> getOrderSelectWrappers() {
return Wrappers.lambdaQuery(OrderInfo.class).select(OrderInfo::getOrderId, OrderInfo::getCustId, OrderInfo::getSourceType, OrderInfo::getCanteenId, OrderInfo::getStallId, OrderInfo::getMealtimeType, OrderInfo::getCanteenName, OrderInfo::getStallName, OrderInfo::getMealtimeName, OrderInfo::getOrderDate, OrderInfo::getCouponId, OrderInfo::getPayableAmount, OrderInfo::getRealAmount, OrderInfo::getAccPayAmount, OrderInfo::getOutPayAmount, OrderInfo::getOrderTime, OrderInfo::getOrderType, OrderInfo::getOrderState, OrderInfo::getPayTime, OrderInfo::getPayType, OrderInfo::getPayState, OrderInfo::getDeliveryType, OrderInfo::getDishesState, OrderInfo::getOrderRefundState);