shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
77
2024-04-02 00:58:54 +08:00
parent aff7c23d6e
commit 6b8361a170
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/MemberPriceController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/MemberPriceController.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.cai.admin.back; package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.cai.app;
import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.annotation.SaIgnore;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayApiException;
import com.alipay.api.domain.AlipayTradeAppPayModel; import com.alipay.api.domain.AlipayTradeAppPayModel;
import com.alipay.api.internal.util.AlipaySignature; import com.alipay.api.internal.util.AlipaySignature;
@@ -68,7 +69,7 @@ public class PayController {
.mch_id(payConfig.getWxMcid()) .mch_id(payConfig.getWxMcid())
.nonce_str(WxPayKit.generateStr()) .nonce_str(WxPayKit.generateStr())
.body(payOrderInfo.getBody()) .body(payOrderInfo.getBody())
.out_trade_no(WxPayKit.generateStr()) .out_trade_no(payOrderInfo.getOrderNo())
.total_fee(payOrderInfo.getPriceFenStr()) .total_fee(payOrderInfo.getPriceFenStr())
.spbill_create_ip(ip) .spbill_create_ip(ip)
.notify_url(payConfig.getNotifyUrl()+NOTIFY_WX_URL) .notify_url(payConfig.getNotifyUrl()+NOTIFY_WX_URL)
@@ -117,7 +118,7 @@ public class PayController {
AlipayTradeAppPayModel model = new AlipayTradeAppPayModel(); AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
model.setBody(payOrderInfo.getBody()); model.setBody(payOrderInfo.getBody());
model.setSubject(payOrderInfo.getSubject()); model.setSubject(payOrderInfo.getSubject());
model.setOutTradeNo(WxPayKit.generateStr()); model.setOutTradeNo(payOrderInfo.getOrderNo());
model.setTimeoutExpress("30m"); model.setTimeoutExpress("30m");
model.setTotalAmount(payOrderInfo.getPrice().toString()); model.setTotalAmount(payOrderInfo.getPrice().toString());
String notifyUrl = AliPayApiConfigKit.getAliPayApiConfig().getServiceUrl(); String notifyUrl = AliPayApiConfigKit.getAliPayApiConfig().getServiceUrl();
@@ -190,4 +191,5 @@ public class PayController {
return "failure"; return "failure";
} }
} }
} }

2
ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayManager.java
View File

@@ -52,6 +52,7 @@ public class PayManager {
dto.setBody(vipOrder.getVipName()); dto.setBody(vipOrder.getVipName());
dto.setSubject(vipOrder.getVipName()); dto.setSubject(vipOrder.getVipName());
dto.setPrice(vipOrder.getPrice()); dto.setPrice(vipOrder.getPrice());
dto.setOrderNo(vipOrder.getOrderNo());
break; break;
case RECHARGE_ORDER_SUB: case RECHARGE_ORDER_SUB:
RechargeOrder rechargeOrder = rechargeOrderService.getByOrderNo(orderNo); RechargeOrder rechargeOrder = rechargeOrderService.getByOrderNo(orderNo);
@@ -65,6 +66,7 @@ public class PayManager {
dto.setBody(rechargeOrder.getRechargeName()); dto.setBody(rechargeOrder.getRechargeName());
dto.setSubject(rechargeOrder.getRechargeName()); dto.setSubject(rechargeOrder.getRechargeName());
dto.setPrice(rechargeOrder.getPrice()); dto.setPrice(rechargeOrder.getPrice());
dto.setOrderNo(rechargeOrder.getOrderNo());
break; break;
default: default:
break; break;

1
ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayOrderInfoDTO.java
View File

@@ -10,6 +10,7 @@ public class PayOrderInfoDTO {
private String body; private String body;
private String subject; private String subject;
private BigDecimal price; private BigDecimal price;
private String orderNo;
public String getPriceFenStr(){ public String getPriceFenStr(){
return NumberUtil.mul(price,100).longValue()+""; return NumberUtil.mul(price,100).longValue()+"";