From ba2e6c5fa2e21f535da27f29e54da2d6c7eb9aaa Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 15 七月 2025 10:47:14 +0800
Subject: [PATCH] 硬件数据推送
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java | 29 +++++++++++++++++++++--------
1 files changed, 21 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 c9dd934..47fb78a 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;
@@ -12,6 +13,8 @@
import com.ruoyi.order.api.model.TVipOrder;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TVip;
+import com.ruoyi.other.api.feignClient.OtherClient;
+import com.ruoyi.other.api.feignClient.VipClient;
import com.ruoyi.other.mapper.TCouponMapper;
import com.ruoyi.other.mapper.TVipMapper;
import com.ruoyi.other.service.TVipService;
@@ -80,18 +83,26 @@
return pageInfo;
}
+ @Resource
+ private VipClient vipClient;
@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());
+ shopOrder.setTitle(byId.getName());
+ if (buyType==1){
+ shopOrder.setTitle(byId.getName()+"月卡");
+ }else if (buyType==2){
+ shopOrder.setTitle(byId.getName()+"季卡");
+ }else {
+ shopOrder.setTitle(byId.getName()+"年卡");
+ }
shopOrder.setVipType(buyType);
shopOrder.setOrderAmount(payMoney.add(discountMoney));
shopOrder.setDiscount(discount);
@@ -100,9 +111,12 @@
shopOrder.setPaymentStatus(1);
shopOrder.setPaymentType(payType);
shopOrder.setPayTime(LocalDateTime.now());
- orderClient.addVipOrder(shopOrder).getData();
-
-
+ shopOrder.setDelFlag(false);
+ R<Long> longR = orderClient.addVipOrder(shopOrder);
+ if(200 != longR.getCode()){
+ return AjaxResult.error(longR.getMsg());
+ }
+
if (payType==1){
//调起支付
PaymentOrder paymentOrder = new PaymentOrder();
@@ -110,7 +124,7 @@
paymentOrder.setAmount(shopOrder.getPaymentAmount());
paymentOrder.setOpenId(user.getWxOpenid());
paymentOrder.setDescription("购买会员");
- return wxPaymentClient.orderPay(paymentOrder).getData();
+ return AjaxResult.success(wxPaymentClient.orderPay(paymentOrder).getData());
}else {
AliPaymentReq req = new AliPaymentReq();
req.setOutTradeNo(shopOrder.getCode());
@@ -118,13 +132,12 @@
req.setSubject("充电充值");
req.setBuyerOpenId(user.getAliOpenid());
req.setBody("充电充值");
+ req.setNotifyUrl("/payment/ali/callBack");
AliPaymentResp data = aliPaymentClient.payment(req).getData();
if(null != data){
- data.setNotifyUrl(data.getNotifyUrl() + "/callBack/ali/all");
return AjaxResult.success(data);
}
}
-
return null;
}
}
--
Gitblit v1.7.1