From 8b34f6eb17ee3974c818cdaf0dd1b6c7e79ba806 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 09 Apr 2024 09:13:17 +0800
Subject: [PATCH] 微信注释部分
---
src/main/java/org/springblade/common/config/WxPayConfig.java | 8 ++++----
src/main/java/org/springblade/modules/pay/service/impl/WxPayServiceImpl.java | 14 +++++++-------
src/main/java/org/springblade/modules/pay/entity/OrderInfoEntity.java | 2 +-
src/main/java/org/springblade/modules/pay/controller/OrderInfoController.java | 2 +-
src/main/java/org/springblade/modules/pay/mapper/OrderInfoMapper.xml | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/WxPayConfig.java b/src/main/java/org/springblade/common/config/WxPayConfig.java
index 3d7edf1..c55037b 100644
--- a/src/main/java/org/springblade/common/config/WxPayConfig.java
+++ b/src/main/java/org/springblade/common/config/WxPayConfig.java
@@ -12,6 +12,7 @@
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
import java.io.FileInputStream;
import java.nio.charset.StandardCharsets;
@@ -19,7 +20,6 @@
@Configuration
-// @PropertySource("classpath:wxpay.properties") //读取配置文件
@ConfigurationProperties(prefix = "wxpay") //读取wxpay节点
@Data //使用set方法将wxpay节点中的值填充到当前类的属性中
@Slf4j
@@ -111,7 +111,7 @@
*
* @return
*/
- @Bean
+// @Bean
public ScheduledUpdateCertificatesVerifier getVerifier() {
log.info("获取签名验证器");
@@ -140,7 +140,7 @@
* @param verifier
* @return
*/
- @Bean(name = "wxPayClient")
+// @Bean(name = "wxPayClient")
public CloseableHttpClient getWxPayClient(ScheduledUpdateCertificatesVerifier verifier) {
log.info("获取httpClient");
@@ -162,7 +162,7 @@
/**
* 获取HttpClient，无需进行应答签名验证，跳过验签的流程
*/
- @Bean(name = "wxPayNoSignClient")
+// @Bean(name = "wxPayNoSignClient")
public CloseableHttpClient getWxPayNoSignClient() {
//获取商户私钥
diff --git a/src/main/java/org/springblade/modules/pay/controller/OrderInfoController.java b/src/main/java/org/springblade/modules/pay/controller/OrderInfoController.java
index 99bca25..7812ab3 100644
--- a/src/main/java/org/springblade/modules/pay/controller/OrderInfoController.java
+++ b/src/main/java/org/springblade/modules/pay/controller/OrderInfoController.java
@@ -94,7 +94,7 @@
/**
* 创建订单信息
*/
- @PostMapping("/save")
+ @PostMapping("/add")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入orderInfo")
public R save(@RequestParam Long propertyChargeRecordId) {
diff --git a/src/main/java/org/springblade/modules/pay/entity/OrderInfoEntity.java b/src/main/java/org/springblade/modules/pay/entity/OrderInfoEntity.java
index 7e6e1d1..f7e08e3 100644
--- a/src/main/java/org/springblade/modules/pay/entity/OrderInfoEntity.java
+++ b/src/main/java/org/springblade/modules/pay/entity/OrderInfoEntity.java
@@ -95,6 +95,6 @@
/** 物业id */
@ApiModelProperty(value = "物业id", example = "")
- @TableId("proper_id")
+ @TableField("proper_id")
private Long properId;
}
diff --git a/src/main/java/org/springblade/modules/pay/mapper/OrderInfoMapper.xml b/src/main/java/org/springblade/modules/pay/mapper/OrderInfoMapper.xml
index cfda60f..adbec62 100644
--- a/src/main/java/org/springblade/modules/pay/mapper/OrderInfoMapper.xml
+++ b/src/main/java/org/springblade/modules/pay/mapper/OrderInfoMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.pay.mapper.OrderInfoMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="orderInfoResultMap" type="org.springblade.modules.pay.entity.OrderInfoEntity">
+ <resultMap id="orderInfoResultMap" type="org.springblade.modules.pay.vo.OrderInfoVO">
</resultMap>
diff --git a/src/main/java/org/springblade/modules/pay/service/impl/WxPayServiceImpl.java b/src/main/java/org/springblade/modules/pay/service/impl/WxPayServiceImpl.java
index 2d1ed80..ee9f72b 100644
--- a/src/main/java/org/springblade/modules/pay/service/impl/WxPayServiceImpl.java
+++ b/src/main/java/org/springblade/modules/pay/service/impl/WxPayServiceImpl.java
@@ -57,8 +57,8 @@
@Resource
private WxPayConfig wxPayConfig;
- @Resource
- private CloseableHttpClient wxPayClient;
+// @Resource
+// private CloseableHttpClient wxPayClient;
@Resource
private IOrderInfoService orderInfoService;
@@ -145,7 +145,7 @@
httpGet.setHeader("Accept", "application/json");
//完成签名并执行请求
- CloseableHttpResponse response = wxPayClient.execute(httpGet);
+ CloseableHttpResponse response = null;//wxPayClient.execute(httpGet);
try {
String bodyAsString = EntityUtils.toString(response.getEntity());//响应体
@@ -257,7 +257,7 @@
httpPost.setHeader("Accept", "application/json");//设置响应报文格式
//完成签名并执行请求，并完成验签
- CloseableHttpResponse response = wxPayClient.execute(httpPost);
+ CloseableHttpResponse response =null;// wxPayClient.execute(httpPost);
try {
@@ -303,7 +303,7 @@
httpGet.setHeader("Accept", "application/json");
//完成签名并执行请求
- CloseableHttpResponse response = wxPayClient.execute(httpGet);
+ CloseableHttpResponse response = null;//wxPayClient.execute(httpGet);
try {
String bodyAsString = EntityUtils.toString(response.getEntity());
@@ -460,7 +460,7 @@
httpPost.setHeader("Accept", "application/json");
//完成签名并执行请求
- CloseableHttpResponse response = wxPayClient.execute(httpPost);
+ CloseableHttpResponse response = null;//wxPayClient.execute(httpPost);
try {
String bodyAsString = EntityUtils.toString(response.getEntity());//响应体
@@ -582,7 +582,7 @@
httpPost.setHeader("Accept", "application/json");
//完成签名并执行请求
- CloseableHttpResponse response = wxPayClient.execute(httpPost);
+ CloseableHttpResponse response = null;//wxPayClient.execute(httpPost);
try {
int statusCode = response.getStatusLine().getStatusCode();//响应状态码
--
Gitblit v1.9.3