From 74b0e0814e37d640596f44ec86d20fa9ecce9ed6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 10:42:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
index 6df0a5e..38db787 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUser;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.OrderCodeUtil;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -87,14 +88,10 @@
@Override
public Object vipInfoPay(TVip byId, BigDecimal payMoney, Integer payType,BigDecimal discountMoney,BigDecimal discount,Integer buyType, Long userId) {
TAppUser user = appUserClient.getUserById(userId).getData();
-
-
//生成会员购买订单
-
TVipOrder shopOrder = new TVipOrder();
shopOrder.setCode(OrderCodeUtil.getOrderCode("HY"));
shopOrder.setType(1);
-
shopOrder.setAppUserId(userId);
shopOrder.setType(1);
shopOrder.setVipId(byId.getId());
@@ -114,9 +111,11 @@
shopOrder.setPaymentStatus(1);
shopOrder.setPaymentType(payType);
shopOrder.setPayTime(LocalDateTime.now());
- orderClient.addVipOrder(shopOrder).getData();
-
-
+ R<Long> longR = orderClient.addVipOrder(shopOrder);
+ if(200 != longR.getCode()){
+ return AjaxResult.error(longR.getMsg());
+ }
+
if (payType==1){
//调起支付
PaymentOrder paymentOrder = new PaymentOrder();
@@ -138,7 +137,6 @@
return AjaxResult.success(data);
}
}
-
return null;
}
}
--
Gitblit v1.7.1