From e4d3d481dabcce37ef6a8325c2b548fb1cfc1497 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 28 Aug 2023 15:30:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=88=86=E8=B4=A6=20?= =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/api/uniapp/PayController.java | 2 +- .../com/jsowell/service/OrderService.java | 110 +++++++++--------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index 4b29e90b6..0fff346f5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -177,7 +177,7 @@ public class PayController extends BaseController { logger.info("1----------->微信支付回调开始 body:{}", JSONObject.toJSONString(body)); RestApiResponse response; try { - orderService.wechatPayCallback(request, body); + // orderService.wechatPayCallback(request, body); response = new RestApiResponse<>(); } catch (BusinessException e) { logger.warn("微信支付回调接口warn", e); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index b9a1c3758..245b277cd 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -261,61 +261,61 @@ public class OrderService { * @param body * @throws Exception */ - public void wechatPayCallback(HttpServletRequest request, WechatPayNotifyParameter body) throws Exception { - // 获取微信支付成功返回的信息 - Map map = wechatPayService.wechatPayCallbackInfo(request, body); - String type = (String) map.get("type"); - BigDecimal amount = (BigDecimal) map.get("amount"); // 微信给的amount单位是分 - amount = amount.divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP); // 转换为元 - - String orderCode = (String) map.get("orderCode"); - String memberId = (String) map.get("memberId"); - if (StringUtils.equals(type, ScenarioEnum.ORDER.getValue())) { // 1-订单支付 - // 支付订单成功 - // orderCode = (String) map.get("orderCode"); - PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder() - .orderCode(orderCode) - .payAmount(amount) - .payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue()) - .acquirer(AcquirerEnum.WECHAT_PAY.getValue()) - .build(); - // 订单支付成功 支付回调 - orderBasicInfoService.payOrderSuccessCallback(callbackDTO); - - // 记录订单支付流水 - // OrderPayRecord orderPayRecord = OrderPayRecord.builder() - // .orderCode(orderCode) - // .payMode(OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue()) - // .payAmount(amount) - // .acquirer(AcquirerEnum.WECHAT_PAY.getValue()) - // .createBy(null) - // .build(); - // orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord)); - } else if (StringUtils.equals(type, ScenarioEnum.BALANCE.getValue())) { // 2-充值余额 - // 充值余额成功 - // memberId = (String) map.get("memberId"); - UpdateMemberBalanceDTO dto = new UpdateMemberBalanceDTO(); - dto.setMemberId(memberId); - dto.setType(MemberWalletEnum.TYPE_IN.getValue()); - dto.setSubType(MemberWalletEnum.SUBTYPE_TOP_UP.getValue()); - dto.setUpdatePrincipalBalance(amount); - memberBasicInfoService.updateMemberBalance(dto); - } - - // 微信支付订单 记录会员交易流水 - MemberTransactionRecord record = MemberTransactionRecord.builder() - .orderCode(orderCode) - .scenarioType(type) - .memberId(memberId) - .actionType(ActionTypeEnum.FORWARD.getValue()) - .payMode(PayModeEnum.PAYMENT_OF_WECHATPAY.getValue()) - .paymentInstitutions(PaymentInstitutionsEnum.WECHAT_PAY.getValue()) - .amount(amount) // 单位元 - .outTradeNo(String.valueOf(map.get("out_trade_no"))) - .transactionId(String.valueOf(map.get("transaction_id"))) - .build(); - memberTransactionRecordService.insertSelective(record); - } + // public void wechatPayCallback(HttpServletRequest request, WechatPayNotifyParameter body) throws Exception { + // // 获取微信支付成功返回的信息 + // Map map = wechatPayService.wechatPayCallbackInfo(request, body); + // String type = (String) map.get("type"); + // BigDecimal amount = (BigDecimal) map.get("amount"); // 微信给的amount单位是分 + // amount = amount.divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP); // 转换为元 + // + // String orderCode = (String) map.get("orderCode"); + // String memberId = (String) map.get("memberId"); + // if (StringUtils.equals(type, ScenarioEnum.ORDER.getValue())) { // 1-订单支付 + // // 支付订单成功 + // // orderCode = (String) map.get("orderCode"); + // PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder() + // .orderCode(orderCode) + // .payAmount(amount) + // .payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue()) + // .acquirer(AcquirerEnum.WECHAT_PAY.getValue()) + // .build(); + // // 订单支付成功 支付回调 + // orderBasicInfoService.payOrderSuccessCallback(callbackDTO); + // + // // 记录订单支付流水 + // // OrderPayRecord orderPayRecord = OrderPayRecord.builder() + // // .orderCode(orderCode) + // // .payMode(OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue()) + // // .payAmount(amount) + // // .acquirer(AcquirerEnum.WECHAT_PAY.getValue()) + // // .createBy(null) + // // .build(); + // // orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord)); + // } else if (StringUtils.equals(type, ScenarioEnum.BALANCE.getValue())) { // 2-充值余额 + // // 充值余额成功 + // // memberId = (String) map.get("memberId"); + // UpdateMemberBalanceDTO dto = new UpdateMemberBalanceDTO(); + // dto.setMemberId(memberId); + // dto.setType(MemberWalletEnum.TYPE_IN.getValue()); + // dto.setSubType(MemberWalletEnum.SUBTYPE_TOP_UP.getValue()); + // dto.setUpdatePrincipalBalance(amount); + // memberBasicInfoService.updateMemberBalance(dto); + // } + // + // // 微信支付订单 记录会员交易流水 + // MemberTransactionRecord record = MemberTransactionRecord.builder() + // .orderCode(orderCode) + // .scenarioType(type) + // .memberId(memberId) + // .actionType(ActionTypeEnum.FORWARD.getValue()) + // .payMode(PayModeEnum.PAYMENT_OF_WECHATPAY.getValue()) + // .paymentInstitutions(PaymentInstitutionsEnum.WECHAT_PAY.getValue()) + // .amount(amount) // 单位元 + // .outTradeNo(String.valueOf(map.get("out_trade_no"))) + // .transactionId(String.valueOf(map.get("transaction_id"))) + // .build(); + // memberTransactionRecordService.insertSelective(record); + // } /** * 微信退款