From aeacac3ea64e8c6a67492490e34a07623229b2cd Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Fri, 20 Aug 2021 16:46:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=85=E5=80=BC=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/order/api/HxpcPileOrderController.java | 1 - .../xhpc/payment/controller/WxPaymentController.java | 10 +++++++++- .../controller/XhpcRefundAuditController.java | 12 ++++++++---- .../controller/XhpcRefundOrderController.java | 6 +++++- .../mapper/XhpcUserAccountStatementMapper.xml | 2 +- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java index 9c9323c9..48387b5c 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java @@ -435,7 +435,6 @@ public class HxpcPileOrderController extends BaseController { } } - xhpcHistoryOrder.setChargeOrderId(hxpcChargeOrder.getChargeOrderId()); xhpcHistoryOrder.setChargingStationId(hxpcChargeOrder.getChargingStationId()); xhpcHistoryOrder.setUserId(userId); diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java index 261b7ecd..833e9cae 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java @@ -13,6 +13,8 @@ import com.xhpc.payment.service.IXhpcRechargeOrderService; import com.xhpc.payment.service.IXhpcRefundOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.PostMapping; @@ -58,6 +60,7 @@ public class WxPaymentController { @Autowired private Environment environment; + @PostMapping("/payment") @ApiOperation(value = "微信支付") public AjaxResult payment(HttpServletRequest servletRequest, @RequestBody Map map) throws Exception { @@ -69,6 +72,10 @@ public class WxPaymentController { String amount = StringUtils.valueOf(map.get("amount")); if (StringUtils.isEmpty(amount)) { return AjaxResult.error(HttpStatus.NOT_NULL, "充值金额不能为空"); + }else{ + if(new BigDecimal(5).compareTo(new BigDecimal(amount))==1){ + return AjaxResult.error(HttpStatus.NOT_NULL, "充值金额不能少于5元"); + } } //用户信息id String userId = StringUtils.valueOf(map.get("userId")); @@ -321,7 +328,7 @@ public class WxPaymentController { */ @RequestMapping("/test") public void test() { - paymentCallback("wx20210728172854", "4200001199202107286896883790"); + paymentCallback("000002020210820142215119", "4200001189202108202038629329"); } /** @@ -353,6 +360,7 @@ public class WxPaymentController { xhpcUserAccountStatement.setUserId(xhpcRechargeOrder.getUserId()); xhpcUserAccountStatement.setAmount(xhpcRechargeOrder.getAmount()); xhpcUserAccountStatement.setRemainingSum(xhpcAppUser.getBalance()); + xhpcUserAccountStatement.setCreateTime(new Date()); xhpcUserAccountStatementMapper.insert(xhpcUserAccountStatement); } } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java index 65e21c75..8a1c7987 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java @@ -78,6 +78,7 @@ public class XhpcRefundAuditController extends BaseController { @Transactional public AjaxResult info(@RequestBody XhpcRefundAudit xhpcRefundAudit) { Map map = iXhpcRefundOrderService.info(xhpcRefundAudit.getRefundOrderId()); + if (null == map) { AjaxResult.error(HttpStatus.DATA_ERROR, "退款订单不存在"); } @@ -167,6 +168,7 @@ public class XhpcRefundAuditController extends BaseController { public Object enterpriseCheckOut(@RequestBody XhpcRefundAudit xhpcRefundAudit) { //只有审核通过才能退款 Map xhpcRefundOrder = iXhpcRefundOrderService.info(xhpcRefundAudit.getRefundOrderId()); + if (StringUtils.isNull(xhpcRefundOrder)) { return AjaxResult.error(HttpStatus.DATA_ERROR, "订单不存在"); } @@ -183,7 +185,8 @@ public class XhpcRefundAuditController extends BaseController { CloseableHttpClient httpClient = null; try { //证书的地址 - ConfigListener.getConf().get("certPath"); + String certPath = ConfigListener.getConf().get("certPath"); + System.out.println("certPath:"+certPath); httpClient = initCert(); } catch (Exception e) { e.printStackTrace(); @@ -242,9 +245,9 @@ public class XhpcRefundAuditController extends BaseController { */ private CloseableHttpClient initCert() throws Exception { String path = "apiclient_cert.p12"; - File file = new File(this.getClass().getResource("/").getPath() + path); + //File file = new File(this.getClass().getResource("/").getPath() + path); //线上地址 - //File file = new File("/www/wwwroot/msjd.project2.tingsun.net/" + path); + File file = new File("/www/wwwroot/xhpc.scxhua.com/xhpc-payment/" + path); // 证书密码，默认为商户ID String key = environment.getProperty("MCHID"); // 指定读取证书格式为PKCS12 @@ -317,6 +320,7 @@ public class XhpcRefundAuditController extends BaseController { * @return */ private AjaxResult parseXml(String result, Long id, BigDecimal amount, String userId) { + try { Map map = WXPayUtil.xmlToMap(result); String result_code = map.get("result_code"); @@ -330,7 +334,7 @@ public class XhpcRefundAuditController extends BaseController { //减少用户余额 XhpcAppUser xhpcAppUser = new XhpcAppUser(); xhpcAppUser.setAppUserId(Long.parseLong(userId)); - BigDecimal surplus = BigDecimal.valueOf(Double.valueOf(balance)).subtract(amount); + BigDecimal surplus =new BigDecimal(balance).subtract(amount); xhpcAppUser.setBalance(surplus); xhpcUserAccountStatementMapper.updateAppUserBalance(xhpcAppUser); } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java index 0f72084e..d0d58132 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java @@ -34,7 +34,11 @@ public class XhpcRefundOrderController extends BaseController { public AjaxResult enterpriseCheckOut(@RequestBody Map map) { String amount = StringUtils.valueOf(map.get("amount")); if (StringUtils.isEmpty(amount)) { - return AjaxResult.error(HttpStatus.NOT_NULL, "充值金额不能为空"); + return AjaxResult.error(HttpStatus.NOT_NULL, "退款金额不能为空"); + }else{ + if(new BigDecimal(1).compareTo(new BigDecimal(amount))==1){ + return AjaxResult.error(HttpStatus.NOT_NULL, "退款金额不能少于1元"); + } } //用户信息id String userId = StringUtils.valueOf(map.get("userId")); diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml index 0785e5e2..6a5f541c 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml @@ -144,7 +144,7 @@ UPDATE xhpc_app_user - balance = #{balance}, + balance = #{balance} WHERE app_user_id = #{appUserId}