diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index 93a835a9c..7c6fb12d5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -244,6 +244,7 @@ public class TempController extends BaseController { /** * 运营商分账手动接口 + * 前提条件是已经计算好订单日报了 * http://localhost:8080/temp/orderSplittingOperations * * @return @@ -421,6 +422,18 @@ public class TempController extends BaseController { } /** - * + * 更新会员的余额充值记录 */ + public RestApiResponse updateMemberAdapayRecord(ApplyRefundDTO dto) { + try { + List memberIdList = dto.getMemberIdList(); + for (String memberId : memberIdList) { + tempService.updateMemberAdapayRecord(memberId); + } + } catch (Exception e) { + logger.error("批量订单退款error", e); + } + + return null; + } } diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java index 590c41031..9b95bd5cb 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java @@ -441,4 +441,10 @@ public class TempService { // logger.info("批量进行问题订单退款,orderCode:{}, result:{}", orderBasicInfo.getOrderCode(), JSON.toJSONString(result)); } } + + public void updateMemberAdapayRecord(String memberId) { + // 查询 + List memberAdapayRecordList = memberAdapayRecordService.selectAdapayRecordList(memberId, ScenarioEnum.BALANCE.getValue()); + + } } 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 06df5037c..2cb3837ff 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 @@ -7,7 +7,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.huifu.adapay.core.exception.BaseAdaPayException; import com.jsowell.adapay.dto.QueryPaymentConfirmDTO; -import com.jsowell.adapay.operation.PaymentConfirmOperation; import com.jsowell.adapay.operation.PaymentReverseOperation; import com.jsowell.adapay.response.PaymentConfirmResponse; import com.jsowell.adapay.response.PaymentReverseResponse; @@ -1435,16 +1434,17 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { BigDecimal deductionAmount = vo.getDeductionAmount(); // 延时分账,使用确认交易API - // PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(paymentId, adapayMemberAccount, deductionAmount, orderCode, wechatAppId); + PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(paymentId, + adapayMemberAccount, deductionAmount, orderCode, wechatAppId); // 换新的方法,逻辑不变,参数封装了 - PaymentConfirmOperation operation = new PaymentConfirmOperation(); - operation.setPaymentId(paymentId); - operation.setConfirmAmt(deductionAmount); - operation.setOrderCode(orderCode); - operation.setAdapayMemberId(adapayMemberAccount.getAdapayMemberId()); - operation.setMerchantKey(wechatAppId); - PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(operation); + // PaymentConfirmOperation operation = new PaymentConfirmOperation(); + // operation.setPaymentId(paymentId); + // operation.setConfirmAmt(deductionAmount); + // operation.setOrderCode(orderCode); + // operation.setAdapayMemberId(adapayMemberAccount.getAdapayMemberId()); + // operation.setMerchantKey(wechatAppId); + // PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(operation); if (paymentConfirmResponse != null && paymentConfirmResponse.isNotFailed()) { confirmAmt = confirmAmt.add(new BigDecimal(paymentConfirmResponse.getConfirm_amt())); @@ -1566,15 +1566,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { BigDecimal settleAmount = orderBasicInfo.getSettleAmount(); // 调汇付的分账接口 确认交易 - // PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(paymentId, adapayMemberAccount, settleAmount, orderCode, wechatAppId); + PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(paymentId, + adapayMemberAccount, settleAmount, orderCode, wechatAppId); - PaymentConfirmOperation operation = new PaymentConfirmOperation(); - operation.setPaymentId(paymentId); - operation.setConfirmAmt(settleAmount); - operation.setOrderCode(orderCode); - operation.setAdapayMemberId(adapayMemberAccount.getAdapayMemberId()); - operation.setMerchantKey(wechatAppId); - PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(operation); + // PaymentConfirmOperation operation = new PaymentConfirmOperation(); + // operation.setPaymentId(paymentId); + // operation.setConfirmAmt(settleAmount); + // operation.setOrderCode(orderCode); + // operation.setAdapayMemberId(adapayMemberAccount.getAdapayMemberId()); + // operation.setMerchantKey(wechatAppId); + // PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(operation); // 分账接口返回的信息