From 7a92c0228a9b282e4b3cb2ae4a0035cec34feb67 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 12 三月 2025 18:12:31 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 694 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 531 insertions(+), 163 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 59e3413..b880dd1 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
@@ -5,13 +5,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.SecurityConstants;
-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.GroupStatusEnum;
+import com.ruoyi.common.core.enums.MemberVipClassifyEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.OrderTypeEnum;
@@ -19,6 +21,7 @@
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.enums.StartStatusEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
@@ -54,6 +57,7 @@
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.PromotionWishRecommend;
import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
@@ -65,7 +69,12 @@
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.*;
+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.MgtPromotionWishRecommendVO;
+import com.ruoyi.system.api.domain.vo.OrderVO;
import com.ruoyi.system.api.feignClient.AuctionClient;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
@@ -80,6 +89,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Optional;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
@@ -88,7 +98,9 @@
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.Synchronized;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.map.HashedMap;
+import org.jetbrains.annotations.NotNull;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
@@ -102,6 +114,7 @@
* @author mitao
* @since 2024-05-16
*/
+@Slf4j
@Service
@SuppressWarnings("unchecked")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
@@ -148,7 +161,7 @@
@Override
- public void saveOrderOne(OrderDTO OrderDTO) {
+ public Long saveOrderOne(OrderDTO OrderDTO) {
Order order=new Order();
if (OrderDTO.getOrderFrom().getCode()==1){
order.setOrderFrom(OrderFromEnum.COMMODITY_ORDER);
@@ -168,6 +181,9 @@
order.setOrderFrom(OrderFromEnum.AUCTION_ORDERS);
order.setOrderNo(OrderUtil.getOrderNoForPrefix("PM"));
order.setIsOrder(1);
+ if (OrderDTO.getAuctionType().equals(AuctionOrderTypeEnum.AUCTION_ITEMS)) {
+ order.setAuctionSalesroomId(OrderDTO.getAuctionSalesroomId());
+ }
}
order.setOrderTime(OrderDTO.getOrderTime());
order.setOrderFrom(OrderDTO.getOrderFrom());
@@ -177,7 +193,8 @@
order.setTotalAmount(OrderDTO.getTotalAmount());
order.setOrderStatus(OrderStatusEnum.TO_PLAY);
order.setPoints(OrderDTO.getPoints());
- order.setGoodsQuantity(1);
+ order.setGoodsQuantity(
+ Objects.nonNull(OrderDTO.getGoodsQuantity()) ? OrderDTO.getGoodsQuantity() : 1);
order.setReceiverName(OrderDTO.getReceiverName());
order.setReceiverPhone(OrderDTO.getReceiverphone());
order.setReceiverCity(OrderDTO.getReceiverCity());
@@ -187,7 +204,10 @@
order.setPrice(OrderDTO.getPrice());
order.setCoverPic(OrderDTO.getCoverPic());
order.setOrderTimeSx(OrderDTO.getOrderTimeSx());
+ order.setGoodsId(OrderDTO.getGoodsId());
this.save(order);
+
+
if (OrderDTO.getOrderFrom().getCode()==4){
if (OrderDTO.getAuctionType().getCode()==1){
@@ -203,7 +223,6 @@
if (OrderDTO.getAuctionType().getCode()==2){
LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
wrapper.eq(OrderAuctionBond::getMemberId,OrderDTO.getMemberId());
- wrapper.eq(OrderAuctionBond::getAuctionGoodsId,OrderDTO.getGoodsSkuId());
wrapper.eq(OrderAuctionBond::getBoundStatus,2);
wrapper.eq(OrderAuctionBond::getAuctionSalesroomId,OrderDTO.getAuctionSalesroomId());
wrapper.eq(OrderAuctionBond::getBondType,2);
@@ -217,7 +236,7 @@
}
-
+ return order.getId();
}
/**
@@ -284,7 +303,6 @@
@Override
@Synchronized
public MemberTiOrderVO saveMemberOrder(MemberOrderDTO memberOrderDTO) {
-
MemberTiOrderVO memberOrderVO=new MemberTiOrderVO();
BigDecimal pice=new BigDecimal(0);
@@ -303,6 +321,10 @@
order.setOrderNo(OrderUtil.getOrderNoForPrefix("TG"));
order.setIsOrder(2);
}
+ if (memberOrderDTO.getOrderFrom() == OrderFromEnum.WISH_ORDER.getCode()) {
+ order.setOrderFrom(OrderFromEnum.WISH_ORDER);
+ order.setOrderNo(OrderUtil.getOrderNoForPrefix("QG"));
+ }
if (memberOrderDTO.getPaymentMethod()==1){
order.setPaymentMethod(PaymentMethodEnum.WECHAT);
}if (memberOrderDTO.getPaymentMethod()==2){
@@ -317,21 +339,36 @@
if (goodsSku.getStock()<memberOrderDTO.getGoodsQuantity()){
throw new ServiceException("该商品已售罄，暂无库存");
}else{
+ // 远程调用用户服务，获取用户信息
+ Member member = memberClient.getMembeOne(memberOrderDTO.getMemberId(),
+ SecurityConstants.INNER)
+ .getData();
+ if (Objects.isNull(member)) {
+ throw new ServiceException("获取用户信息失败");
+ }
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()-memberOrderDTO.getGoodsQuantity());
goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
SecurityConstants.INNER);
+
order.setSkuName(goodsSku.getSkuName());
order.setPrice(goodsSku.getPrice());
order.setCoverPic(goodsSku.getCoverPic());
+ order.setGoodsId(goodsSku.getId());
+ if (Objects.nonNull(member.getVipClassify()) && !member.getVipClassify()
+ .equals(MemberVipClassifyEnum.NORMAL.getCode())) {
+ BigDecimal vipPrice = getVipPrice(goodsSku, member.getVipClassify());
+ order.setPrice(vipPrice);
+ }
}
memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
memberOrderVO.setPrice(goodsSku.getPrice());
memberOrderVO.setCoverPic(goodsSku.getCoverPic());
memberOrderVO.setSkuName(goodsSku.getSkuName());
- pice=goodsSku.getPrice();
+
+ pice = order.getPrice();
}
if (memberOrderDTO.getOrderFrom()==2){
GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
@@ -396,6 +433,7 @@
order.setPrice(data.getSeckillPrice());
order.setCoverPic(goodsSku.getCoverPic());
order.setSjPrice(goodsSku.getPrice());
+ order.setGoodsId(goodsSku.getId());
redisService.setCacheObject(CacheConstants.SECKILL_GOODS + data.getId(), surpNum - memberOrderDTO.getGoodsQuantity());
}
if (memberOrderDTO.getOrderFrom()==3){
@@ -443,6 +481,39 @@
order.setPrice(data.getGroupPurchasePrice());
order.setCoverPic(goodsSku.getCoverPic());
order.setSjPrice(goodsSku.getPrice());
+ order.setGoodsId(goodsSku.getId());
+ }
+ if (memberOrderDTO.getOrderFrom() == OrderFromEnum.WISH_ORDER.getCode()) {
+ // 远程调用营销服务，获取推荐商品信息
+ PromotionWishRecommend recommend = promotionClient.getPromotionWishRecommend(
+ memberOrderDTO.getGoodsSkuId(),
+ SecurityConstants.INNER).getData();
+ if (Objects.isNull(recommend)) {
+ throw new ServiceException("推荐商品不存在");
+ }
+ if (recommend.getExpireTime().isBefore(LocalDateTime.now())) {
+ throw new ServiceException("推荐商品已过期");
+ }
+ if (recommend.getAvailableNum().compareTo(memberOrderDTO.getGoodsQuantity()) < 0) {
+ throw new ServiceException("推荐商品可购数量不足");
+ }
+ // 远程调用，更新可购数量
+ Integer res = promotionClient.subRecommendAvailableNum(
+ memberOrderDTO.getGoodsQuantity(),
+ recommend.getId(), SecurityConstants.INNER).getData();
+ if (res == 0) {
+ throw new ServiceException("推荐商品可购数量不足");
+ }
+ memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
+ memberOrderVO.setPrice(recommend.getSellingPrice());
+ memberOrderVO.setCoverPic(recommend.getGoodsImageUrl());
+ memberOrderVO.setSkuName(recommend.getGoodsName());
+ pice = recommend.getSellingPrice();
+ order.setSkuName(recommend.getGoodsName());
+ order.setPrice(recommend.getSellingPrice());
+ order.setCoverPic(recommend.getGoodsImageUrl());
+ order.setSjPrice(recommend.getSellingPrice());
+ order.setGoodsId(recommend.getId());
}
order.setOrderRemark(memberOrderDTO.getOrderRemark());
order.setMemberId(memberOrderDTO.getMemberId());
@@ -473,6 +544,16 @@
memberOrderVO.setReceiverCity(data.getReceiverCity());
memberOrderVO.setReceiverDetailAddress(data.getDetailedAddress());
memberOrderVO.setReceiverphone(data.getRecipientPhone());
+ } else {
+ order.setReceiverName(memberOrderDTO.getReceiverName());
+ order.setReceiverCity(memberOrderDTO.getReceiverCity());
+ order.setReceiverDetailAddress(memberOrderDTO.getReceiverDetailAddress());
+ order.setReceiverPhone(memberOrderDTO.getReceiverphone());
+
+ memberOrderVO.setReceiverName(memberOrderDTO.getReceiverName());
+ memberOrderVO.setReceiverCity(memberOrderDTO.getReceiverCity());
+ memberOrderVO.setReceiverDetailAddress(memberOrderDTO.getReceiverDetailAddress());
+ memberOrderVO.setReceiverphone(memberOrderDTO.getReceiverphone());
}
order.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
@@ -506,8 +587,21 @@
return memberOrderVO;
}
+ private BigDecimal getVipPrice(GoodsSku goodsSku, Integer vipClassify) {
+ if (Objects.isNull(goodsSku)) {
+ throw new ServiceException("当前商品已下架");
+ }
+ BigDecimal price = BigDecimal.ZERO;
+ if (MemberVipClassifyEnum.VIP.getCode().equals(vipClassify)) {
+ price = goodsSku.getVipPrice();
+ } else if (MemberVipClassifyEnum.SUPER_VIP.getCode().equals(vipClassify)) {
+ price = goodsSku.getSuperVipPrice();
+ }
+ return price;
+ }
@Override
public MemberTiOrderVO updMemberOrder(MemberOrderDTO memberOrderDTO) {
+
Order order = baseMapper.selectById(memberOrderDTO.getId());
if(memberOrderDTO.getOrderRemark()!=null){
order.setOrderRemark(memberOrderDTO.getOrderRemark());
@@ -540,15 +634,14 @@
goodsStockUpdDTO.setAuctionStock(m-memberOrderDTO.getGoodsQuantity());
goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
SecurityConstants.INNER);
- order.setTotalAmount(goodsSku.getPrice().multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity())));
+ order.setTotalAmount(order.getPrice()
+ .multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity())));
order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
memberOrderVO.setPrice(goodsSku.getPrice());
memberOrderVO.setCoverPic(goodsSku.getCoverPic());
memberOrderVO.setSkuName(goodsSku.getSkuName());
}
-
-
if (order.getOrderFrom().getCode()==2){
MemberOrderDTO memberOrderDTO1=new MemberOrderDTO();
memberOrderDTO1.setMemberId(order.getMemberId());
@@ -602,8 +695,8 @@
memberOrderVO.setYouhiPrice(data.getSeckillPrice());
-
- } if (order.getOrderFrom().getCode()==3){
+ }
+ if (order.getOrderFrom().getCode() == 3) {
order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
@@ -633,6 +726,40 @@
}
}
}
+ }
+ if (order.getOrderFrom() == OrderFromEnum.WISH_ORDER) {
+ // 远程调用营销服务，获取推荐商品信息
+ PromotionWishRecommend recommend = promotionClient.getPromotionWishRecommend(
+ order.getGoodsSkuId(),
+ SecurityConstants.INNER).getData();
+ if (Objects.isNull(recommend)) {
+ throw new ServiceException("推荐商品不存在");
+ }
+ Integer availableNum = recommend.getAvailableNum() + order.getGoodsQuantity();
+ if (availableNum.compareTo(memberOrderDTO.getGoodsQuantity()) < 0) {
+ throw new ServiceException("推荐商品可购数量不足");
+ }
+ // 如果最新购买数比锁定库存数大，则扣减多出来的商品数量，否则恢复多出的锁定库存
+ if (memberOrderDTO.getGoodsQuantity().compareTo(order.getGoodsQuantity()) > 0) {
+ // 远程调用，更新可购数量
+ Integer res = promotionClient.subRecommendAvailableNum(
+ memberOrderDTO.getGoodsQuantity() - order.getGoodsQuantity(),
+ recommend.getId(), SecurityConstants.INNER).getData();
+ if (res == 0) {
+ throw new ServiceException("推荐商品可购数量不足");
+ }
+ } else {
+ promotionClient.addRecommendAvailableNum(
+ order.getGoodsQuantity() - memberOrderDTO.getGoodsQuantity(),
+ recommend.getId(), SecurityConstants.INNER);
+ }
+ order.setTotalAmount(recommend.getSellingPrice()
+ .multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity())));
+ order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
+ memberOrderVO.setGoodsSkuId(order.getGoodsSkuId());
+ memberOrderVO.setPrice(recommend.getSellingPrice());
+ memberOrderVO.setCoverPic(recommend.getGoodsImageUrl());
+ memberOrderVO.setSkuName(recommend.getGoodsName());
}
}
if (memberOrderDTO.getGoodsQuantity()!=null){
@@ -724,7 +851,7 @@
CustomConfig memberPointsMoney = sysUserClient.getconfig("MEMBER_POINTS_MONEY").getData();
CustomConfig memberPointsPoints = sysUserClient.getconfig("MEMBER_POINTS_POINTS").getData();
- if (pice.intValue()>0){
+ if (pice.doubleValue()>0){
BigDecimal divide = pice.divide(new BigDecimal(memberPointsMoney.getConfigValue()));
BigDecimal roundedDown = divide.setScale(0, RoundingMode.DOWN);
BigDecimal aDouble= roundedDown.multiply(new BigDecimal(memberPointsPoints.getConfigValue()));
@@ -794,9 +921,13 @@
PageDTO<MemberOrderListVO> memberOrderListVOPageDTO = PageDTO.of(page1, MemberOrderListVO.class);
List<MemberOrderListVO> list = memberOrderListVOPageDTO.getList();
+ Map<Long, GoodsSku> goodsUnitMap = getGoodsUnitMap(list);
for (MemberOrderListVO MemberOrderList:list){
if (MemberOrderList.getOrderStatus().getCode()==1){
- if (MemberOrderList.getOrderFrom().getCode()==1||MemberOrderList.getOrderFrom().getCode()==2||MemberOrderList.getOrderFrom().getCode()==3){
+ if (MemberOrderList.getOrderFrom().getCode() == 1
+ || MemberOrderList.getOrderFrom().getCode() == 2
+ || MemberOrderList.getOrderFrom().getCode() == 3
+ || MemberOrderList.getOrderFrom().equals(OrderFromEnum.WISH_ORDER)) {
LocalDateTime localDateTime = MemberOrderList.getOrderTime().plusMinutes(30);
if (LocalDateTime.now().isAfter(localDateTime)) {
// dateTime1 在 dateTime2 之后
@@ -837,7 +968,12 @@
}
goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
}
-
+ // 恢复推荐商品可购数量
+ if (MemberOrderList.getOrderFrom().equals(OrderFromEnum.WISH_ORDER)) {
+ promotionClient.addRecommendAvailableNum(
+ MemberOrderList.getGoodsQuantity(),
+ MemberOrderList.getGoodsSkuId(), SecurityConstants.INNER);
+ }
this.updateById(order);
}
@@ -849,7 +985,8 @@
Wrappers.lambdaQuery(OrderReturnRequest.class)
.eq(OrderReturnRequest::getOrderId,
MemberOrderList.getId()).last("limit 1"));
- if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
+ if (StringUtils.isNotNull(orderReturnRequest)
+ && orderReturnRequest.getStatus() != ReturnRequestStatusEnum.QX) {
MemberOrderList.setStatus(orderReturnRequest.getStatus());
MemberOrderList.setRequestId(orderReturnRequest.getId());
MemberOrderList.setIsRequest(2);
@@ -873,63 +1010,180 @@
MemberOrderList.setOrderShuoMin(memberPointsPoints.getConfigValue());
CustomConfig ReturnCycle = sysUserClient.getconfig("RETURN_CYCLE").getData();
MemberOrderList.setOrderZq(Integer.valueOf(ReturnCycle.getConfigValue()));
+
+ GoodsSku goodsSku =
+ Objects.nonNull(goodsUnitMap.get(MemberOrderList.getGoodsId()))
+ ? goodsUnitMap.get(MemberOrderList.getGoodsId())
+ : goodsUnitMap.get(MemberOrderList.getGoodsSkuId());
+ if (Objects.nonNull(goodsSku)) {
+ MemberOrderList.setUnit(goodsSku.getUnit());
+ MemberOrderList.setSpec(goodsSku.getSpec());
+ MemberOrderList.setSpecUnit(goodsSku.getSpecUnit());
+ }
}
return memberOrderListVOPageDTO;
}
+ @NotNull
+ private Map<Long, GoodsSku> getGoodsUnitMap(List<MemberOrderListVO> list) {
+ Map<Long, GoodsSku> goodsSkuMap = new HashedMap();
+ Set<Long> goodsSkuIdSet = list.stream()
+ .filter(vo -> vo.getOrderFrom().equals(OrderFromEnum.COMMODITY_ORDER))
+ .map(MemberOrderListVO::getGoodsSkuId)
+ .collect(Collectors.toSet());
+ if (CollUtils.isNotEmpty(goodsSkuIdSet)) {
+ goodsSkuMap = goodsSkuClient.getGoodsListByIds(goodsSkuIdSet,
+ SecurityConstants.INNER).getData().stream()
+ .collect(Collectors.toMap(GoodsSku::getId, Function.identity()));
+ }
+ Set<Long> seckillIdSet = list.stream()
+ .filter(vo -> vo.getOrderFrom().equals(OrderFromEnum.SNAP_ORDERS))
+ .map(MemberOrderListVO::getGoodsSkuId)
+ .collect(Collectors.toSet());
+
+ if (CollUtils.isNotEmpty(seckillIdSet)) {
+ Map<Long, GoodsSku> goodsSkuMap2 = goodsSkuClient.getGoodsSkuBySeckillIdSet(
+ seckillIdSet,
+ SecurityConstants.INNER).getData().stream()
+ .collect(Collectors.toMap(GoodsSku::getId, Function.identity()));
+ // 将goodsSkuMap2合并到goodsSkuMap中
+ goodsSkuMap.putAll(goodsSkuMap2);
+ }
+ Set<Long> groupPurchaseIdSet = list.stream()
+ .filter(vo -> vo.getOrderFrom().equals(OrderFromEnum.GROUP_PURCHASE_ORDERS))
+ .map(MemberOrderListVO::getGoodsSkuId)
+ .collect(Collectors.toSet());
+ if (CollUtils.isNotEmpty(groupPurchaseIdSet)) {
+ Map<Long, GoodsSku> goodsSkuMap3 = goodsSkuClient.getGoodsSkuByGroupPurchaseIdSet(
+ groupPurchaseIdSet,
+ SecurityConstants.INNER).getData().stream()
+ .collect(Collectors.toMap(GoodsSku::getId, Function.identity()));
+ goodsSkuMap.putAll(goodsSkuMap3);
+ }
+ Set<Long> auctionGoodsIdSet = list.stream()
+ .filter(vo -> vo.getOrderFrom().equals(OrderFromEnum.AUCTION_ORDERS)
+ && vo.getAuctionOrderType().equals(AuctionOrderTypeEnum.REGULAR_ITEMS))
+ .map(MemberOrderListVO::getGoodsSkuId)
+ .collect(Collectors.toSet());
+ if (CollUtils.isNotEmpty(auctionGoodsIdSet)) {
+ Map<Long, GoodsSku> goodsSkuMap4 = auctionClient.getGoodsSkuByAuctionGoodsIdSet(
+ auctionGoodsIdSet,
+ SecurityConstants.INNER).getData().stream()
+ .collect(Collectors.toMap(GoodsSku::getId, Function.identity()));
+ goodsSkuMap.putAll(goodsSkuMap4);
+ }
+ Set<Long> auctionSalesroomGoodsSet = list.stream()
+ .filter(vo -> vo.getOrderFrom().equals(OrderFromEnum.AUCTION_ORDERS)
+ && vo.getAuctionOrderType().equals(AuctionOrderTypeEnum.AUCTION_ITEMS))
+ .map(MemberOrderListVO::getGoodsSkuId)
+ .collect(Collectors.toSet());
+ if (CollUtils.isNotEmpty(auctionSalesroomGoodsSet)) {
+ Map<Long, GoodsSku> goodsSkuMap5 = auctionClient.getGoodsSkuByAuctionSalesroomGoodsSet(
+ auctionSalesroomGoodsSet,
+ SecurityConstants.INNER).getData().stream()
+ .collect(Collectors.toMap(GoodsSku::getId, Function.identity()));
+ goodsSkuMap.putAll(goodsSkuMap5);
+ }
+ return goodsSkuMap;
+ }
+
@Override
public OrderVO MemberOrderOne(MemberOrderListDTO memberOrderListDTO) {
Order order = baseMapper.selectById(memberOrderListDTO.getId());
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());
- orderVO.setSkuId(data.getGoodsSkuId());
- }
+ orderVO = BeanUtils.copyBean(order, OrderVO.class);
+ orderVO.setAuctionType(order.getAuctionOrderType());
+ orderVO.setCouponId(order.getCouponId());
+ orderVO.setBound(order.getBound());
+ orderVO.setIsRequest(order.getIsRequest());
+ 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()).eq(OrderReturnRequest::getDelFlag,
- 0).last("limit 1"));
- if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
- orderVO.setStatus(orderReturnRequest.getStatus());
- orderVO.setRequestId(orderReturnRequest.getId());
- orderVO.setIsRequest(2);
- }else{
- orderVO.setIsRequest(1);
- }
-
- LambdaQueryWrapper<OrderAuctionBond> wrapper3= Wrappers.lambdaQuery();
- wrapper3.eq(OrderAuctionBond::getOrderId,order.getId());
- OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper3);
- if (orderAuctionBond!=null){
- if (orderAuctionBond.getBoundStatus().getCode()==1||orderAuctionBond.getBoundStatus().getCode()==2){
- orderVO.setIsAuctionBond(1);
- }else{
- orderVO.setIsAuctionBond(2);
- }
- }else {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper3 = Wrappers.lambdaQuery();
+ wrapper3.eq(OrderAuctionBond::getOrderId, order.getId());
+ OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper3);
+ if (orderAuctionBond != null) {
+ if (orderAuctionBond.getBoundStatus().getCode() == 1
+ || orderAuctionBond.getBoundStatus().getCode() == 2) {
orderVO.setIsAuctionBond(1);
- orderVO.setBound(new BigDecimal(0));
+ } else {
+ orderVO.setIsAuctionBond(2);
}
-
- } catch (Exception e) {
- throw new RuntimeException(e);
+ } else {
+ orderVO.setIsAuctionBond(1);
}
if (order.getTotalAmount()==null){
order.setTotalAmount(new BigDecimal(0));
+ }
+ GoodsSku goodsSku = getGoodsSku(orderVO);
+ if (Objects.nonNull(goodsSku)) {
+ orderVO.setUnit(goodsSku.getUnit());
+ orderVO.setSpec(goodsSku.getSpec());
+ orderVO.setSpecUnit(goodsSku.getSpecUnit());
}
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()));
+ // 查询售后记录
+ Optional<OrderReturnRequest> orderReturnRequestOpt = orderReturnRequestService.lambdaQuery()
+ .eq(OrderReturnRequest::getOrderId, order.getId()).oneOpt();
+ if (orderReturnRequestOpt.isPresent()) {
+ OrderReturnRequest orderReturnRequest = orderReturnRequestOpt.get();
+ orderVO.setStatus(orderReturnRequest.getStatus());
+ }
return orderVO;
+ }
+
+ private GoodsSku getGoodsSku(OrderVO orderVO) {
+ GoodsSku goodsSku = null;
+ switch (orderVO.getOrderFrom()) {
+ case COMMODITY_ORDER:
+ goodsSku = goodsSkuClient.getGoodsSkuOne(orderVO.getGoodsSkuId(),
+ SecurityConstants.INNER).getData();
+ break;
+ case SNAP_ORDERS:
+ List<GoodsSku> skuList = goodsSkuClient.getGoodsSkuBySeckillIdSet(
+ Sets.newHashSet(orderVO.getGoodsSkuId()),
+ SecurityConstants.INNER).getData();
+ if (CollUtils.isNotEmpty(skuList)) {
+ goodsSku = skuList.get(0);
+ }
+ break;
+ case GROUP_PURCHASE_ORDERS:
+ List<GoodsSku> data = goodsSkuClient.getGoodsSkuByGroupPurchaseIdSet(
+ Sets.newHashSet(orderVO.getGoodsSkuId()),
+ SecurityConstants.INNER).getData();
+ if (CollUtils.isNotEmpty(data)) {
+ goodsSku = data.get(0);
+ }
+ break;
+ case AUCTION_ORDERS:
+ List<GoodsSku> goodsSkuList;
+ if (orderVO.getAuctionType().equals(AuctionOrderTypeEnum.REGULAR_ITEMS)) {
+ goodsSkuList = auctionClient.getGoodsSkuByAuctionGoodsIdSet(
+ Sets.newHashSet(orderVO.getGoodsSkuId()),
+ SecurityConstants.INNER).getData();
+ if (CollUtils.isNotEmpty(goodsSkuList)) {
+ goodsSku = goodsSkuList.get(0);
+ }
+ } else {
+ goodsSkuList = auctionClient.getGoodsSkuByAuctionSalesroomGoodsSet(
+ Sets.newHashSet(orderVO.getGoodsSkuId()),
+ SecurityConstants.INNER).getData();
+ }
+ if (CollUtils.isNotEmpty(goodsSkuList)) {
+ goodsSku = goodsSkuList.get(0);
+ }
+ break;
+ }
+ return goodsSku;
}
@Override
@@ -972,6 +1226,12 @@
goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
}
goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
+ if (data.getStartStatus().equals(StartStatusEnum.ENDED)) {
+ GoodsStockUpdDTO dto = new GoodsStockUpdDTO();
+ dto.setGoodsSkuId(data.getGoodsSkuId());
+ dto.setAuctionStock(order.getGoodsQuantity());
+ goodsSkuClient.updGoodsStock(Lists.newArrayList(dto), SecurityConstants.INNER);
+ }
}
@@ -981,9 +1241,15 @@
goodsGroupPurchaseInfo.setMubre(order.getGroupNo());
GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData();
if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(order.getGoodsQuantity());
GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
}
+ }
+ // 恢复可购数量
+ if (order.getOrderFrom().equals(OrderFromEnum.WISH_ORDER)) {
+ promotionClient.addRecommendAvailableNum(
+ order.getGoodsQuantity(), order.getGoodsSkuId(), SecurityConstants.INNER);
}
}
@@ -1023,11 +1289,16 @@
goodsGroupPurchaseInfo.setMubre(order.getGroupNo());
GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData();
if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(order.getGoodsQuantity());
GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
}
}
-
+ // 恢复可购数量
+ if (order.getOrderFrom().equals(OrderFromEnum.WISH_ORDER)) {
+ promotionClient.addRecommendAvailableNum(
+ order.getGoodsQuantity(), order.getGoodsSkuId(), SecurityConstants.INNER);
+ }
if (order.getCouponId()!=0){
CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
couponMemberDTO1.setId(order.getCouponId());
@@ -1043,6 +1314,12 @@
MembeOneDTO.setTotalPoints(order.getPoints());
memberClient.updMembeOne(MembeOneDTO, SecurityConstants.INNER);
+ MemberPointsDTO memberPointsDTO = new MemberPointsDTO();
+ memberPointsDTO.setMemberId(order.getMemberId());
+ memberPointsDTO.setPointsType(2);
+ memberPointsDTO.setPointsStatus(PointStatusEnum.REDUCE);
+ memberPointsDTO.setPoints(order.getPoints());
+ memberClient.addMemberPoints(memberPointsDTO);
if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//支付宝
//获取支付信息
@@ -1080,6 +1357,9 @@
}
}
}
+ if (order.getOrderFrom().equals(OrderFromEnum.AUCTION_ORDERS)) {
+ refundBond(order);
+ }
}
@Override
@@ -1087,12 +1367,10 @@
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 (byId.getOrderNo().contains("TG") && StringUtils.isNotBlank(byId.getGroupNo())) {
+ GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(byId.getGroupNo(), SecurityConstants.INNER).getData();
if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(byId.getGoodsQuantity());
GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
}
@@ -1155,48 +1433,64 @@
order.setReceiveTime(LocalDateTime.now());
baseMapper.updateById(order);
- 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.getAuctionOrderType().getCode()==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;
+ }else{
- String regEx = "[^0-9]";
- Pattern p = Pattern.compile(regEx);
- Matcher m = p.matcher(order.getOrderNo());
- String ma = m.replaceAll("").trim();
- boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
- if (!bo) {
- System.out.println("微信退款失败");
- }
- }
}
-
-
-
- }else{
+ refundBond(order);
+ } else {
order.setOrderStatus(OrderStatusEnum.FINISHED);
order.setReceiveTime(LocalDateTime.now());
baseMapper.updateById(order);
+ }
+ }
+
+ private void refundBond(Order order) {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(order.getAuctionOrderType().equals(AuctionOrderTypeEnum.AUCTION_ITEMS),
+ OrderAuctionBond::getAuctionSalesroomId, order.getAuctionSalesroomId());
+ wrapper.eq(order.getAuctionOrderType().equals(AuctionOrderTypeEnum.REGULAR_ITEMS),
+ OrderAuctionBond::getAuctionGoodsId, order.getGoodsSkuId());
+ wrapper.eq(OrderAuctionBond::getMemberId, order.getMemberId());
+ wrapper.eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID);
+ OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper);
+ if (orderAuctionBond != null && orderAuctionBond.getBond() != null) {
+ if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {// 支付宝
+ // 获取支付信息
+ 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 {
+ orderAuctionBond.setBoundStatus(BondStatusEnum.REFUNDED);
+ }
+ } else if (order.getPaymentMethod() != null
+ && order.getPaymentMethod().getCode() == 1) {// 微信
+ // 获取支付信息
+ 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 refundNo = OrderUtil.getOrderNoForPrefix("R");
+ boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(),
+ paylog.getOutTradeNo(), refundNo, totalFee, refundFee, "2");
+ if (!bo) {
+ System.out.println("微信退款失败");
+ } else {
+ orderAuctionBond.setBoundStatus(BondStatusEnum.REFUNDED);
+ }
+ }
+ orderAuctionBondMapper.updateById(orderAuctionBond);
}
}
@@ -1230,16 +1524,21 @@
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());
- }
+ if (Objects.nonNull(goodsSku)) {
+ 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);
+ goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,
+ SecurityConstants.INNER);
+ }
}
if(order.getOrderNo().contains("MS")){
@@ -1309,7 +1608,7 @@
wrapper1.eq(Order::getMemberId,homeGoodsSkuDTO1.getMemberId());
wrapper1.eq(Order::getOrderFrom,3);
wrapper1.eq(Order::getDelFlag,0);
- wrapper1.eq(Order::getOrderStatus,2);
+ wrapper1.orderByDesc(Order::getCreateTime);
Page<Order> page = new Page<>(homeGoodsSkuDTO1.getPageCurr(), homeGoodsSkuDTO1.getPageSize());
Page< Order> page1 = this.page(page, wrapper1);
PageDTO<WdOrderVO> HomeGoodsSeckillVOPageDTO = PageDTO.of(page1, WdOrderVO.class);
@@ -1320,36 +1619,51 @@
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 (Objects.nonNull(data)) {
+ 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() == 1) {
+ goodsGroupPurchaseeVO1.setGroupStatus(
+ GroupStatusEnum.FORMED_INTO_A_GROUP);
+ }
if (one1.getGroupStatus() == 2) {
goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
}
- }else{
- goodsGroupPurchaseeVO1.setGroupStatus(data.getGroupStatus());
+ } else {
+ if (data.getGroupStatus().getCode() == 1) {
+ goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
+ }
+ if (data.getGroupStatus().getCode() == 2) {
+ goodsGroupPurchaseeVO1.setGroupStatus(
+ GroupStatusEnum.FORMED_INTO_A_GROUP);
+ }
+ if (data.getGroupStatus().getCode() == 3) {
+ goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
+ }
+ }
+
}
+
}
-
-
}
@@ -1366,7 +1680,9 @@
*/
@Override
public List<Order> getOrderByCouponIds(Collection<Long> couponIds) {
- return this.lambdaQuery().in(Order::getCouponId, couponIds).list();
+ return this.lambdaQuery().in(Order::getCouponId, couponIds)
+ .ne(Order::getOrderStatus, OrderStatusEnum.CANCELED).eq(Order::getIsRequest, 1)
+ .list();
}
/**
@@ -1415,6 +1731,8 @@
query.getSkuName())
.eq(StringUtils.isNotNull(query.getOrderStatus()), Order::getOrderStatus,
query.getOrderStatus())
+ .eq(StringUtils.isNotNull(query.getOrderStatus()) && query.getOrderStatus()
+ .equals(OrderStatusEnum.FINISHED), Order::getIsRequest, 1)
.orderByDesc(Order::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
if (StringUtils.isEmpty(page.getRecords())) {
@@ -1422,6 +1740,23 @@
}
pageVO = PageDTO.of(page, MgtOrderVO.class);
List<MgtOrderVO> voList = pageVO.getList();
+ List<Long> orderIdList = voList.stream().filter(order -> order.getIsRequest().equals(2))
+ .map(MgtOrderVO::getId).collect(
+ Collectors.toList());
+ if (CollUtils.isNotEmpty(orderIdList)) {
+ List<OrderReturnRequest> orderReturnRequestList = orderReturnRequestService.lambdaQuery()
+ .in(OrderReturnRequest::getOrderId, orderIdList)
+ .eq(OrderReturnRequest::getStatus, ReturnRequestStatusEnum.COMPLETED)
+ .eq(OrderReturnRequest::getAuditStatus, AuditStatusEnum.PASSED).list();
+ List<Long> orderReturnRequestPassedIds = orderReturnRequestList.stream()
+ .map(OrderReturnRequest::getOrderId)
+ .collect(Collectors.toList());
+ for (MgtOrderVO order : voList) {
+ if (orderReturnRequestPassedIds.contains(order.getId())) {
+ order.setIsRequest(3);
+ }
+ }
+ }
if (query.getQueryType() == OrderTypeEnum.AUCTION_ORDER) {
List<MgtOrderVO> list = voList;
// 封装参数查询拍卖会
@@ -1438,9 +1773,6 @@
salesroomMap = auctionSalesroomList.stream()
.collect(Collectors.toMap(AuctionSalesroom::getId,
AuctionSalesroom::getSalesroomName));
- auctionSalesroomList.stream()
- .map(AuctionSalesroom::getId)
- .collect(Collectors.toSet());
}
// 封装参数查询拍卖订单保证金
Set<Long> auctionGoodsIdSet = list.stream()
@@ -1563,6 +1895,7 @@
LogisticsDTO logisticsDTO = new LogisticsDTO();
logisticsDTO.setCompany(order.getLogisticsNum());
logisticsDTO.setPostid(order.getCourierNumber());
+ logisticsDTO.setReceiverPhone(order.getReceiverPhone());
Express100VO logisticsList = logisticsService.getLogisticsList(logisticsDTO);
if (StringUtils.isNotNull(logisticsList)) {
mgtOrderVO.setExpress100VO(logisticsList);
@@ -1608,6 +1941,10 @@
order.setOrderStatus(OrderStatusEnum.FINISHED);
order.setReceiveTime(LocalDateTime.now());
this.updateById(order);
+ // 拍卖订单退保证金
+ if (order.getOrderFrom() == OrderFromEnum.AUCTION_ORDERS) {
+ refundBond(id);
+ }
}
}
@@ -1625,36 +1962,38 @@
throw new ServiceException("该订单已是售后状态");
}
String orderNo = order.getOrderNo();
- Paylog paylog = iPaylogService.lambdaQuery().eq(Paylog::getOutTradeNo, orderNo)
- .last("limit 1").one();
+ Optional<Paylog> paylogOpt = iPaylogService.lambdaQuery().eq(Paylog::getOutTradeNo, orderNo)
+ .last("limit 1").oneOpt();
PaymentMethodEnum paymentMethod = order.getPaymentMethod();
- if (StringUtils.isNotNull(paylog)) {
+ if (paylogOpt.isPresent()) {
+ Paylog paylog = paylogOpt.get();
boolean result = handleRefund(paymentMethod, paylog, orderNo);
if (result) {
paylog.setState(3);// 已退款
iPaylogService.updateById(paylog);
}
- OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
- orderReturnRequest.setOrderId(id);
- orderReturnRequest.setRequestTime(LocalDateTime.now());
- orderReturnRequest.setRequestType(RequestTypeEnum.REFUND);
- orderReturnRequest.setRequestReason("管理后台退款");
- orderReturnRequest.setStatus(ReturnRequestStatusEnum.COMPLETED);
- orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
- orderReturnRequest.setAuditTime(LocalDateTime.now());
- orderReturnRequestService.save(orderReturnRequest);
}
order.setIsRequest(2);
this.updateById(order);
+ // 生成售后记录
+ OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
+ orderReturnRequest.setOrderId(id);
+ orderReturnRequest.setRequestTime(LocalDateTime.now());
+ orderReturnRequest.setRequestType(RequestTypeEnum.REFUND);
+ orderReturnRequest.setRequestReason("管理后台退款");
+ orderReturnRequest.setStatus(ReturnRequestStatusEnum.COMPLETED);
+ orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
+ orderReturnRequest.setAuditTime(LocalDateTime.now());
+ orderReturnRequestService.save(orderReturnRequest);
// 扣除订单积分
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.setPointsType(2);
+ memberPointsDTO.setPointsStatus(PointStatusEnum.REDUCE);
memberPointsDTO.setPoints(order.getPoints());
memberClient.addMemberPoints(memberPointsDTO);
@@ -1680,12 +2019,9 @@
refundMoney.substring(0, refundMoney.length() - 3));
String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100D);
Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
- String regEx = "[^0-9]";
- Pattern p = Pattern.compile(regEx);
- Matcher m = p.matcher(orderNo);
- String ma = m.replaceAll("").trim();
+ String refundNo = OrderUtil.getOrderNoForPrefix("R");
result = paylogService.refundForWxpay(2, paylog.getTradeNo(),
- paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "4");
+ paylog.getOutTradeNo(), refundNo, totalFee, refundFee, "4");
} else if (paymentMethod == PaymentMethodEnum.ALIPAY) {
result = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(),
paylog.getPayMoney());
@@ -1748,30 +2084,34 @@
if (order.getAuctionOrderType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
orderAuctionBond = orderAuctionBondMapper.selectOne(
Wrappers.lambdaQuery(OrderAuctionBond.class)
- .eq(OrderAuctionBond::getOrderId, id)
.eq(OrderAuctionBond::getAuctionSalesroomId,
order.getAuctionSalesroomId())
+ .eq(OrderAuctionBond::getMemberId, order.getMemberId())
.eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID));
} else {
orderAuctionBond = orderAuctionBondMapper.selectOne(
Wrappers.lambdaQuery(OrderAuctionBond.class)
- .eq(OrderAuctionBond::getOrderId, id)
.eq(OrderAuctionBond::getAuctionGoodsId,
order.getGoodsSkuId())
+ .eq(OrderAuctionBond::getMemberId, order.getMemberId())
.eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID));
}
if (StringUtils.isNotNull(orderAuctionBond)) {
- Paylog paylog = iPaylogService.lambdaQuery()
+ Optional<Paylog> paylogOpt = 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);
- iPaylogService.updateById(paylog);
- this.updateById(order);
+ .oneOpt();
+ if (paylogOpt.isPresent()) {
+ Paylog paylog = paylogOpt.get();
+ boolean result = handleRefund(orderAuctionBond.getPaymentMethod(), paylog,
+ orderAuctionBond.getOrderNo());
+ if (result) {
+ paylog.setState(3);// 已退款
+ orderAuctionBond.setBoundStatus(BondStatusEnum.REFUNDED);
+ iPaylogService.updateById(paylog);
+ orderAuctionBondMapper.updateById(orderAuctionBond);
+ }
}
+
}
}
@@ -1801,9 +2141,11 @@
@Override
public void updateOrderStatusByMubres1(String formedGroupMubres) {
+
LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery();
wrapper.eq(Order::getGroupNo, formedGroupMubres);
List<Order> page1 = this.list(wrapper);
+ log.info("开始更新订单，已成团的团购订单：{}", page1);
for (Order p:page1){
p.setIsOrder(1);
this.updateById(p);
@@ -1813,6 +2155,32 @@
@Override
public List<Order> updateOrderStatusByMubres2(String formedGroupMubres) {
- return this.lambdaQuery().eq(Order::getGroupNo, formedGroupMubres).list();
+ LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(Order::getGroupNo, formedGroupMubres);
+ List<Order> page1 = this.list(wrapper);
+ return page1;
+ }
+
+ /**
+ * 根据skuId获取心愿求购详情数据
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public MgtPromotionWishRecommendVO getWishDataBySkuId(Long id) {
+ MgtPromotionWishRecommendVO vo = null;
+ List<Order> list = this.lambdaQuery().eq(Order::getGoodsSkuId, id)
+ .eq(Order::getOrderFrom, OrderFromEnum.WISH_ORDER)
+ .ne(Order::getOrderStatus, OrderStatusEnum.CANCELED).list();
+ if (CollUtils.isNotEmpty(list)) {
+ vo = new MgtPromotionWishRecommendVO();
+ Integer purchasedNum = list.stream().map(Order::getGoodsQuantity)
+ .reduce(0, Integer::sum);
+ String orderNo = list.stream().map(Order::getOrderNo).collect(Collectors.joining(","));
+ vo.setPurchasedNum(purchasedNum);
+ vo.setOrderNo(orderNo);
+ }
+ return vo;
}
}
--
Gitblit v1.7.1