market
/
cloud-market2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java
master
liyuxin 2024-09-03 12:26:59 +08:00
parent 47219ffd0b 7c0d243740
commit aa11a309f2
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java
View File

@ -5,18 +5,15 @@ import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.request.AlipayTradePagePayRequest;
import com.alipay.easysdk.factory.Factory;
import com.muyu.data.AliPay;
import com.muyu.market.server.config.MyAliPayConfig;
import com.muyu.data.AliPay;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@ -29,27 +26,21 @@ public class AliPayController {
private static final String FORMAT_JSON = "JSON";
private static final String CHARSET_UTF8 = "UTF-8";
private static final String SIGN_TYPE_RSA2 = "RSA2";
@Autowired
@Resource
private MyAliPayConfig myAliPayConfig;
@GetMapping("/pay")
public void pay(AliPay aliPay, HttpServletResponse httpResponse) throws Exception{
AlipayClient alipayClient = new DefaultAlipayClient(GATEWAY_URL, myAliPayConfig.getAppId(),
myAliPayConfig.getAppPrivateKey(), FORMAT_JSON,
CHARSET_UTF8, myAliPayConfig.getAlipayPublicKey(),
SIGN_TYPE_RSA2);
myAliPayConfig.getAppPrivateKey(), FORMAT_JSON, CHARSET_UTF8, myAliPayConfig.getAlipayPublicKey(), SIGN_TYPE_RSA2);
AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
request.setNotifyUrl(myAliPayConfig.getNotifyUrl());
request.setReturnUrl(myAliPayConfig.getReturnUrl());
// //-商品的内容可以从系统中传递过来
// aliPay.setTraceNo(UUID.randomUUID().toString().replaceAll("-",""));
// aliPay.setTotalAmount("100");
// aliPay.setSubject("笔记本华硕");
//-商品的内容可以从系统中传递过来，目前这里是手写的
aliPay.setTraceNo(UUID.randomUUID().toString().replaceAll("-",""));
aliPay.setTotalAmount("100");
aliPay.setSubject("笔记本华硕");
request.setBizContent("{\"out_trade_no\":\"" + aliPay.getTraceNo() + "\","
+ "\"total_amount\":\"" + aliPay.getTotalAmount() + "\","
@ -68,7 +59,6 @@ public class AliPayController {
}
@PostMapping("/notify") // 注意这里必须是POST接口
public String payNotify(HttpServletRequest request) throws Exception {
if (request.getParameter("trade_status").equals("TRADE_SUCCESS")) {
@ -81,13 +71,12 @@ public class AliPayController {
// System.out.println(name + " = " + request.getParameter(name));
}
String tradeNo = params.get("out_trade_no");
String gmtPayment = params.get("gmt_payment");
String alipayTradeNo = params.get("trade_no");
// 支付宝验签
if (Factory.Payment.Common().verifyNotify(params)) {
// （不需要）支付宝验签
//if (Factory.Payment.Common().verifyNotify(params)) {
// 验签通过
System.out.println("交易名称: " + params.get("subject"));
System.out.println("交易状态: " + params.get("trade_status"));
@ -98,8 +87,9 @@ public class AliPayController {
System.out.println("买家付款时间: " + params.get("gmt_payment"));
System.out.println("买家付款金额: " + params.get("buyer_pay_amount"));
// 更新订单已支付的逻辑代码
}
// 更新订单未已支付
// ordersMapper.updateState(tradeNo, "已支付", gmtPayment, alipayTradeNo);
//}
}
return "success";
}