From 83c48e429783f463eba87670bb68ca6aa65692ae Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 17 七月 2024 23:20:16 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 223 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 162 insertions(+), 61 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index b47b927..aab1f9b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -7,6 +7,7 @@
import com.google.common.collect.Lists;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.AuditStatusEnum;
import com.ruoyi.common.core.enums.BondStatusEnum;
@@ -36,17 +37,7 @@
import com.ruoyi.order.util.OrderUtil;
import com.ruoyi.order.util.SinataUtil;
import com.ruoyi.system.api.constants.DelayTaskEnum;
-import com.ruoyi.system.api.domain.AuctionSalesroom;
-import com.ruoyi.system.api.domain.CouponMember;
-import com.ruoyi.system.api.domain.CustomConfig;
-import com.ruoyi.system.api.domain.DelayTask;
-import com.ruoyi.system.api.domain.GoodsGroupPurchase;
-import com.ruoyi.system.api.domain.GoodsSeckill;
-import com.ruoyi.system.api.domain.GoodsSku;
-import com.ruoyi.system.api.domain.Member;
-import com.ruoyi.system.api.domain.MemberAddress;
-import com.ruoyi.system.api.domain.Order;
-import com.ruoyi.system.api.domain.OrderAuctionBond;
+import com.ruoyi.system.api.domain.*;
import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
@@ -70,10 +61,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.regex.Matcher;
@@ -134,6 +122,7 @@
@Resource
private GoodsSkuClient GoodsSkuClient;
+
@Override
@@ -250,6 +239,11 @@
}
@Override
+ public Order getOrderByGroupPurchaseMemberId1(HomeGoodsSkuDTO homeGoodsSkuDTO) {
+ return baseMapper.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO);
+ }
+
+ @Override
public List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO) {
return baseMapper.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO);
}
@@ -284,8 +278,11 @@
if (memberOrderDTO.getOrderFrom()==1){
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ if (goodsSku.getListingStatus().getCode()==1){
+ throw new ServiceException("该商品已经下架");
+ }
if (goodsSku.getStock()<memberOrderDTO.getGoodsQuantity()){
- throw new ServiceException("对不起，购买数大于库存");
+ throw new ServiceException("该商品已售罄，暂无库存");
}else{
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
@@ -305,6 +302,10 @@
}
if (memberOrderDTO.getOrderFrom()==2){
GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ if (data.getListingStatus().getCode()==1){
+ throw new ServiceException("该商品已经下架");
+ }
+
String goodsLock = "goods_lock_" + CacheConstants.SECKILL_GOODS + data.getId();
RLock redissonLock = redissonClient.getLock(goodsLock);
Integer surpNum = 0;
@@ -333,7 +334,7 @@
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
if (data.getLimitNumber()<num1) {
- throw new ServiceException("对不起，大于商品购买数");
+ throw new ServiceException("该商品已售罄，暂无库存");
}
order.setOrderFrom(OrderFromEnum.SNAP_ORDERS);
@@ -346,7 +347,7 @@
pice=data.getSeckillPrice();
if (data.getSeckillStock()<1){
- throw new ServiceException("对不起，购买数大于库存");
+ throw new ServiceException("该商品已售罄，暂无库存");
}else{
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
goodsStockUpdDTO.setGoodsSkuId(data.getId());
@@ -363,6 +364,12 @@
if (memberOrderDTO.getOrderFrom()==3){
order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ if (data.getListingStatus().getCode()==1){
+ throw new ServiceException("该商品已经下架");
+ }
+ if (data.getStartStatus().getCode()==0){
+ throw new ServiceException("该商品未开始");
+ }
Integer m=data.getCurrentNumber()+1;
if (m>data.getGroupSize()){
throw new ServiceException("对不起，大成团人数");
@@ -375,8 +382,6 @@
memberOrderVO.setSkuName(goodsSku.getSkuName());
memberOrderVO.setYouhiPrice(data.getGroupPurchasePrice());
pice=data.getGroupPurchasePrice();
-
- goodsSkuClient.GroupPurchaseNum(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER);
order.setSkuName(goodsSku.getSkuName());
order.setPrice(data.getGroupPurchasePrice());
@@ -407,6 +412,11 @@
order.setReceiverCity(data.getReceiverCity());
order.setReceiverDetailAddress(data.getDetailedAddress());
order.setReceiverPhone(data.getRecipientPhone());
+
+ memberOrderVO.setReceiverName(data.getRecipientName());
+ memberOrderVO.setReceiverCity(data.getReceiverCity());
+ memberOrderVO.setReceiverDetailAddress(data.getDetailedAddress());
+ memberOrderVO.setReceiverphone(data.getRecipientPhone());
}
order.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
@@ -460,16 +470,16 @@
}if (memberOrderDTO.getGoodsQuantity()!=null){
if (order.getOrderFrom().getCode()==1){
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
-
- GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
- goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
- goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
- goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
- SecurityConstants.INNER);
-
if (goodsSku.getStock()+order.getGoodsQuantity()<memberOrderDTO.getGoodsQuantity()){
- throw new ServiceException("对不起，购买数大于库存");
+ throw new ServiceException("该商品库存不足");
}
+
+ GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
+ goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
+ goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
+ goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
+ SecurityConstants.INNER);
+
Integer m= goodsSku.getStock()+order.getGoodsQuantity();
goodsStockUpdDTO.setAuctionStock(m-memberOrderDTO.getGoodsQuantity());
goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
@@ -498,18 +508,20 @@
GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
- if (order.getGoodsQuantity()!=order.getGoodsQuantity()){
+ if (num1!=order.getGoodsQuantity()){
if (data.getLimitNumber()<num1){
throw new ServiceException("对不起，大于商品购买数");
}else{
+
+
+ if (data.getSeckillStock()+order.getGoodsQuantity()<memberOrderDTO.getGoodsQuantity()){
+ throw new ServiceException("该商品库存不足");
+ }
+
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
goodsStockUpdDTO.setGoodsSkuId(data.getId());
goodsStockUpdDTO.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO,SecurityConstants.INNER);
-
- if (data.getSeckillStock()+order.getGoodsQuantity()<memberOrderDTO.getGoodsQuantity()){
- throw new ServiceException("对不起，购买数大于库存");
- }
Integer m=data.getSeckillStock()+order.getGoodsQuantity();
GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
@@ -548,7 +560,7 @@
throw new ServiceException("对不起，大于商品购买数");
}else{
if (data.getLimitNumber()<memberOrderDTO.getGoodsQuantity()){
- throw new ServiceException("对不起，购买数大于库存");
+ throw new ServiceException("对不起，大于商品购买数");
}else{
memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
memberOrderVO.setPrice(data.getGroupPurchasePrice());
@@ -676,10 +688,11 @@
@Override
public PageDTO<MemberOrderListVO> MemberrderList(MemberOrderListDTO memberOrderListDTO) {
+
Page<Order> page = new Page<>(memberOrderListDTO.getPageCurr(), memberOrderListDTO.getPageSize());
LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
wrapper.eq(Order::getMemberId,memberOrderListDTO.getMemberId());
- if(memberOrderListDTO.getGoodsSkuName()!=null){
+ if(memberOrderListDTO.getGoodsSkuName()!=null&&memberOrderListDTO.getGoodsSkuName()!=""){
wrapper.like(Order::getSkuName,memberOrderListDTO.getGoodsSkuName());
}
if(memberOrderListDTO.getOrderNo()!=null){
@@ -687,6 +700,10 @@
}
if(memberOrderListDTO.getOrderStatus()!=null){
wrapper.eq(Order::getOrderStatus,memberOrderListDTO.getOrderStatus().getCode()-1);
+ }
+
+ if(memberOrderListDTO.getIsRequest()!=null){
+ wrapper.eq(Order::getIsRequest,memberOrderListDTO.getIsRequest());
}
wrapper.eq(Order::getIsOrder,1);
wrapper.eq(Order::getDelFlag,0);
@@ -748,12 +765,14 @@
if (orderVO.getOrderFrom().getCode()==3){
GoodsGroupPurchase data = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
orderVO.setGroupTime(data.getGroupTime());
+ orderVO.setSkuId(data.getGoodsSkuId());
}
OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
Wrappers.lambdaQuery(OrderReturnRequest.class)
.eq(OrderReturnRequest::getOrderId,
- orderVO.getId()).last("limit 1"));
+ orderVO.getId()).eq(OrderReturnRequest::getDelFlag,
+ 0).last("limit 1"));
if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
orderVO.setStatus(orderReturnRequest.getStatus());
orderVO.setRequestId(orderReturnRequest.getId());
@@ -778,6 +797,10 @@
} catch (Exception e) {
throw new RuntimeException(e);
}
+ CustomConfig memberPointsPoints = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
+ orderVO.setOrderShuoMin(memberPointsPoints.getConfigValue());
+ CustomConfig ReturnCycle = sysUserClient.getconfig("RETURN_CYCLE").getData();
+ orderVO.setOrderZq(Integer.valueOf(ReturnCycle.getConfigValue()));
return orderVO;
}
@@ -789,11 +812,24 @@
order.setCancelTime(LocalDateTime.now());
baseMapper.updateById(order);
+ if (order.getCouponId()!=0){
+ CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
+ couponMemberDTO1.setId(order.getCouponId());
+ couponMemberDTO1.setCouponStatus(0);
+ promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
+ }
+
if(order.getOrderNo().contains("SP")){
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
+ if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){
+ goodsStockUpdDTO1.setSoldQuantity(0);
+ }else {
+ goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
+ }
+
goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
}
@@ -802,8 +838,15 @@
GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
- goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
+ if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
+ goodsStockUpdDTO1.setSoldQuantity(0);
+ }else {
+ goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
+ }
+ goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
}
+
+
}
@@ -817,6 +860,11 @@
GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
+ if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){
+ goodsStockUpdDTO1.setSoldQuantity(0);
+ }else {
+ goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
+ }
goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
}
@@ -825,7 +873,12 @@
GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
- goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
+ if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
+ goodsStockUpdDTO1.setSoldQuantity(0);
+ }else {
+ goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
+ }
+ goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
}
if (order.getCouponId()!=0){
@@ -885,8 +938,19 @@
@Override
public void delOrderOne(MemberOrderListDTO memberOrderListDTO) {
- Order byId = this.getById(memberOrderListDTO.getId());
- goodsSkuClient.GroupPurchaseNum1(byId.getGoodsSkuId(), SecurityConstants.INNER);
+ Order byId = this.getById(memberOrderListDTO.getId());
+
+ if(byId.getOrderNo().contains("TG")){
+ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo();
+ goodsGroupPurchaseInfo.setGroupPurchaseId(byId.getGoodsSkuId());
+ goodsGroupPurchaseInfo.setMubre(byId.getGroupNo());
+ GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo1(goodsGroupPurchaseInfo, SecurityConstants.INNER).getData();
+ if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ GoodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
+
+ }
+ }
+
this.removeById(memberOrderListDTO.getId());
if (byId.getOrderStatus().getCode() == 2) {
@@ -934,7 +998,6 @@
}
}
}
- baseMapper.deleteById(memberOrderListDTO.getId());
}
@Override
@@ -948,27 +1011,27 @@
LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
wrapper.eq(OrderAuctionBond::getOrderId,order.getId());
OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper);
+ if(orderAuctionBond!=null){
+ if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//支付宝
+ //获取支付信息
+ LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
+ paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
+ Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
+ boolean bo = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
+ if (!bo) {
+ System.out.println("支付宝退款失败");
+ }
+ } else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//微信
+ //获取支付信息
+ LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
+ paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
+ Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
- if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//支付宝
- //获取支付信息
- LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
- paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
- Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
- boolean bo = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
- if (!bo) {
- System.out.println("支付宝退款失败");
- }
- } else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//微信
- //获取支付信息
- LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
- paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
- Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
-
- String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
- Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
- String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
- Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
- refundFee = 1;
+ String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
+ Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
+ String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
+ Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
+ refundFee = 1;
String regEx = "[^0-9]";
Pattern p = Pattern.compile(regEx);
@@ -979,6 +1042,9 @@
System.out.println("微信退款失败");
}
}
+ }
+
+
}else{
order.setOrderStatus(OrderStatusEnum.FINISHED);
@@ -989,26 +1055,61 @@
@Override
public MemberOrderNumVO MemberOrderNum(MemberOrderListDTO memberOrderListDTO) {
+ LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(Order::getMemberId,memberOrderListDTO.getMemberId());
+ wrapper1.eq(Order::getOrderStatus,1);
+ wrapper1.eq(Order::getIsOrder,1);
+ wrapper1.eq(Order::getDelFlag,0);
+ wrapper1.orderByDesc(Order::getCancelTime);
+ List<Order> page2 = this.list(wrapper1);
+ for (Order MemberOrderList:page2) {
+ if (MemberOrderList.getOrderStatus().getCode() == 1) {
+ if (MemberOrderList.getOrderFrom().getCode() == 1 || MemberOrderList.getOrderFrom().getCode() == 2 || MemberOrderList.getOrderFrom().getCode() == 3) {
+ LocalDateTime localDateTime = MemberOrderList.getOrderTime().plusMinutes(30);
+ if (LocalDateTime.now().isAfter(localDateTime)) {
+ // dateTime1 在 dateTime2 之后
+ MemberOrderList.setOrderStatus(OrderStatusEnum.CANCELED);
+ Order order = this.getById(MemberOrderList.getId());
+ order.setOrderStatus(OrderStatusEnum.CANCELED);
+ this.updateById(order);
+ }
+
+ }
+ }
+ }
+
+
MemberOrderNumVO vo=new MemberOrderNumVO();
LambdaQueryWrapper<Order> paylogEntityWrapper = Wrappers.lambdaQuery();
paylogEntityWrapper.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
paylogEntityWrapper.eq(Order::getOrderStatus,1);
+ paylogEntityWrapper.eq(Order::getDelFlag,0);
List<Order> list = this.list(paylogEntityWrapper);
vo.setDzforderNo(list.size());
LambdaQueryWrapper<Order> paylogEntityWrapper1 = Wrappers.lambdaQuery();
paylogEntityWrapper1.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
paylogEntityWrapper1.eq(Order::getOrderStatus,2);
+ paylogEntityWrapper1.eq(Order::getDelFlag,0);
List<Order> list1 = this.list(paylogEntityWrapper1);
vo.setDfhorderNo(list1.size());
LambdaQueryWrapper<Order> paylogEntityWrapper2 = Wrappers.lambdaQuery();
paylogEntityWrapper2.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
paylogEntityWrapper2.eq(Order::getOrderStatus,3);
+ paylogEntityWrapper2.eq(Order::getDelFlag,0);
List<Order> list2 = this.list(paylogEntityWrapper2);
vo.setDshorderNo(list2.size());
+
+
+ LambdaQueryWrapper<Order> paylogEntityWrapper3 = Wrappers.lambdaQuery();
+ paylogEntityWrapper3.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
+ paylogEntityWrapper3.eq(Order::getIsRequest,2);
+ paylogEntityWrapper3.eq(Order::getDelFlag,0);
+ List<Order> list3 = this.list(paylogEntityWrapper3);
+ vo.setShorderNo(list3.size());
return vo;
}
--
Gitblit v1.7.1