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/PaylogServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 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 0e64e66..487f7b5 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
@@ -111,7 +111,8 @@
one1.setPaymentMethod(PaymentMethodEnum.WECHAT);
orderAuctionBondMapper.updateById(one1);
- if (one1.getBond().compareTo(new BigDecimal(0))==0){
+
+ if (one1.getBond()==null||one1.getBond().compareTo(new BigDecimal(0))==0){
one1.setBoundStatus(BondStatusEnum.PAID);
Map<String, Object> returnMap = new HashMap<>();
returnMap.put("Type",1);
@@ -127,9 +128,15 @@
page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
page1.setPaymentMethod(PaymentMethodEnum.WECHAT);
page1.setPayTime(LocalDateTime.now());
+ OrderMapper.updateById(page1);
+ if (page1.getTotalAmount().compareTo(new BigDecimal(0))==0){
+ Map<String, Object> returnMap = new HashMap<>();
+ returnMap.put("Type",1);
+ return R.ok(returnMap);
+ }
- if(page1.getOrderNo().contains("SP")){
+ /* if(page1.getOrderNo().contains("SP")){
GoodsSku goodsSku =new GoodsSku();
goodsSku.setId(page1.getGoodsSkuId());
goodsSku.setSoldQuantity(page1.getGoodsQuantity());
@@ -141,13 +148,13 @@
goodsSku.setId(page1.getGoodsSkuId());
goodsSku.setSoldQuantity(page1.getGoodsQuantity());
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){
+ /* if (goodsSeckiGoodsGroupPurchaseInfo!=null){
goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
}else{
@@ -160,7 +167,7 @@
goodsGroupPurchaseInfo.setGroupStatus(0);
goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
page1.setGroupNo(uuid.toString());
- }
+ }*/
}
OrderMapper.updateById(page1);
@@ -355,6 +362,9 @@
wrapper1.eq(Order::getOrderNo,paylog1.getOutTradeNo());
wrapper1.eq(Order::getDelFlag,0);
Order page1 = OrderMapper.selectOne(wrapper1);
+
+ page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
+ page1.setPayTime(LocalDateTime.now());
if(page1.getOrderNo().contains("SP")){
GoodsSku goodsSku =new GoodsSku();
goodsSku.setId(page1.getGoodsSkuId());
@@ -373,24 +383,25 @@
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());
+ OrderMapper.updateById(page1);
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
+
}else{
UUID uuid = UUID.randomUUID();
+ page1.setGroupNo(uuid.toString());
+ OrderMapper.updateById(page1);
GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
goodsGroupPurchaseInfo.setCurrentNumber(1);
goodsGroupPurchaseInfo.setMubre(uuid.toString());
- goodsGroupPurchaseInfo.setGroupPurchaseId(page1.getGoodsSkuId());
+ goodsGroupPurchaseInfo.setGroupPurchaseId(goodsSeckiGoodsGroupPurchaseOne.getId());
goodsGroupPurchaseInfo.setGroupStatus(0);
goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
- page1.setGroupNo(uuid.toString());
+
}
}
- 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());
@@ -524,7 +535,7 @@
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();
@@ -543,17 +554,22 @@
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);
+ OrderMapper.updateById(page1);
page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
+
}else{
UUID uuid = UUID.randomUUID();
+ page1.setGroupNo(uuid.toString());
+ OrderMapper.updateById(page1);
GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
goodsGroupPurchaseInfo.setCurrentNumber(1);
goodsGroupPurchaseInfo.setMubre(uuid.toString());
+ goodsGroupPurchaseInfo.setGroupPurchaseId(goodsSeckiGoodsGroupPurchaseOne.getId());
goodsGroupPurchaseInfo.setGroupStatus(0);
goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
- page1.setGroupNo(uuid.toString());
+
}
}
if (page1.getPoints()!=0){
@@ -883,6 +899,10 @@
return m.matches();
}
+ /**
+ * @param refundDTOS 退款数据传输对象
+ * @return Map<String, Object> key ：orderNo value 退款结果
+ */
@Override
public Map<String, Object> refund(List<RefundDTO> refundDTOS) {
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.7.1