From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 493 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 412 insertions(+), 81 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 aab1f9b..59e3413 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,19 +7,22 @@
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.*;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.AuditStatusEnum;
import com.ruoyi.common.core.enums.BondStatusEnum;
+import com.ruoyi.common.core.enums.CouponUseEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.OrderTypeEnum;
import com.ruoyi.common.core.enums.PaymentMethodEnum;
+import com.ruoyi.common.core.enums.PointStatusEnum;
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.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;
@@ -36,8 +39,21 @@
import com.ruoyi.order.service.IPaylogService;
import com.ruoyi.order.util.OrderUtil;
import com.ruoyi.order.util.SinataUtil;
+import com.ruoyi.order.vo.HomeGoodsSkuDTO1;
+import com.ruoyi.order.vo.WdOrderVO;
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;
@@ -45,23 +61,26 @@
import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
+import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
import com.ruoyi.system.api.domain.dto.MgtAfterSaleSettingDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
-import com.ruoyi.system.api.domain.vo.Express100VO;
-import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
-import com.ruoyi.system.api.domain.vo.MemberOrderNumVO;
-import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
-import com.ruoyi.system.api.domain.vo.OrderVO;
+import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.feignClient.AuctionClient;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.PromotionClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
+import io.seata.spring.annotation.GlobalTransactional;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.regex.Matcher;
@@ -69,9 +88,11 @@
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.Synchronized;
+import org.apache.commons.collections.map.HashedMap;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* <p>
@@ -82,6 +103,7 @@
* @since 2024-05-16
*/
@Service
+@SuppressWarnings("unchecked")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
@Resource
@@ -164,6 +186,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){
@@ -216,7 +239,7 @@
*/
@Override
public Integer getGroupPurchasesGoodsNum(Long id) {
- List<Order> list = this.lambdaQuery().eq(Order::getId, id)
+ List<Order> list = this.lambdaQuery().eq(Order::getGoodsSkuId, id)
.in(Order::getOrderStatus, OrderStatusEnum.TO_BE_SHIPPED,
OrderStatusEnum.GOODS_TO_BE_RECEIVED, OrderStatusEnum.FINISHED).list();
return list.stream().map(Order::getGoodsQuantity).reduce(0, Integer::sum);
@@ -244,8 +267,18 @@
}
@Override
+ public Order getOrderByGroupPurchaseMemberId2(HomeGoodsSkuDTO homeGoodsSkuDTO) {
+ return baseMapper.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO);
+ }
+
+ @Override
public List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO) {
return baseMapper.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO);
+ }
+
+ @Override
+ public List<OrderVO> getOrderByGroupPurchaseMemberList1(HomeGoodsSkuDTO homeGoodsSkuDTO) {
+ return null;
}
@Override
@@ -322,6 +355,7 @@
MemberOrderDTO memberOrderDTO1=new MemberOrderDTO();
memberOrderDTO1.setMemberId(order.getMemberId());
+ memberOrderDTO1.setId(order.getId());
memberOrderDTO1.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1);
Integer num1=0;
@@ -333,9 +367,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());
@@ -370,10 +407,29 @@
if (data.getStartStatus().getCode()==0){
throw new ServiceException("该商品未开始");
}
- Integer m=data.getCurrentNumber()+1;
+ GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ if (goodsSeckiGoodsGroupPurchaseInfo==null){
+ GoodsGroupPurchase data1 = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ Integer num= data.getGroupSize()*data.getLimitNumber();
+ GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data1.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ if (goodsSku.getStock()<num){
+ throw new ServiceException("该商品库存不足无法团购");
+ }
+
+ GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
+ goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
+ goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()-num);
+ goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
+ SecurityConstants.INNER);
+
+ }
+ /*Integer m=data.getCurrentNumber()+1;
if (m>data.getGroupSize()){
throw new ServiceException("对不起，大成团人数");
- }
+ }*/
+
+
+
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
memberOrderVO.setPrice(data.getGroupPurchasePrice());
@@ -496,19 +552,20 @@
if (order.getOrderFrom().getCode()==2){
MemberOrderDTO memberOrderDTO1=new MemberOrderDTO();
memberOrderDTO1.setMemberId(order.getMemberId());
+ memberOrderDTO1.setId(order.getId());
memberOrderDTO1.setGoodsSkuId(order.getGoodsSkuId());
Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1);
Integer num1=0;
- if (num!=null){
- num1 =num+order.getGoodsQuantity();
- }else{
- num1=order.getGoodsQuantity();
- }
+ if (num!=null){
+ num1 =num+memberOrderDTO.getGoodsQuantity();
+ }else{
+ num1=order.getGoodsQuantity();
+ }
GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
- if (num1!=order.getGoodsQuantity()){
+
if (data.getLimitNumber()<num1){
throw new ServiceException("对不起，大于商品购买数");
}else{
@@ -544,7 +601,7 @@
memberOrderVO.setSkuName(goodsSku.getSkuName());
memberOrderVO.setYouhiPrice(data.getSeckillPrice());
- }
+
} if (order.getOrderFrom().getCode()==3){
order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
@@ -598,6 +655,7 @@
pice=pice.subtract(data.getReductionAmount());
order.setDiscountMoney(data.getReductionAmount());
}else{
+ order.setDiscountMoney(pice);
pice=new BigDecimal(0);
}
@@ -605,31 +663,45 @@
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();
BigDecimal pice1=new BigDecimal(data.getDiscountRate());
BigDecimal pice2=new BigDecimal(0.1);
BigDecimal pice3=pice.multiply(pice1.multiply(pice2));
- if (pice3.compareTo(new BigDecimal(data.getMaxDiscount().doubleValue()))>0){
- pice3=new BigDecimal(data.getMaxDiscount().doubleValue());
+ if (data.getMaxDiscount()!=null){
+ if (pice3.compareTo(new BigDecimal(data.getMaxDiscount().doubleValue()))>0){
+ pice3=new BigDecimal(data.getMaxDiscount().doubleValue());
+ }
}
- if(pice.compareTo(pice3)<0){
- throw new ServiceException("优惠卷抵扣金额不能大于实际支付金额");
+ if(pice.compareTo(pice3)>0){
+ BigDecimal pice4= pice.subtract(pice3);
+ if (data.getMaxDiscount()!=null){
+ 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.subtract(pice3));
+ 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());
@@ -687,6 +759,16 @@
}
@Override
+ public void updMemberOrderbz(MemberOrderDTO memberOrderDTO) {
+ Order order = baseMapper.selectById(memberOrderDTO.getId());
+ if(memberOrderDTO.getOrderRemark()!=null){
+ order.setOrderRemark(memberOrderDTO.getOrderRemark());
+ }
+ baseMapper.updateById(order);
+
+ }
+
+ @Override
public PageDTO<MemberOrderListVO> MemberrderList(MemberOrderListDTO memberOrderListDTO) {
Page<Order> page = new Page<>(memberOrderListDTO.getPageCurr(), memberOrderListDTO.getPageSize());
@@ -707,7 +789,7 @@
}
wrapper.eq(Order::getIsOrder,1);
wrapper.eq(Order::getDelFlag,0);
- wrapper.orderByDesc(Order::getCancelTime);
+ wrapper.orderByDesc(Order::getCreateTime);
Page<Order> page1 = this.page(page, wrapper);
PageDTO<MemberOrderListVO> memberOrderListVOPageDTO = PageDTO.of(page1, MemberOrderListVO.class);
@@ -721,6 +803,42 @@
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);
+ }
+
+ 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);
+ }
+
+ if(order.getOrderNo().contains("MS")){
+ GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
+ goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
+ goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
+ if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
+ goodsStockUpdDTO1.setSoldQuantity(0);
+ }else {
+ goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
+ }
+ goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
+ }
+
+
this.updateById(order);
}
@@ -750,6 +868,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()));
}
@@ -762,6 +885,7 @@
OrderVO orderVO=new OrderVO();
try {
orderVO = BeanUtils.copyBean(order, OrderVO.class);
+ orderVO.setAuctionType(order.getAuctionOrderType());
if (orderVO.getOrderFrom().getCode()==3){
GoodsGroupPurchase data = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
orderVO.setGroupTime(data.getGroupTime());
@@ -792,10 +916,14 @@
}
}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());
@@ -847,7 +975,16 @@
}
+ if(order.getOrderNo().contains("TG")){
+ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo();
+ goodsGroupPurchaseInfo.setGroupPurchaseId(order.getGoodsSkuId());
+ goodsGroupPurchaseInfo.setMubre(order.getGroupNo());
+ GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData();
+ if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
+ }
+ }
}
if (order.getOrderStatus().getCode() == 2) {
@@ -879,6 +1016,16 @@
goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
}
goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
+ }
+
+ if(order.getOrderNo().contains("TG")){
+ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo();
+ goodsGroupPurchaseInfo.setMubre(order.getGroupNo());
+ GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData();
+ if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
+
+ }
}
if (order.getCouponId()!=0){
@@ -946,7 +1093,7 @@
goodsGroupPurchaseInfo.setMubre(byId.getGroupNo());
GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo1(goodsGroupPurchaseInfo, SecurityConstants.INNER).getData();
if (goodsSeckiGoodsGroupPurchaseInfo!=null){
- GoodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
+ GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
}
}
@@ -1072,6 +1219,42 @@
Order order = this.getById(MemberOrderList.getId());
order.setOrderStatus(OrderStatusEnum.CANCELED);
this.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);
+ }
+
+ if(order.getOrderNo().contains("MS")){
+ GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
+ goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
+ goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
+ if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
+ goodsStockUpdDTO1.setSoldQuantity(0);
+ }else {
+ goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
+ }
+ goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
+ }
+
}
}
@@ -1085,6 +1268,7 @@
paylogEntityWrapper.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
paylogEntityWrapper.eq(Order::getOrderStatus,1);
paylogEntityWrapper.eq(Order::getDelFlag,0);
+ paylogEntityWrapper.eq(Order::getIsOrder,1);
List<Order> list = this.list(paylogEntityWrapper);
vo.setDzforderNo(list.size());
@@ -1092,6 +1276,7 @@
paylogEntityWrapper1.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
paylogEntityWrapper1.eq(Order::getOrderStatus,2);
paylogEntityWrapper1.eq(Order::getDelFlag,0);
+ paylogEntityWrapper1.eq(Order::getIsOrder,1);
List<Order> list1 = this.list(paylogEntityWrapper1);
vo.setDfhorderNo(list1.size());
@@ -1099,6 +1284,7 @@
paylogEntityWrapper2.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
paylogEntityWrapper2.eq(Order::getOrderStatus,3);
paylogEntityWrapper2.eq(Order::getDelFlag,0);
+ paylogEntityWrapper2.eq(Order::getIsOrder,1);
List<Order> list2 = this.list(paylogEntityWrapper2);
vo.setDshorderNo(list2.size());
@@ -1108,9 +1294,68 @@
paylogEntityWrapper3.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
paylogEntityWrapper3.eq(Order::getIsRequest,2);
paylogEntityWrapper3.eq(Order::getDelFlag,0);
+ paylogEntityWrapper3.eq(Order::getIsOrder,1);
List<Order> list3 = this.list(paylogEntityWrapper3);
vo.setShorderNo(list3.size());
return vo;
+ }
+
+ @Override
+ public PageDTO<WdOrderVO> CtjlGoodsGroupPurchase(HomeGoodsSkuDTO1 homeGoodsSkuDTO1) {
+ LambdaQueryWrapper< Order> wrapper1= Wrappers.lambdaQuery();
+ if (homeGoodsSkuDTO1.getSkuName()!=null&&homeGoodsSkuDTO1.getSkuName()!=""){
+ wrapper1.like(Order::getSkuName,homeGoodsSkuDTO1.getSkuName());
+ }
+ wrapper1.eq(Order::getMemberId,homeGoodsSkuDTO1.getMemberId());
+ wrapper1.eq(Order::getOrderFrom,3);
+ wrapper1.eq(Order::getDelFlag,0);
+ wrapper1.eq(Order::getOrderStatus,2);
+ Page<Order> page = new Page<>(homeGoodsSkuDTO1.getPageCurr(), homeGoodsSkuDTO1.getPageSize());
+ Page< Order> page1 = this.page(page, wrapper1);
+ PageDTO<WdOrderVO> HomeGoodsSeckillVOPageDTO = PageDTO.of(page1, WdOrderVO.class);
+ List<WdOrderVO> list2 = HomeGoodsSeckillVOPageDTO.getList();
+
+ for (WdOrderVO goodsGroupPurchaseeVO1:list2) {
+
+ Order byId1 = this.getById(goodsGroupPurchaseeVO1.getId());
+
+ GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(byId1.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ BeanUtils.copyProperties(data,goodsGroupPurchaseeVO1);
+ GoodsSku byId = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ goodsGroupPurchaseeVO1.setGoodsSkuName(byId.getSkuName());
+ goodsGroupPurchaseeVO1.setCoverPic(byId.getCoverPic());
+ goodsGroupPurchaseeVO1.setPrice(byId.getPrice());
+ goodsGroupPurchaseeVO1.setYears(String.valueOf(byId.getYears().getYear()));
+ goodsGroupPurchaseeVO1.setIsGoodsGroupPurchase(2);
+ if (byId1.getGroupNo()!=null){
+ GoodsGroupPurchaseInfo one1 = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(byId1.getGroupNo(), SecurityConstants.INNER).getData();
+ if (one1!=null) {
+ goodsGroupPurchaseeVO1.setCurrentNumber(one1.getCurrentNumber());
+ if (one1.getGroupStatus() == 0) {
+ if (one1.getGroupSize() - one1.getCurrentNumber() < 5) {
+ goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.MS_FAILURE);
+ } else {
+ goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
+ }
+ }
+ if (one1.getGroupStatus() == 1) {
+ goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
+ }
+ if (one1.getGroupStatus() == 2) {
+ goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
+ }
+ }else{
+ goodsGroupPurchaseeVO1.setGroupStatus(data.getGroupStatus());
+ }
+ }
+
+
+
+
+ }
+
+
+ return HomeGoodsSeckillVOPageDTO;
}
/**
@@ -1121,8 +1366,7 @@
*/
@Override
public List<Order> getOrderByCouponIds(Collection<Long> couponIds) {
- return this.lambdaQuery().in(Order::getCouponId, couponIds)
- .eq(Order::getOrderStatus, OrderStatusEnum.FINISHED).list();
+ return this.lambdaQuery().in(Order::getCouponId, couponIds).list();
}
/**
@@ -1177,71 +1421,99 @@
pageVO = PageDTO.empty(page);
}
pageVO = PageDTO.of(page, MgtOrderVO.class);
- if (query.getOrderFrom() == OrderFromEnum.AUCTION_ORDERS) {
- List<MgtOrderVO> list = pageVO.getList();
+ List<MgtOrderVO> voList = pageVO.getList();
+ if (query.getQueryType() == OrderTypeEnum.AUCTION_ORDER) {
+ List<MgtOrderVO> list = voList;
// 封装参数查询拍卖会
Set<Long> auctionSalesroomGoodsIdSet = list.stream()
- .filter(order -> order.getAuctionType() == AuctionOrderTypeEnum.AUCTION_ITEMS)
+ .filter(order -> order.getAuctionOrderType()
+ == AuctionOrderTypeEnum.AUCTION_ITEMS)
.map(MgtOrderVO::getGoodsSkuId).collect(Collectors.toSet());
List<AuctionSalesroom> auctionSalesroomList = auctionClient.getAuctionSalesroomByIds(
auctionSalesroomGoodsIdSet, SecurityConstants.INNER)
.getData();
- Map<Long, String> salesroomMap = auctionSalesroomList.stream()
- .collect(Collectors.toMap(AuctionSalesroom::getId,
- AuctionSalesroom::getSalesroomName));
+ Map<Long, String> salesroomMap = new HashedMap();
+ Set<Long> auctionSalesroomSet = new HashSet<>();
+ if (CollUtils.isNotEmpty(auctionSalesroomList)) {
+ salesroomMap = auctionSalesroomList.stream()
+ .collect(Collectors.toMap(AuctionSalesroom::getId,
+ AuctionSalesroom::getSalesroomName));
+ auctionSalesroomList.stream()
+ .map(AuctionSalesroom::getId)
+ .collect(Collectors.toSet());
+ }
// 封装参数查询拍卖订单保证金
Set<Long> auctionGoodsIdSet = list.stream()
- .filter(order -> order.getAuctionType() == AuctionOrderTypeEnum.REGULAR_ITEMS)
+ .filter(order -> order.getAuctionOrderType()
+ == AuctionOrderTypeEnum.REGULAR_ITEMS)
.map(MgtOrderVO::getGoodsSkuId)
.collect(Collectors.toSet());
- Set<Long> auctionSalesroomSet = auctionSalesroomList.stream()
- .map(AuctionSalesroom::getId)
- .collect(Collectors.toSet());
-
- List<OrderAuctionBond> auctionBondList = orderAuctionBondMapper.selectList(
+ List<OrderAuctionBond> auctionSalesroomBondList = orderAuctionBondMapper.selectList(
Wrappers.lambdaQuery(OrderAuctionBond.class)
- .in(OrderAuctionBond::getAuctionGoodsId, auctionGoodsIdSet)
- .in(OrderAuctionBond::getAuctionSalesroomId, auctionSalesroomSet)
+ .in(CollUtils.isNotEmpty(auctionSalesroomSet),
+ OrderAuctionBond::getAuctionSalesroomId, auctionSalesroomSet)
+ .eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID)
+ .groupBy(OrderAuctionBond::getAuctionSalesroomId,
+ OrderAuctionBond::getMemberId));
+ List<OrderAuctionBond> auctionGoodsBondList = orderAuctionBondMapper.selectList(
+ Wrappers.lambdaQuery(OrderAuctionBond.class)
+ .in(CollUtils.isNotEmpty(auctionGoodsIdSet),
+ OrderAuctionBond::getAuctionGoodsId, auctionGoodsIdSet)
.eq(OrderAuctionBond::getBoundStatus,
- BondStatusEnum.PAID));
- Map<String, OrderAuctionBond> auctionSalesroomBondMap = auctionBondList.stream()
+ BondStatusEnum.PAID)
+ .groupBy(OrderAuctionBond::getAuctionGoodsId,
+ OrderAuctionBond::getMemberId));
+ Map<String, OrderAuctionBond> auctionSalesroomBondMap = auctionSalesroomBondList.stream()
.filter(bond -> bond.getBondType() == AuctionOrderTypeEnum.AUCTION_ITEMS)
.collect(Collectors.toMap(
bond -> bond.getAuctionSalesroomId() + "-" + bond.getMemberId(),
Function.identity()));
- Map<String, OrderAuctionBond> auctionSalesroomGoodsBondMap = auctionBondList.stream()
+ Map<String, OrderAuctionBond> auctionSalesroomGoodsBondMap = auctionGoodsBondList.stream()
.filter(bond -> bond.getBondType() == AuctionOrderTypeEnum.REGULAR_ITEMS)
.collect(Collectors.toMap(
bond -> bond.getAuctionGoodsId() + "-" + bond.getMemberId(),
Function.identity()));
-
- list.forEach(order -> {
- if (order.getAuctionType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
+ for (MgtOrderVO order : list) {
+ if (order.getAuctionOrderType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
order.setSalesroomName(
- StringUtils.isNotBlank(salesroomMap.get(order.getGoodsSkuId()))
+ StringUtils.isNotBlank(salesroomMap.get(order.getAuctionSalesroomId()))
? salesroomMap.get(order.getAuctionSalesroomId()) : "无");
order.setBoundStatus(
StringUtils.isNotNull(auctionSalesroomBondMap.get(
- order.getAuctionSalesroomId() + "-" + order.getMemberId())
- .getBoundStatus())
+ order.getAuctionSalesroomId() + "-" + order.getMemberId()))
? auctionSalesroomBondMap.get(
order.getAuctionSalesroomId() + "-" + order.getMemberId())
.getBoundStatus()
: null);
}
- if (order.getAuctionType() == AuctionOrderTypeEnum.REGULAR_ITEMS) {
+ if (order.getAuctionOrderType() == AuctionOrderTypeEnum.REGULAR_ITEMS) {
order.setSalesroomName("无");
order.setBoundStatus(
StringUtils.isNotNull(auctionSalesroomGoodsBondMap.get(
- order.getGoodsSkuId() + "-" + order.getMemberId())
- .getBoundStatus())
+ order.getGoodsSkuId() + "-" + order.getMemberId()))
? auctionSalesroomGoodsBondMap.get(
order.getGoodsSkuId() + "-" + order.getMemberId())
.getBoundStatus()
: null);
}
- });
+ }
+
+ }
+ Set<Long> memberVoIdSet = voList.stream().map(MgtOrderVO::getMemberId)
+ .collect(Collectors.toSet());
+ List<Member> data = memberClient.getMemberListByIds(memberVoIdSet, SecurityConstants.INNER)
+ .getData();
+ if (CollUtils.isNotEmpty(data)) {
+ 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;
}
@@ -1274,7 +1546,7 @@
}
}
// 查询售后信息
- if (order.getOrderStatus() == OrderStatusEnum.AFTER_SALE) {
+ if (order.getIsRequest() == 2) {
OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
Wrappers.lambdaQuery(OrderReturnRequest.class)
.eq(OrderReturnRequest::getOrderId,
@@ -1345,8 +1617,13 @@
* @param id 订单id
*/
@Override
+ @GlobalTransactional(rollbackFor = Exception.class)
+ @Transactional
public void refund(Long id) {
Order order = getOrder(id);
+ if (order.getIsRequest() == 2) {
+ throw new ServiceException("该订单已是售后状态");
+ }
String orderNo = order.getOrderNo();
Paylog paylog = iPaylogService.lambdaQuery().eq(Paylog::getOutTradeNo, orderNo)
.last("limit 1").one();
@@ -1365,7 +1642,33 @@
orderReturnRequest.setRequestReason("管理后台退款");
orderReturnRequest.setStatus(ReturnRequestStatusEnum.COMPLETED);
orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
+ orderReturnRequest.setAuditTime(LocalDateTime.now());
orderReturnRequestService.save(orderReturnRequest);
+ }
+ order.setIsRequest(2);
+ this.updateById(order);
+ // 扣除订单积分
+ Member member = memberClient.getMembeOne(order.getMemberId(), SecurityConstants.INNER)
+ .getData();
+ if (StringUtils.isNotNull(member)) {
+ MemberPointsDTO memberPointsDTO = new MemberPointsDTO();
+ memberPointsDTO.setMemberId(order.getMemberId());
+ memberPointsDTO.setPointsType(1);
+ memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
+ memberPointsDTO.setPoints(order.getPoints());
+ memberClient.addMemberPoints(memberPointsDTO);
+
+ updMembeOneDTO updMembeOneDTO = new updMembeOneDTO();
+ updMembeOneDTO.setMemberId(order.getMemberId());
+ updMembeOneDTO.setType(2);
+ updMembeOneDTO.setTotalPoints(Math.max(member.getTotalPoints() - order.getPoints(), 0));
+ memberClient.updMembeOne(updMembeOneDTO, SecurityConstants.INNER);
+ }
+ if (Objects.nonNull(order.getCouponId())) {
+ CouponMemberDTO dto = new CouponMemberDTO();
+ dto.setId(order.getCouponId());
+ dto.setCouponStatus(CouponUseEnum.UNUSED.getCode());
+ promotionClient.updCouponMember(dto, SecurityConstants.INNER);
}
}
@@ -1399,9 +1702,12 @@
@Override
public void refundReturn(Long id) {
Order order = getOrder(id);
+ if (order.getIsRequest() == 2) {
+ throw new ServiceException("该订单已是售后状态");
+ }
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)) {
@@ -1416,6 +1722,7 @@
orderReturnRequest.setRequestReason("管理后台退款退货");
orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_RETURNED);
orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
+ orderReturnRequest.setAuditTime(LocalDateTime.now());
orderReturnRequestService.save(orderReturnRequest);
}
@@ -1441,29 +1748,24 @@
if (order.getAuctionOrderType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
orderAuctionBond = orderAuctionBondMapper.selectOne(
Wrappers.lambdaQuery(OrderAuctionBond.class)
+ .eq(OrderAuctionBond::getOrderId, id)
.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(
Wrappers.lambdaQuery(OrderAuctionBond.class)
+ .eq(OrderAuctionBond::getOrderId, id)
.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 (StringUtils.isNotNull(orderAuctionBond)) {
+ Paylog paylog = iPaylogService.lambdaQuery()
+ .in(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo())
+ .one();
+ boolean result = handleRefund(orderAuctionBond.getPaymentMethod(), paylog,
+ orderAuctionBond.getOrderNo());
if (result) {
paylog.setState(3);// 已退款
orderAuctionBond.setBoundStatus(BondStatusEnum.REFUNDED);
@@ -1484,4 +1786,33 @@
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();
+ }
+
+
+ @Override
+ public void updateOrderStatusByMubres1(String formedGroupMubres) {
+ LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(Order::getGroupNo, formedGroupMubres);
+ List<Order> page1 = this.list(wrapper);
+ for (Order p:page1){
+ p.setIsOrder(1);
+ this.updateById(p);
+ }
+
+ }
+
+ @Override
+ public List<Order> updateOrderStatusByMubres2(String formedGroupMubres) {
+ return this.lambdaQuery().eq(Order::getGroupNo, formedGroupMubres).list();
+ }
}
--
Gitblit v1.7.1