From 7a9361af9d4fd88948f05be2efd73fac021fd64c Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 28 Aug 2023 14:53:02 +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/service/OrderService.java | 34 ++++++++++--------- .../pile/dto/PayOrderSuccessCallbackDTO.java | 5 +++ .../impl/OrderBasicInfoServiceImpl.java | 14 ++++++++ 3 files changed, 37 insertions(+), 16 deletions(-) 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 bb885b483..757faf40d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -277,19 +277,20 @@ public class OrderService { .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)); + // 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"); @@ -1016,19 +1017,20 @@ public class OrderService { .orderCode(orderCode) .payAmount(amount) .payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue()) + .acquirer(AcquirerEnum.ADAPAY.getValue()) .build(); // 订单支付成功 支付回调 orderBasicInfoService.payOrderSuccessCallback(callbackDTO); // 记录订单支付流水 - OrderPayRecord orderPayRecord = OrderPayRecord.builder() - .orderCode(orderCode) - .payMode(OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue()) - .payAmount(amount) - .acquirer(AcquirerEnum.ADAPAY.getValue()) - .createBy(null) - .build(); - orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord)); + // OrderPayRecord orderPayRecord = OrderPayRecord.builder() + // .orderCode(orderCode) + // .payMode(OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue()) + // .payAmount(amount) + // .acquirer(AcquirerEnum.ADAPAY.getValue()) + // .createBy(null) + // .build(); + // orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord)); } else if (StringUtils.equals(type, ScenarioEnum.BALANCE.getValue())) { // 2-充值余额 scenarioType = ScenarioEnum.BALANCE.getValue(); // 充值余额成功 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PayOrderSuccessCallbackDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PayOrderSuccessCallbackDTO.java index 8b90cfe62..da946c8ba 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PayOrderSuccessCallbackDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PayOrderSuccessCallbackDTO.java @@ -35,4 +35,9 @@ public class PayOrderSuccessCallbackDTO { * 0-后管启动；1-用户app启动；2-卡启动；3-离线卡启动; 4-联联平台启动; 5-车辆vin码启动 */ private String startMode; + + /** + * 收单机构（0-本账户余额；1-微信支付；2-汇付支付） + */ + private String acquirer; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 740e5776d..4d4e27a12 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2799,11 +2799,14 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { String orderCode = dto.getOrderCode(); BigDecimal payAmount = dto.getPayAmount(); String payMode = dto.getPayMode(); + + // 白名单直接算支付成功 PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder() .orderCode(orderCode) .payAmount(payAmount) .payMode(payMode) .startMode(dto.getStartMode()) + .acquirer(AcquirerEnum.LOCAL.getValue()) .build(); payOrderSuccessCallback(callbackDTO); } @@ -2826,6 +2829,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderInfo.setPayTime(new Date()); this.updateOrderBasicInfo(orderInfo); + // 记录订单支付流水 + OrderPayRecord orderPayRecord = OrderPayRecord.builder() + .orderCode(dto.getOrderCode()) + .payMode(dto.getPayMode()) + .payAmount(payAmount) + .acquirer(dto.getAcquirer()) + .createBy(null) + .build(); + orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord)); + // 是否发送启动指令 boolean sendStartCharging = true; @@ -3046,6 +3059,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { .payAmount(chargeAmount) .payMode(dto.getPayMode()) .startMode(dto.getStartMode()) + .acquirer(AcquirerEnum.LOCAL.getValue()) .build(); payOrderSuccessCallback(callbackDTO);