From 62472787e327e1ba86879b03b1332b9af9e758c4 Mon Sep 17 00:00:00 2001 From: Penny <2500338766@qq.com> Date: Sat, 5 Aug 2023 19:49:05 +0800 Subject: [PATCH] =?UTF-8?q?feature-1.0:=E6=9C=8D=E5=8A=A1=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cyjd/rights/ClientApiApplication.java | 10 +++++++++- .../cyjd/rights/controller/AliPayController.java | 12 ++++++------ .../business/service/impl/AliPayServiceImpl.java | 16 ++++++++-------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/rights-client-controller/src/main/java/com/cyjd/rights/ClientApiApplication.java b/rights-client-controller/src/main/java/com/cyjd/rights/ClientApiApplication.java index aea9cb0..919a4b2 100644 --- a/rights-client-controller/src/main/java/com/cyjd/rights/ClientApiApplication.java +++ b/rights-client-controller/src/main/java/com/cyjd/rights/ClientApiApplication.java @@ -22,6 +22,14 @@ public class ClientApiApplication { { TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai")); SpringApplication.run(ClientApiApplication.class, args); - log.debug("=========服务加载完毕========"); + log.info("(♥◠‿◠)ﾉﾞ 权益服务加载完毕 ლ(´ڡ`ლ)ﾞ\n" + + " _____ _ _ _ _____ _ _ _ \n" + + " | __ \\ (_) | | | | / ____|| |(_) | | \n" + + " | |__) | _ __ _ | |__ | |_ ___ ______ | | | | _ ___ _ __ | |_ \n" + + " | _ / | | / _` || '_ \\ | __|/ __||______|| | | || | / _ \\| '_ \\ | __|\n" + + " | | \\ \\ | || (_| || | | || |_ \\__ \\ | |____ | || || __/| | | || |_ \n" + + " |_| \\_\\|_| \\__, ||_| |_| \\__||___/ \\_____||_||_| \\___||_| |_| \\__|\n" + + " __/ | \n" + + " |___/ \n"); } } diff --git a/rights-client-controller/src/main/java/com/cyjd/rights/controller/AliPayController.java b/rights-client-controller/src/main/java/com/cyjd/rights/controller/AliPayController.java index 87757ce..2f45c10 100644 --- a/rights-client-controller/src/main/java/com/cyjd/rights/controller/AliPayController.java +++ b/rights-client-controller/src/main/java/com/cyjd/rights/controller/AliPayController.java @@ -29,6 +29,7 @@ import com.cyjd.rights.vo.AliPayUserPageSignReq; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.java.Log; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -49,11 +50,11 @@ import java.util.Map; * @Date :2023/05/16 * @description : */ -@Log @Component @Api(tags = "阿里支付测试") @RestController @RequestMapping("/alipay") +@Slf4j public class AliPayController { @@ -289,7 +290,7 @@ public class AliPayController { * @return */ public String signNotify(Map inMap) { - System.out.println("===========================我是签约回调============================"); + log.info("===========================我是签约回调============================"); //log.info("支付宝签约回调开始：request{}", JSON.toJSONString(inMap)); try { //验签 @@ -338,9 +339,9 @@ public class AliPayController { aliPaySigningOrder.setStatus(1); //设置下次续费的时间 aliPaySigningOrder.setNextPayTime(LocalDateTime.now().plusDays(31)); - System.out.println("修改成功订单"+aliPaySigningOrder+"================================"); + log.info("支付宝签约修改成功订单"+aliPaySigningOrder+"================================"); boolean b = aliPaySigningOrderService.updateById(aliPaySigningOrder); - System.out.println("修改结果：=========================================================="+b); + log.info("支付宝签约修改结果：=========================================================="+b); //进行扣款 aliPayService.aliPayTradePayByAgreement(payInOrderByAgreementReq,aliPaySigningOrder); @@ -437,10 +438,9 @@ public class AliPayController { //通知时间。通知的发送时间。格式为 yyyy-MM-dd HH:mm:ss。 String notifyTime = inMap.get("notify_time"); log.info("支付宝支付回调：" + inMap.toString()); - System.out.println("outTradeNo====================="+outTradeNo); + log.info("outTradeNo====================="+outTradeNo); AliPaySigningOrderEntity aliPaySigningOrderEntity = aliPaySigningOrderService.getOne(new QueryWrapper().eq("other_order_id", outTradeNo)); // for (AliPayOrderEntity aliPayOrderEntity : aliPayOrderService.list(new QueryWrapper<>())) { -// System.out.println("======================================"); // System.out.println(aliPayOrderEntity); // } diff --git a/rights-server/src/main/java/com/cyjd/rights/business/service/impl/AliPayServiceImpl.java b/rights-server/src/main/java/com/cyjd/rights/business/service/impl/AliPayServiceImpl.java index 57b6a67..b847590 100644 --- a/rights-server/src/main/java/com/cyjd/rights/business/service/impl/AliPayServiceImpl.java +++ b/rights-server/src/main/java/com/cyjd/rights/business/service/impl/AliPayServiceImpl.java @@ -87,7 +87,7 @@ public class AliPayServiceImpl implements AliPayService { AlipayClient alipayClient = new DefaultAlipayClient(certAlipayRequest); AlipayUserAgreementPageSignRequest request = alipayRequestBuilderUtil.buildAlipayUserAgreementPageSignRequest(aliPayUserPageSignReq); - System.out.println(request.getBizContent()); + //(request.getBizContent()); request.setReturnUrl("https://m.miguring.cn/#/hotVIPpayback"); //周期扣款协议信息 //签约参数。如果希望在sdk中支付并签约，需要在这里传入签约信息。周期扣款场景 product_code 为 CYCLE_PAY_AUTH 时必填 @@ -127,8 +127,8 @@ public class AliPayServiceImpl implements AliPayService { String externalAgreementNo = aliPayQueryPageSignReq.getExternalAgreementNo(); //log.info("用户内部系统签约号{}：查询周期扣款签约结果入参：{}", externalAgreementNo, request.getBizContent()); AlipayUserAgreementQueryResponse response = null; - System.out.println("=========================="); - System.out.println(request.getBizContent()); + log.info("=========================="); + //System.out.println(request.getBizContent()); response = alipayClient.certificateExecute(request); if (response.isSuccess()) { //log.info("用户内部系统签约号{}：查询周期扣款签约结果,调用成功", externalAgreementNo); @@ -156,8 +156,8 @@ public class AliPayServiceImpl implements AliPayService { try { AlipayClient alipayClient = new DefaultAlipayClient(certAlipayRequest); AlipayTradePayRequest request = alipayRequestBuilderUtil.buildAlipayTradePayAgreementRequest(inOrderByAgreementReq); - System.out.println("=========================="); - System.out.println(request.getBizContent()); + log.info("=========================="); + //System.out.println(request.getBizContent()); log.info("支付宝用户签约号{}：查询签约用户，进行自动续期扣费：{}", inOrderByAgreementReq.getAuthCode(), request.getBizContent()); //保存代扣结果 AlipayTradePayResponse response = alipayClient.certificateExecute(request); @@ -172,7 +172,7 @@ public class AliPayServiceImpl implements AliPayService { aliPayOrderEntity.setOrderTime(LocalDateTime.now()); aliPayOrderEntity.setPrice(aliPaySigningOrderEntity.getPrice()); aliPayOrderEntity.setSignCode(inOrderByAgreementReq.getAuthCode()); - System.out.println(aliPaySigningOrderEntity.getOtherOrderId()+"======================"); + //System.out.println(aliPaySigningOrderEntity.getOtherOrderId()+"======================"); aliPayOrderEntity.setOtherOrderId(aliPaySigningOrderEntity.getOtherOrderId()); if (response.isSuccess()) { aliPayOrderEntity.setStatus(2); //最终结果要看代扣回调，这个返回值可能被篡改 @@ -181,7 +181,7 @@ public class AliPayServiceImpl implements AliPayService { aliPayOrderEntity.setStatus(0); //扣费失败 log.info("支付宝用户签约号{}：周期扣款，主动扣费失败:{}", inOrderByAgreementReq.getAuthCode(), response.getSubMsg()); } - System.out.println("支付订单保存============================================="+aliPayOrderEntity); + log.info("支付订单保存============================================="+aliPayOrderEntity); aliPayOrderService.save(aliPayOrderEntity); return response; } catch (Exception e) { @@ -199,7 +199,7 @@ public class AliPayServiceImpl implements AliPayService { try { AlipayClient alipayClient = new DefaultAlipayClient(certAlipayRequest); AlipayTradeQueryRequest alipayTradeQueryRequest = alipayRequestBuilderUtil.buildAlipayTradeQueryRequest(aliPayTradeQueryReq); - System.out.println("=========================="); + log.info("=========================="); System.out.println(alipayTradeQueryRequest); AlipayTradeQueryResponse alipayTradeQueryResponse = alipayClient.certificateExecute(alipayTradeQueryRequest); return "TRADE_SUCCESS".equals(alipayTradeQueryResponse.getTradeStatus());