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 1f4df09fd..bd2481945 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 @@ -58,6 +58,9 @@ public class TempController extends BaseController { @Autowired private ISettleOrderReportService settleOrderReportService; + @Autowired + private IPileMerchantInfoService pileMerchantInfoService; + /** * 临时刷数据接口 * http://localhost:8080/temp/tempUpdateVirtualAmount @@ -197,7 +200,8 @@ public class TempController extends BaseController { if (orderBasicInfo == null || adapayMemberAccount == null) { throw new BusinessException("", "查询信息为空"); } - orderBasicInfoService.doPaymentConfirm(orderBasicInfo, adapayMemberAccount); + String appId = pileMerchantInfoService.queryAppIdByMerchantId(orderBasicInfo.getMerchantId()); + orderBasicInfoService.doPaymentConfirm(orderBasicInfo, adapayMemberAccount, appId); } catch (Exception e) { logger.error("临时接口交易确认接口 error,", e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_WEIXIN_REFUND_ERROR); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java index 44d89710e..8ec0b9cda 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java @@ -162,9 +162,9 @@ public interface IOrderBasicInfoService { * @return * @throws BaseAdaPayException */ - OrderSettleResult doPaymentConfirm(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount) throws BaseAdaPayException; + OrderSettleResult doPaymentConfirm(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount, String wechatAppId) throws BaseAdaPayException; - /** + /** * 批量查询订单 * @param orderCodeList * @return 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 c698db974..18ea83f60 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 @@ -998,6 +998,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { clearingBillInfo.setMerchantId(orderReport.getMerchantId()); clearingBillInfo.setOrderSource("1"); + String appId = pileMerchantInfoService.queryAppIdByMerchantId(orderReport.getMerchantId()); + // 应收金额 BigDecimal receivableAmount = BigDecimal.ZERO; // 应清分金额 @@ -1020,7 +1022,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderSettleResult = doBalancePayment(orderBasicInfo, adapayMemberAccount); } else { // 在线支付,进行支付确认分账 - orderSettleResult = doPaymentConfirm(orderBasicInfo, adapayMemberAccount); + orderSettleResult = doPaymentConfirm(orderBasicInfo, adapayMemberAccount, appId); } if (orderSettleResult != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(orderSettleResult.getStatus())) { // 应收金额 = 订单结算金额汇总 @@ -1098,6 +1100,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { return; } + String appId = pileMerchantInfoService.queryAppIdByMerchantId(merchantId); + // 根据交易日期查询运营商下面所有站点的交易日报 List stationReportList = settleOrderReportService.selectByMerchantIdAndDate(merchantId, tradeDate); for (SettleOrderReport orderReport : stationReportList) { @@ -1124,7 +1128,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // orderSettleResult = doBalancePayment(orderBasicInfo, adapayMemberAccount); } else { // 在线支付,进行支付确认分账 - orderSettleResult = doPaymentConfirm(orderBasicInfo, adapayMemberAccount); + orderSettleResult = doPaymentConfirm(orderBasicInfo, adapayMemberAccount, appId); } // if (orderSettleResult != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(orderSettleResult.getStatus())) { // JSONObject jsonObject = JSON.parseObject(orderSettleResult.getDescription()); @@ -1239,7 +1243,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { * @throws BaseAdaPayException */ @Override - public OrderSettleResult doPaymentConfirm(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount) throws BaseAdaPayException { + public OrderSettleResult doPaymentConfirm(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount, String wechatAppId) throws BaseAdaPayException { // 查询订单的交易id AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderBasicInfo.getOrderCode()); if (adapayCallbackRecord == null) { @@ -1269,7 +1273,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { divMember.setAmount(settleAmount); divMember.setFee_flag(Constants.Y); confirmParams.put("div_members", Lists.newArrayList(divMember)); - Map paymentConfirm = PaymentConfirm.create(confirmParams); + Map paymentConfirm = PaymentConfirm.create(confirmParams, wechatAppId); logger.info("调分账接口param:{}, result:{}", JSON.toJSONString(confirmParams), JSON.toJSONString(paymentConfirm)); // 分账接口返回的信息