From c31c0cc0bf9daee8b316d856cc136287ae8a442b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 七月 2024 22:07:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 369 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 278 insertions(+), 91 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 a4d7764..a0dce86 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
@@ -17,9 +17,9 @@
import com.ruoyi.common.core.enums.RequestTypeEnum;
import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
+import com.ruoyi.common.core.utils.page.CollUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.order.controller.management.dto.MgtOrderConfirmShipmentDTO;
@@ -37,7 +37,18 @@
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.*;
+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.GoodsGroupPurchaseInfo;
+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.dto.CouponMemberDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
@@ -61,7 +72,10 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.regex.Matcher;
@@ -72,6 +86,7 @@
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* <p>
@@ -124,6 +139,7 @@
private GoodsSkuClient GoodsSkuClient;
+
@Override
public void saveOrderOne(OrderDTO OrderDTO) {
Order order=new Order();
@@ -142,7 +158,7 @@
order.setOrderNo(OrderUtil.getOrderNoForPrefix("TG"));
order.setIsOrder(2);
}if (OrderDTO.getOrderFrom().getCode()==4){
- order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
+ order.setOrderFrom(OrderFromEnum.AUCTION_ORDERS);
order.setOrderNo(OrderUtil.getOrderNoForPrefix("PM"));
order.setIsOrder(1);
}
@@ -163,6 +179,7 @@
order.setSkuName(OrderDTO.getSkuName());
order.setPrice(OrderDTO.getPrice());
order.setCoverPic(OrderDTO.getCoverPic());
+ order.setOrderTimeSx(OrderDTO.getOrderTimeSx());
this.save(order);
if (OrderDTO.getOrderFrom().getCode()==4){
@@ -238,6 +255,11 @@
}
@Override
+ public Order getOrderByGroupPurchaseMemberId1(HomeGoodsSkuDTO homeGoodsSkuDTO) {
+ return baseMapper.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO);
+ }
+
+ @Override
public List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO) {
return baseMapper.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO);
}
@@ -272,8 +294,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());
@@ -293,6 +318,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;
@@ -320,9 +349,12 @@
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
- if (data.getLimitNumber()<num1) {
- throw new ServiceException("对不起，大于商品购买数");
+ if (data.getLimitNumber()!=0){
+ if (data.getLimitNumber()<num1) {
+ throw new ServiceException("对不起，大于商品购买数");
+ }
}
+
order.setOrderFrom(OrderFromEnum.SNAP_ORDERS);
memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
@@ -334,7 +366,7 @@
pice=data.getSeckillPrice();
if (data.getSeckillStock()<1){
- throw new ServiceException("对不起，购买数大于库存");
+ throw new ServiceException("该商品已售罄，暂无库存");
}else{
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
goodsStockUpdDTO.setGoodsSkuId(data.getId());
@@ -351,6 +383,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("对不起，大成团人数");
@@ -363,8 +401,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());
@@ -395,6 +431,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());
@@ -448,16 +489,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,
@@ -477,27 +518,34 @@
memberOrderDTO1.setGoodsSkuId(order.getGoodsSkuId());
Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1);
Integer num1=0;
- if (num!=null){
- num1 =num+order.getGoodsQuantity();
+ if(num!=order.getGoodsQuantity()){
+ if (num!=null){
+ num1 =num+order.getGoodsQuantity();
+ }else{
+ num1=order.getGoodsQuantity();
+ }
}else{
- num1=order.getGoodsQuantity();
+ num1=num;
}
+
GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
- if (order.getGoodsQuantity()!=order.getGoodsQuantity()){
- if (data.getLimitNumber()<num1){
+ if (num1!=order.getGoodsQuantity()){
+ if (data.getLimitNumber()!=0||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();
@@ -536,7 +584,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());
@@ -574,6 +622,7 @@
pice=pice.subtract(data.getReductionAmount());
order.setDiscountMoney(data.getReductionAmount());
}else{
+ order.setDiscountMoney(pice);
pice=new BigDecimal(0);
}
@@ -581,10 +630,13 @@
if (data.getCouponType().getCode()==2){
pice= order.getTotalAmount();
if(pice.compareTo(data.getVoucherAmount())<0){
- throw new ServiceException("优惠卷抵扣金额不能大于实际支付金额");
+ order.setDiscountMoney(pice);
+ pice=new BigDecimal(0);
+ }else{
+ pice=pice.subtract(data.getVoucherAmount());
+ order.setDiscountMoney(data.getVoucherAmount());
}
- pice=pice.subtract(data.getVoucherAmount());
- order.setDiscountMoney(data.getVoucherAmount());
+
}
if (data.getCouponType().getCode()==3){
pice= order.getTotalAmount();
@@ -595,17 +647,20 @@
pice3=new BigDecimal(data.getMaxDiscount().doubleValue());
}
if(pice.compareTo(pice3)<0){
- throw new ServiceException("优惠卷抵扣金额不能大于实际支付金额");
+ BigDecimal pice4= pice.subtract(pice3);
+ if (pice4.doubleValue()>data.getMaxDiscount().doubleValue()){
+ pice=pice.subtract(data.getMaxDiscount());
+ order.setDiscountMoney(data.getMaxDiscount());
+ }else{
+ order.setDiscountMoney(pice4);
+ pice=pice3;
+ }
+ }else{
+ order.setDiscountMoney(pice);
+ pice=new BigDecimal(0);
}
- BigDecimal pice4= pice.subtract(pice3);
- if (pice4.doubleValue()>data.getMaxDiscount().doubleValue()){
- pice=pice.subtract(data.getMaxDiscount());
- order.setDiscountMoney(data.getMaxDiscount());
- }else{
- order.setDiscountMoney(pice4);
- pice=pice3;
- }
+
}
order.setCouponId(memberOrderDTO.getCouponId());
@@ -664,10 +719,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){
@@ -675,6 +731,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);
@@ -692,6 +752,17 @@
MemberOrderList.setOrderStatus(OrderStatusEnum.CANCELED);
Order order = this.getOrder(MemberOrderList.getId());
order.setOrderStatus(OrderStatusEnum.CANCELED);
+
+ if (order.getCouponId()!=0){
+ CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
+ couponMemberDTO1.setId(order.getCouponId());
+ couponMemberDTO1.setCouponStatus(0);
+ promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
+ order.setCouponId(0L);
+ }
+
+
+
this.updateById(order);
}
@@ -721,6 +792,11 @@
}else {
MemberOrderList.setIsAuctionBond(1);
}
+
+ CustomConfig memberPointsPoints = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
+ MemberOrderList.setOrderShuoMin(memberPointsPoints.getConfigValue());
+ CustomConfig ReturnCycle = sysUserClient.getconfig("RETURN_CYCLE").getData();
+ MemberOrderList.setOrderZq(Integer.valueOf(ReturnCycle.getConfigValue()));
}
@@ -736,12 +812,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());
@@ -761,11 +839,19 @@
}
}else {
orderVO.setIsAuctionBond(1);
+ orderVO.setBound(new BigDecimal(0));
}
} catch (Exception e) {
throw new RuntimeException(e);
}
+ if (order.getTotalAmount()==null){
+ order.setTotalAmount(new BigDecimal(0));
+ }
+ 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;
}
@@ -777,11 +863,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);
}
@@ -790,8 +889,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);
}
+
+
}
@@ -805,6 +911,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);
}
@@ -813,7 +924,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){
@@ -873,8 +989,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) {
@@ -922,7 +1049,6 @@
}
}
}
- baseMapper.deleteById(memberOrderListDTO.getId());
}
@Override
@@ -936,27 +1062,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);
@@ -967,6 +1093,9 @@
System.out.println("微信退款失败");
}
}
+ }
+
+
}else{
order.setOrderStatus(OrderStatusEnum.FINISHED);
@@ -977,26 +1106,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;
}
@@ -1064,8 +1228,9 @@
pageVO = PageDTO.empty(page);
}
pageVO = PageDTO.of(page, MgtOrderVO.class);
+ List<MgtOrderVO> voList = pageVO.getList();
if (query.getOrderFrom() == OrderFromEnum.AUCTION_ORDERS) {
- List<MgtOrderVO> list = pageVO.getList();
+ List<MgtOrderVO> list = voList;
// 封装参数查询拍卖会
Set<Long> auctionSalesroomGoodsIdSet = list.stream()
.filter(order -> order.getAuctionType() == AuctionOrderTypeEnum.AUCTION_ITEMS)
@@ -1130,6 +1295,19 @@
}
});
}
+ Set<Long> memberVoIdSet = voList.stream().map(MgtOrderVO::getMemberId)
+ .collect(Collectors.toSet());
+ List<Member> data = memberClient.getMemberListByIds(memberVoIdSet, SecurityConstants.INNER)
+ .getData();
+ Map<Long, Member> memberMap = data.stream()
+ .collect(Collectors.toMap(Member::getId, e -> e));
+ voList = voList.stream().peek(order -> {
+ Member member = memberMap.get(order.getMemberId());
+ if (StringUtils.isNotNull(member)) {
+ order.setNickname(member.getNickname());
+ order.setPhone(member.getPhone());
+ }
+ }).collect(Collectors.toList());
return pageVO;
}
@@ -1161,7 +1339,7 @@
}
}
// 查询售后信息
- if (order.getOrderStatus() == OrderStatusEnum.AFTER_SALE) {
+ if (order.getIsRequest() == 2) {
OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
Wrappers.lambdaQuery(OrderReturnRequest.class)
.eq(OrderReturnRequest::getOrderId,
@@ -1232,6 +1410,7 @@
* @param id 订单id
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void refund(Long id) {
Order order = getOrder(id);
String orderNo = order.getOrderNo();
@@ -1254,6 +1433,8 @@
orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
orderReturnRequestService.save(orderReturnRequest);
}
+ order.setIsRequest(2);
+ this.updateById(order);
}
private boolean handleRefund(PaymentMethodEnum paymentMethod, Paylog paylog, String orderNo) {
@@ -1288,7 +1469,7 @@
Order order = getOrder(id);
if (order.getOrderStatus() == OrderStatusEnum.FINISHED) {
OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
- order.setOrderStatus(OrderStatusEnum.AFTER_SALE);
+ order.setIsRequest(2);
this.updateById(order);
MgtAfterSaleSettingDTO data = sysUserClient.getAfterSaleSetting().getData();
if (StringUtils.isNull(data)) {
@@ -1324,38 +1505,33 @@
@Override
public void refundBond(Long id) {
Order order = getOrder(id);
- OrderAuctionBond orderAuctionBond;
+ List<OrderAuctionBond> orderAuctionBond;
if (order.getAuctionOrderType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
- orderAuctionBond = orderAuctionBondMapper.selectOne(
+ orderAuctionBond = orderAuctionBondMapper.selectList(
Wrappers.lambdaQuery(OrderAuctionBond.class)
.eq(OrderAuctionBond::getAuctionSalesroomId,
order.getAuctionSalesroomId())
.eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID));
- if (StringUtils.isNotNull(orderAuctionBond)
- && orderAuctionBond.getBoundStatus() == BondStatusEnum.REFUNDED) {
- throw new ServiceException("改拍卖会已退保证金");
- }
} else {
- orderAuctionBond = orderAuctionBondMapper.selectOne(
+ orderAuctionBond = orderAuctionBondMapper.selectList(
Wrappers.lambdaQuery(OrderAuctionBond.class)
.eq(OrderAuctionBond::getAuctionGoodsId,
order.getGoodsSkuId())
.eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID));
}
- Paylog paylog = iPaylogService.lambdaQuery()
- .eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo())
- .last("limit 1").one();
- if (StringUtils.isNull(paylog)) {
- throw new ServiceException("支付记录不存在");
- }
- PaymentMethodEnum paymentMethod = orderAuctionBond.getPaymentMethod();
- if (orderAuctionBond.getBoundStatus() == BondStatusEnum.PAID) {
- boolean result = handleRefund(paymentMethod, paylog, orderAuctionBond.getOrderNo());
- if (result) {
- paylog.setState(3);// 已退款
- orderAuctionBond.setBoundStatus(BondStatusEnum.REFUNDED);
- iPaylogService.updateById(paylog);
- this.updateById(order);
+ if (CollUtils.isNotEmpty(orderAuctionBond)) {
+ for (OrderAuctionBond auctionBond : orderAuctionBond) {
+ Paylog paylog = iPaylogService.lambdaQuery()
+ .in(Paylog::getOutTradeNo, auctionBond.getOrderNo())
+ .one();
+ boolean result = handleRefund(auctionBond.getPaymentMethod(), paylog,
+ auctionBond.getOrderNo());
+ if (result) {
+ paylog.setState(3);// 已退款
+ auctionBond.setBoundStatus(BondStatusEnum.REFUNDED);
+ iPaylogService.updateById(paylog);
+ this.updateById(order);
+ }
}
}
}
@@ -1371,4 +1547,15 @@
public List<Order> getStaticsOrderList(LocalDateTime startTime, LocalDateTime endTime) {
return baseMapper.getStaticsOrderList(startTime, endTime);
}
+
+ @Override
+ public List<Order> getOrderListByMubres(List<String> mubres) {
+ return this.lambdaQuery().in(Order::getGroupNo, mubres).list();
+ }
+
+ @Override
+ public void updateOrderStatusByMubres(List<String> formedGroupMubres) {
+ this.lambdaUpdate().set(Order::getIsOrder, 1).in(Order::getGroupNo, formedGroupMubres)
+ .update();
+ }
}
--
Gitblit v1.7.1