From 5674594f06ec038a5ac1633b881518ffbd8c6c02 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 15 七月 2024 18:18:34 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 21 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
index a276ee2..f0bb94d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -35,9 +35,7 @@
import com.ruoyi.order.util.tencent.common.XMLParser;
import com.ruoyi.order.util.tencent.protocol.AppPayReqData;
import com.ruoyi.order.util.tencent.protocol.UnifiedorderReqData;
-import com.ruoyi.system.api.domain.GoodsSku;
-import com.ruoyi.system.api.domain.Order;
-import com.ruoyi.system.api.domain.OrderAuctionBond;
+import com.ruoyi.system.api.domain.*;
import com.ruoyi.system.api.domain.dto.BondDTO;
import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
@@ -89,7 +87,7 @@
private OrderAuctionBondMapper orderAuctionBondMapper;
@Resource
- private GoodsSkuClient GoodsSkuClient;
+ private GoodsSkuClient goodsSkuClient;
@Override
public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String orderNO,String openId, HttpServletRequest request) {
@@ -117,28 +115,52 @@
page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
page1.setPaymentMethod(PaymentMethodEnum.WECHAT);
page1.setPayTime(LocalDateTime.now());
- OrderMapper.updateById(page1);
+
if(page1.getOrderNo().contains("SP")){
GoodsSku goodsSku =new GoodsSku();
goodsSku.setId(page1.getGoodsSkuId());
goodsSku.setSoldQuantity(page1.getGoodsQuantity());
- GoodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
+ goodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
}
if(page1.getOrderNo().contains("MS")){
GoodsSku goodsSku =new GoodsSku();
goodsSku.setId(page1.getGoodsSkuId());
goodsSku.setSoldQuantity(page1.getGoodsQuantity());
- GoodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
+ goodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
}
- MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
- memberPointsDTO.setMemberId(page1.getMemberId());
- memberPointsDTO.setPointsType(1);
- memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
- memberPointsDTO.setPoints(page1.getPoints());
- memberClient.addMemberPoints(memberPointsDTO);
+
+ if(page1.getOrderNo().contains("TG")){
+ GoodsGroupPurchase goodsSeckiGoodsGroupPurchaseOne = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
+ page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
+ }else{
+ UUID uuid = UUID.randomUUID();
+ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
+ goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
+ goodsGroupPurchaseInfo.setCurrentNumber(1);
+ goodsGroupPurchaseInfo.setMubre(uuid.toString());
+ goodsGroupPurchaseInfo.setGroupPurchaseId(page1.getGoodsSkuId());
+ goodsGroupPurchaseInfo.setGroupStatus(0);
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
+ page1.setGroupNo(uuid.toString());
+ }
+ }
+ OrderMapper.updateById(page1);
+
+ if (page1.getPoints()!=0){
+ MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
+ memberPointsDTO.setMemberId(page1.getMemberId());
+ memberPointsDTO.setPointsType(1);
+ memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
+ memberPointsDTO.setPoints(page1.getPoints());
+ memberClient.addMemberPoints(memberPointsDTO);
+ }
+
updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
MembeOneDTO.setType(1);
MembeOneDTO.setMemberId(page1.getMemberId());
@@ -183,14 +205,14 @@
GoodsSku goodsSku =new GoodsSku();
goodsSku.setId(page1.getGoodsSkuId());
goodsSku.setSoldQuantity(page1.getGoodsQuantity());
- GoodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
+ goodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
}
if(page1.getOrderNo().contains("MS")){
GoodsSku goodsSku =new GoodsSku();
goodsSku.setId(page1.getGoodsSkuId());
goodsSku.setSoldQuantity(page1.getGoodsQuantity());
- GoodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
+ goodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
}
@@ -325,25 +347,26 @@
GoodsSku goodsSku =new GoodsSku();
goodsSku.setId(page1.getGoodsSkuId());
goodsSku.setSoldQuantity(page1.getGoodsQuantity());
- GoodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
+ goodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
}
if(page1.getOrderNo().contains("MS")){
GoodsSku goodsSku =new GoodsSku();
goodsSku.setId(page1.getGoodsSkuId());
goodsSku.setSoldQuantity(page1.getGoodsQuantity());
- GoodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
+ goodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
}
page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
page1.setPayTime(LocalDateTime.now());
OrderMapper.updateById(page1);
-
+ if (page1.getPoints()!=0){
MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
memberPointsDTO.setMemberId(page1.getMemberId());
memberPointsDTO.setPointsType(1);
memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
memberPointsDTO.setPoints(page1.getPoints());
memberClient.addMemberPoints(memberPointsDTO);
+ }
updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
MembeOneDTO.setType(1);
MembeOneDTO.setMemberId(page1.getMemberId());
@@ -475,22 +498,40 @@
GoodsSku goodsSku =new GoodsSku();
goodsSku.setId(page1.getGoodsSkuId());
goodsSku.setSoldQuantity(page1.getGoodsQuantity());
- GoodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
+ goodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
}
if(page1.getOrderNo().contains("MS")){
GoodsSku goodsSku =new GoodsSku();
goodsSku.setId(page1.getGoodsSkuId());
goodsSku.setSoldQuantity(page1.getGoodsQuantity());
- GoodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
+ goodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
}
-
+ if(page1.getOrderNo().contains("TG")){
+ GoodsGroupPurchase goodsSeckiGoodsGroupPurchaseOne = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
+ page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
+ }else{
+ UUID uuid = UUID.randomUUID();
+ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
+ goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
+ goodsGroupPurchaseInfo.setCurrentNumber(1);
+ goodsGroupPurchaseInfo.setMubre(uuid.toString());
+ goodsGroupPurchaseInfo.setGroupStatus(0);
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
+ page1.setGroupNo(uuid.toString());
+ }
+ }
+ if (page1.getPoints()!=0){
MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
memberPointsDTO.setMemberId(page1.getMemberId());
memberPointsDTO.setPointsType(1);
memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
memberPointsDTO.setPoints(page1.getPoints());
memberClient.addMemberPoints(memberPointsDTO);
+ }
updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
MembeOneDTO.setType(1);
MembeOneDTO.setMemberId(page1.getMemberId());
--
Gitblit v1.7.1