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 245b277cd..98434583e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1011,6 +1011,19 @@ public class OrderService { // 保存到数据库 adapayCallbackRecordService.saveAdapayCallbackRecord(adapayCallbackRecord); + // 保存MemberAdapayRecord + MemberAdapayRecord memberAdapayRecord = new MemberAdapayRecord(); + memberAdapayRecord.setMemberId(memberId); + memberAdapayRecord.setPaymentId(paymentId); + memberAdapayRecord.setPaymentOrderNo(adapayCallbackRecord.getOutTransId()); + memberAdapayRecord.setScenarioType(scenarioType); + memberAdapayRecord.setPayAmt(amount); + memberAdapayRecord.setRefundAmt(BigDecimal.ZERO); + memberAdapayRecord.setSpendAmt(BigDecimal.ZERO); + memberAdapayRecord.setFreezeAmt(BigDecimal.ZERO); + memberAdapayRecord.setBalanceAmt(amount); + memberAdapayRecordService.insertSelective(memberAdapayRecord); + // 微信支付订单 记录会员交易流水 MemberTransactionRecord record = MemberTransactionRecord.builder() .orderCode(orderCode) @@ -1026,6 +1039,21 @@ public class OrderService { memberTransactionRecordService.insertSelective(record); if (StringUtils.equals(scenarioType, ScenarioEnum.ORDER.getValue())) { // 1-订单支付 + JSONObject json = new JSONObject(); + json.put("paymentId", paymentId); + json.put("amount", amount); + + // 记录订单支付流水 + OrderPayRecord orderPayRecord = OrderPayRecord.builder() + .orderCode(orderCode) + .payMode(OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue()) + .payAmount(amount) + .acquirer(AcquirerEnum.ADAPAY.getValue()) + .deductionRecord(json.toJSONString()) + .createBy(null) + .build(); + orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord)); + // 支付订单成功 PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder() .orderCode(orderCode) @@ -1035,16 +1063,6 @@ public class OrderService { .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)); } else if (StringUtils.equals(scenarioType, ScenarioEnum.BALANCE.getValue())) { // 2-充值余额 // 充值余额成功 UpdateMemberBalanceDTO dto = new UpdateMemberBalanceDTO(); @@ -1055,18 +1073,7 @@ public class OrderService { memberBasicInfoService.updateMemberBalance(dto); } - // 保存MemberAdapayRecord - MemberAdapayRecord memberAdapayRecord = new MemberAdapayRecord(); - memberAdapayRecord.setMemberId(memberId); - memberAdapayRecord.setPaymentId(adapayCallbackRecord.getPaymentId()); - memberAdapayRecord.setPaymentOrderNo(adapayCallbackRecord.getOutTransId()); - memberAdapayRecord.setScenarioType(scenarioType); - memberAdapayRecord.setPayAmt(amount); - memberAdapayRecord.setRefundAmt(BigDecimal.ZERO); - memberAdapayRecord.setSpendAmt(BigDecimal.ZERO); - memberAdapayRecord.setFreezeAmt(BigDecimal.ZERO); - memberAdapayRecord.setBalanceAmt(amount); - memberAdapayRecordService.insertSelective(memberAdapayRecord); + } /** 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 98c85c9da..78d437bc0 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 @@ -2832,18 +2832,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderInfo.setPayTime(new Date()); this.updateOrderBasicInfo(orderInfo); - // 记录订单支付流水 - List orderPayRecordList = Lists.newArrayList(); - OrderPayRecord orderPayRecord = OrderPayRecord.builder() - .orderCode(dto.getOrderCode()) - .payMode(dto.getPayMode()) - .payAmount(payAmount) - .acquirer(dto.getAcquirer()) - .createBy(null) - .build(); - orderPayRecordList.add(orderPayRecord); - orderPayRecordService.batchInsert(orderPayRecordList); - // 是否发送启动指令 boolean sendStartCharging = true; @@ -2999,7 +2987,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { * 去除赠送金额相关的代码 * @param dto */ - private void balancePayOrder(PayOrderDTO dto) { + /*private void balancePayOrder(PayOrderDTO dto) { // 记录支付流水 List payRecordList = Lists.newArrayList(); String orderCode = dto.getOrderCode(); @@ -3089,7 +3077,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { if (CollectionUtils.isNotEmpty(payRecordList)) { orderPayRecordService.batchInsert(payRecordList); } - } + }*/ private void balancePayOrderV2(PayOrderDTO dto) { String orderCode = dto.getOrderCode(); // 订单编号