From efe9744eb6651298be9f48b84a5f17c58d7b64eb Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 19 七月 2024 14:10:26 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 211 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 155 insertions(+), 56 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 05d0204..a330f40 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
@@ -41,6 +41,7 @@
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;
@@ -84,6 +85,7 @@
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* <p>
@@ -136,6 +138,7 @@
private GoodsSkuClient GoodsSkuClient;
+
@Override
public void saveOrderOne(OrderDTO OrderDTO) {
Order order=new Order();
@@ -175,6 +178,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){
@@ -247,6 +251,11 @@
@Override
public Order getOrderByGroupPurchaseMemberId(HomeGoodsSkuDTO homeGoodsSkuDTO) {
return baseMapper.getOrderByGroupPurchaseMemberId(homeGoodsSkuDTO);
+ }
+
+ @Override
+ public Order getOrderByGroupPurchaseMemberId1(HomeGoodsSkuDTO homeGoodsSkuDTO) {
+ return baseMapper.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO);
}
@Override
@@ -339,9 +348,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());
@@ -389,8 +401,6 @@
memberOrderVO.setYouhiPrice(data.getGroupPurchasePrice());
pice=data.getGroupPurchasePrice();
- goodsSkuClient.GroupPurchaseNum(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER);
-
order.setSkuName(goodsSku.getSkuName());
order.setPrice(data.getGroupPurchasePrice());
order.setCoverPic(goodsSku.getCoverPic());
@@ -420,6 +430,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());
@@ -473,9 +488,8 @@
}if (memberOrderDTO.getGoodsQuantity()!=null){
if (order.getOrderFrom().getCode()==1){
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
-
if (goodsSku.getStock()+order.getGoodsQuantity()<memberOrderDTO.getGoodsQuantity()){
- throw new ServiceException("该商品已售罄，暂无库存");
+ throw new ServiceException("该商品库存不足");
}
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
@@ -503,23 +517,28 @@
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("该商品已售罄，暂无库存");
+ throw new ServiceException("该商品库存不足");
}
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
@@ -564,7 +583,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());
@@ -602,6 +621,7 @@
pice=pice.subtract(data.getReductionAmount());
order.setDiscountMoney(data.getReductionAmount());
}else{
+ order.setDiscountMoney(pice);
pice=new BigDecimal(0);
}
@@ -609,10 +629,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();
@@ -623,17 +646,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());
@@ -696,7 +722,7 @@
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){
@@ -754,6 +780,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()));
}
@@ -769,6 +800,7 @@
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(
@@ -815,12 +847,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());
- goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
+ if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){
+ goodsStockUpdDTO1.setSoldQuantity(0);
+ }else {
+ goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
+ }
+
goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
}
@@ -829,9 +873,15 @@
GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
- goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
+ if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
+ goodsStockUpdDTO1.setSoldQuantity(0);
+ }else {
+ goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
+ }
goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
}
+
+
}
@@ -845,7 +895,11 @@
GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
- goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
+ if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){
+ goodsStockUpdDTO1.setSoldQuantity(0);
+ }else {
+ goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
+ }
goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
}
@@ -854,7 +908,11 @@
GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
- goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
+ if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
+ goodsStockUpdDTO1.setSoldQuantity(0);
+ }else {
+ goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
+ }
goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
}
@@ -915,8 +973,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) {
@@ -964,7 +1033,6 @@
}
}
}
- baseMapper.deleteById(memberOrderListDTO.getId());
}
@Override
@@ -978,27 +1046,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);
@@ -1009,6 +1077,9 @@
System.out.println("微信退款失败");
}
}
+ }
+
+
}else{
order.setOrderStatus(OrderStatusEnum.FINISHED);
@@ -1141,8 +1212,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)
@@ -1207,6 +1279,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;
}
@@ -1238,7 +1323,7 @@
}
}
// 查询售后信息
- if (order.getOrderStatus() == OrderStatusEnum.AFTER_SALE) {
+ if (order.getIsRequest() == 2) {
OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
Wrappers.lambdaQuery(OrderReturnRequest.class)
.eq(OrderReturnRequest::getOrderId,
@@ -1309,6 +1394,7 @@
* @param id 订单id
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void refund(Long id) {
Order order = getOrder(id);
String orderNo = order.getOrderNo();
@@ -1331,6 +1417,8 @@
orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
orderReturnRequestService.save(orderReturnRequest);
}
+ order.setIsRequest(2);
+ this.updateById(order);
}
private boolean handleRefund(PaymentMethodEnum paymentMethod, Paylog paylog, String orderNo) {
@@ -1365,7 +1453,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)) {
@@ -1448,4 +1536,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