From 14a0e8e382543290fc6bea6b4cd3a223c60b6dd4 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 30 五月 2024 16:35:50 +0800
Subject: [PATCH] 写用户端接口
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 89 ++++++++++++++++++++++++++++++--------------
1 files changed, 60 insertions(+), 29 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 24d6073..4731fc4 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
@@ -7,10 +7,13 @@
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.request.AlipayTradeRefundRequest;
import com.alipay.api.response.AlipayTradeRefundResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.order.domain.pojo.Paylog;
+import com.ruoyi.order.domain.Paylog;
import com.ruoyi.order.mapper.PaylogMapper;
import com.ruoyi.order.service.IPaylogService;
import com.ruoyi.order.util.SinataUtil;
@@ -21,7 +24,10 @@
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.dto.BondDTO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
+import com.ruoyi.system.api.feignClient.OrderClient;
import java.io.IOException;
import java.io.PrintWriter;
import java.math.BigDecimal;
@@ -40,6 +46,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.api.feignClient.OrderClient;
import org.springframework.stereotype.Service;
/**
@@ -59,23 +67,25 @@
@Resource
private IPaylogService iPaylogService;
+ @Resource
+ private OrderClient orderClient;
+
@Override
- public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String subject, String body, String orderID,
- HttpServletRequest request) {
+ public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String subject, String body, String orderNO,String openId, HttpServletRequest request) {
Double price = 0.0;
try {
- if(judgeContainsStr(orderID)){
+ if(judgeContainsStr(orderNO)){
price= Double.valueOf(1);
- body = "商品支付";
- subject = "商品支付";
+ body = body;
+ subject = subject;
Map<String, Object> map = new HashMap<String, Object>();
if (type == 1) {
// 支付宝预下单
- return paylogServiceImpl.alipay("1", subject, body, price, request);
+ return paylogServiceImpl.alipay(orderNO, subject, body, price, request);
} else {
// 微信预下单
- return paylogServiceImpl.wxpay(1, "1", body, price, request);
+ return paylogServiceImpl.wxpay(2, orderNO, body,openId, price, request);
}
}
} catch (Exception e) {
@@ -114,19 +124,31 @@
params.put(name, valueStr);
}
- Paylog paylog = getPayLog_alipay(request);
+ Paylog paylog1= getPayLog_alipay(request);
// 验证成功
- if ("TRADE_FINISHED".equals(paylog.getTradeStatus())) {
+ if ("TRADE_FINISHED".equals(paylog1.getTradeStatus())) {
System.out.println("AlipayController.notifyUrl__验证成功：success");
// 支付失败
- } else if ("TRADE_SUCCESS".equals(paylog.getTradeStatus())) {
+ } else if ("TRADE_SUCCESS".equals(paylog1.getTradeStatus())) {
// 支付成功
try {
- if(judgeContainsStr(paylog.getOutTradeNo())){
+ LambdaQueryWrapper<Paylog> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(Paylog::getOutTradeNo,paylog1.getOutTradeNo());
+ Paylog one = iPaylogService.getOne(wrapper);
+ if(SinataUtil.isEmpty(one)) {
+ iPaylogService.save(paylog1);
+ if (paylog1.getOutTradeNo().contains("BO")) {
+ BondDTO bondVO=new BondDTO();
+ bondVO.setOrderNO(paylog1.getOutTradeNo());
+ orderClient.UpdateBond(bondVO, SecurityConstants.INNER);
+ }
}
+
+
+
// ——请根据您的业务逻辑来编写程序（以上代码仅作参考）——
log.debug("AlipayController.notifyUrl__回调处理：success");
out.println("success"); // 请不要修改或删除
@@ -196,17 +218,27 @@
///////////////////////////// 这里程序处理支付回调逻辑
///////////////////////////// ////////////////////
- Paylog paylog = new Paylog();
- paylog.setOutTradeNo(out_trade_no);
- paylog.setPayType(2);
- paylog.setBuyerId(buyer_id);
- paylog.setTradeNo(trade_no);
- paylog.setPayMoney(Double.parseDouble(total_fee) / 100);
- paylog.setState(1);
- System.out.println("支付完成时间" + time_end);
- paylog.setAddTime(LocalDateTime.now());
- iPaylogService.save(paylog);
- if (judgeContainsStr(paylog.getOutTradeNo())) {
+
+ LambdaQueryWrapper<Paylog> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(Paylog::getOutTradeNo,out_trade_no);
+ Paylog one = iPaylogService.getOne(wrapper);
+ if(SinataUtil.isEmpty(one)) {
+ Paylog paylog = new Paylog();
+ paylog.setOutTradeNo(out_trade_no);
+ paylog.setPayType(2);
+ paylog.setBuyerId(buyer_id);
+ paylog.setTradeNo(trade_no);
+ paylog.setPayMoney(Double.parseDouble(total_fee) / 100);
+ paylog.setState(1);
+ System.out.println("支付完成时间" + time_end);
+ paylog.setAddTime(LocalDateTime.now());
+ iPaylogService.save(paylog);
+ if (paylog.getOutTradeNo().contains("BO")) {
+ BondDTO bondVO=new BondDTO();
+ bondVO.setOrderNO(paylog.getOutTradeNo());
+ orderClient.UpdateBond(bondVO, SecurityConstants.INNER);
+
+ }
log.debug("WxpayController.notify__回调处理成功：SUCCESS");
@@ -306,17 +338,17 @@
* @param request
* @return
*/
- public static R<Map<String, Object>> wxpay(Integer apptype, String outTradeNo, String body, Double price,
+ public static R<Map<String, Object>> wxpay(Integer apptype, String outTradeNo, String body,String openId, Double price,
HttpServletRequest request) {
// 获取预支付接口返回参数
Map<String, Object> map = new HashMap<String, Object>();
Map<String, Object> appPayMap = new HashMap<String, Object>();
try {
// 构建接口请求参数
- UnifiedorderReqData unifiedorderReqData = new UnifiedorderReqData(apptype, outTradeNo, body, price,
- Configure.wx_notify_url);
+ UnifiedorderReqData unifiedorderReqData = new UnifiedorderReqData(outTradeNo, body, price, Configure.wx_notify_url,
+ "JSAPI", openId);
// 请求接口获取返回接口
- String result = requestUnifiedorderService(apptype, unifiedorderReqData);
+ String result = requestUnifiedorderService(2, unifiedorderReqData);
System.out.println(result);
System.out.println("WxpayController.createOrder__result：\n" + result);
// 获取预支付接口返回参数
@@ -332,7 +364,7 @@
(String) map.get("prepay_id"), unifiedorderReqData.getNonce_str());
// 对获取预支付返回接口参数进行封装（生成支付订单接口数据）
- appPayMap.put("appid", appPay.getAppid());// 公众账号ID
+ appPayMap.put("appid", appPay.getAppid());// 小程序ID
appPayMap.put("nonceStr", appPay.getNoncestr());// 随机字符串(32位)
appPayMap.put("package", appPay.get_package());// 扩展字段(暂填写固定值Sign=WXPay)
appPayMap.put("partnerId", appPay.getPartnerid());// 商户号
@@ -427,7 +459,6 @@
paylog.setState(1);
paylog.setAddTime(LocalDateTime.now());
paylog.setTradeStatus(trade_status.toString());
- iPaylogService.save(paylog);
return paylog;
}
--
Gitblit v1.7.1