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

sync_pay_state

This commit is contained in:
sxu 2025-02-20 19:58:40 +08:00
parent 82941cfdcd
commit 3757bcf874
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/api/AccTradeApi.java
View File

@ -18,7 +18,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@ -40,12 +39,15 @@ public class AccTradeApi {
}
public Map<Long, AccTradeOrderBalanceVO> listOrderAccPayDetail(List<Long> leOrdNos) {
List<AccTrade> accTradeList = this.accTradeService.list((Wrapper) Wrappers.lambdaQuery(AccTrade.class).select(new SFunction[]{AccTrade::getId, AccTrade::getLeOrdNo, AccTrade::getWalletBalTotal}).in(AccTrade::getLeOrdNo, leOrdNos));
//List<AccTrade> accTradeList = this.accTradeService.list((Wrapper) Wrappers.lambdaQuery(AccTrade.class).select(new SFunction[]{AccTrade::getId, AccTrade::getLeOrdNo, AccTrade::getWalletBalTotal}).in(AccTrade::getLeOrdNo, leOrdNos));
List<AccTrade> accTradeList = this.accTradeService.list(Wrappers.lambdaQuery(AccTrade.class)
.select(AccTrade::getId, AccTrade::getLeOrdNo, AccTrade::getWalletBalTotal)
.in(AccTrade::getLeOrdNo, leOrdNos));
if (CollUtil.isEmpty(accTradeList)) {
return MapUtil.empty();
} else {
Map<Long, List<AccTrade>> leOrdNo_accTrade = (Map)accTradeList.stream().collect(Collectors.groupingBy(AccTrade::getLeOrdNo));
Map<Long, List<AccTradeWalletDetail>> accTradeId_walletDetail = this.accTradeWalletDetailService.queryAccTradeWalletDetailByTradeIdList(accTradeList.stream().map(AccTrade::getId).toList());
Map<Long, List<AccTradeWalletDetail>> accTradeId_walletDetail = this.accTradeWalletDetailService.queryAccTradeWalletDetailByTradeIdList(accTradeList.stream().map(AccTrade::getId).collect(Collectors.toList()));
Map<Long, AccTradeOrderBalanceVO> resultMap = MapUtil.newHashMap();
leOrdNo_accTrade.keySet().forEach((leOrdNo) -> {
AccTrade accTrade = (AccTrade)((List)leOrdNo_accTrade.get(leOrdNo)).get(0);

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/model/OrderInfo.java
View File

@ -1,6 +1,7 @@
package com.bonus.core.order.common.model;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.annotation.TableName;
import com.bonus.constant.LeConstants;
@ -10,6 +11,7 @@ import com.bonus.core.order.common.constants.DeductionTypeEnum;
import com.bonus.core.order.common.constants.DishesStateEnum;
import com.bonus.core.order.common.constants.OrderRefundStateEnum;
import com.bonus.core.order.common.constants.OrderStateEnum;
import com.bonus.core.order.utils.LeNumUtil;
import com.bonus.core.pay.api.dto.UnifyPayDTO;
import com.bonus.core.pay.common.constants.PayChannelEnum;
import com.bonus.core.pay.common.constants.PayStateEnum;
@ -234,10 +236,10 @@ public class OrderInfo {
}
}
//
// public boolean hasCustInfo(Long custId) {
// return LeNumUtil.idOrDefault(this.custId).equals(LeNumUtil.idOrDefault(custId)) && CharSequenceUtil.isNotBlank(this.orgFullName);
// }
public boolean hasCustInfo(Long custId) {
return LeNumUtil.idOrDefault(this.custId).equals(LeNumUtil.idOrDefault(custId)) && CharSequenceUtil.isNotBlank(this.orgFullName);
}
public static String[] logFields() {
return new String[]{"orderId", "macOrderId", "machineSn", "custId", "sourceType", "canteenId", "stallId", "orderType", "orderDate", "orderTime", "orderState", "orderRefundState", "payType", "payChannel", "payState", "deliveryType", "dishesState", "commentState", "inventoryOutId", "ifQuickFail", "payableAmount", "discountsAmount", "couponAmount", "deliveryAmount", "packingAmount", "realAmount", "accPayAmount", "outPayAmount", "refundAmount", "payParam", "remark"};

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

@ -9,15 +9,18 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.constant.LeConstants;
import com.bonus.core.common.constant.LeRetCodeEnum;
import com.bonus.core.common.enums.AllocMealtimeTypeEnum;
import com.bonus.core.customer.vo.CustPayVO;
import com.bonus.core.order.client.OrderModuleClient;
import com.bonus.core.order.client.po.CustPayInfoQueryParam;
import com.bonus.core.order.common.constants.OrderStateEnum;
import com.bonus.core.order.common.constants.OrderTips;
import com.bonus.core.order.common.constants.OrderTypeEnum;
import com.bonus.core.order.common.dto.OrderSearchParam;
import com.bonus.core.order.common.mapper.OrderInfoMapper;
import com.bonus.core.order.common.model.OrderInfo;
@ -397,7 +400,15 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
// }
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((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;
}