From 8daa69fadbe151018a02769e918e61997e9555e2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 08 Apr 2024 16:16:47 +0800
Subject: [PATCH] 微信支付优化
---
src/main/java/org/springblade/modules/pay/service/IWxPayService.java | 1 -
src/main/java/org/springblade/modules/pay/controller/WxPayController.java | 11 -----------
src/main/java/org/springblade/modules/pay/service/impl/WxPayServiceImpl.java | 22 ++++++----------------
3 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/src/main/java/org/springblade/modules/pay/controller/WxPayController.java b/src/main/java/org/springblade/modules/pay/controller/WxPayController.java
index 22df1f0..8ebb8b6 100644
--- a/src/main/java/org/springblade/modules/pay/controller/WxPayController.java
+++ b/src/main/java/org/springblade/modules/pay/controller/WxPayController.java
@@ -43,17 +43,6 @@
return R.status(wxPayService.saveOrUpdate(wxPayInfo));
}
- /**
- * 获取openId
- *
- * @param code
- * @return
- */
- @PostMapping("getOpenId")
- public R getOpenId(String code) {
- return R.data(wxPayService.getOpenId(code));
- }
-
/**
* jsapi下单
diff --git a/src/main/java/org/springblade/modules/pay/service/IWxPayService.java b/src/main/java/org/springblade/modules/pay/service/IWxPayService.java
index dc12258..dceb066 100644
--- a/src/main/java/org/springblade/modules/pay/service/IWxPayService.java
+++ b/src/main/java/org/springblade/modules/pay/service/IWxPayService.java
@@ -11,7 +11,6 @@
public interface IWxPayService extends IService<WxPayInfo> {
- Object getOpenId(String code);
void processOrder(Map<String, Object> bodyMap) throws GeneralSecurityException;
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 dfc021c..2d1ed80 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
@@ -32,19 +32,17 @@
import org.springblade.modules.pay.service.IPaymentInfoService;
import org.springblade.modules.pay.service.IRefundInfoService;
import org.springblade.modules.pay.service.IWxPayService;
-import org.springblade.modules.property.entity.PropertyChargeRecord;
-import org.springblade.modules.property.service.IPropertyChargeService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.FileInputStream;
import java.io.IOException;
+import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.security.*;
import java.util.*;
@@ -52,16 +50,12 @@
import java.util.concurrent.locks.ReentrantLock;
@Service
-public class WxPayServiceImpl extends ServiceImpl<WxPayMapper,WxPayInfo> implements IWxPayService {
+public class WxPayServiceImpl extends ServiceImpl<WxPayMapper, WxPayInfo> implements IWxPayService {
private static Logger logger = LoggerFactory.getLogger(WxPayServiceImpl.class);
@Resource
private WxPayConfig wxPayConfig;
-
- @Resource
- private IPropertyChargeService iPropertyChargeService;
-
@Resource
private CloseableHttpClient wxPayClient;
@@ -76,12 +70,6 @@
private IRefundInfoService refundsInfoService;
private final ReentrantLock lock = new ReentrantLock();
-
-
- @Override
- public Object getOpenId(String code) {
- return null;
- }
@Transactional(rollbackFor = Exception.class)
@Override
@@ -421,13 +409,15 @@
}
-
@Override
public Map<String, String> jsapiPay(Long properChargeRecordId) throws Exception {
String prepayId = "";
//生成订单
- OrderInfoEntity orderInfo = orderInfoService.getOne(Wrappers.<OrderInfoEntity>lambdaQuery().eq(OrderInfoEntity::getProperChargeRecordId,properChargeRecordId));
+ OrderInfoEntity orderInfo = orderInfoService.getOne(Wrappers.<OrderInfoEntity>lambdaQuery().eq(OrderInfoEntity::getProperChargeRecordId, properChargeRecordId));
+ if (orderInfo.getTotalFee() <= 0) {
+ throw new Exception("支付金额不能低于等于0元");
+ }
IUserService userService = SpringUtils.getBean(IUserService.class);
User serviceOne = userService.getOne(Wrappers.<User>lambdaQuery().eq(User::getId, AuthUtil.getUserId()));
--
Gitblit v1.9.3