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 b3fbad16e..3bfd97fa5 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 @@ -18,6 +18,8 @@ import com.jsowell.pile.dto.CarVinDTO; import com.jsowell.pile.dto.QueryOrderDTO; import com.jsowell.pile.dto.SettleOrderReportDTO; import com.jsowell.pile.service.*; +import com.jsowell.pile.service.orderlogic.AbstractOrderLogic; +import com.jsowell.pile.service.orderlogic.OrderLogicFactory; import com.jsowell.pile.vo.uniapp.MemberBalanceVO; import com.jsowell.service.OrderService; import com.jsowell.service.TempService; @@ -318,8 +320,12 @@ public class TempController extends BaseController { refundDTO.setMemberId(memberBalanceVO.getMemberId()); refundDTO.setRefundType("2"); refundDTO.setRefundAmount(new BigDecimal(memberBalanceVO.getPrincipalAmount())); + refundDTO.setWechatAppId(dto.getWechatAppId()); // 调用退款接口 - orderService.weChatRefund(refundDTO); + String mode = pileMerchantInfoService.getDelayModeByWechatAppId(dto.getWechatAppId()); + // 获取处理逻辑 + AbstractOrderLogic orderLogic = OrderLogicFactory.getOrderLogic(mode); + orderLogic.refundBalance(dto); }); } response = new RestApiResponse<>(); diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 3f7fc783a..01d42ae7b 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -237,8 +237,8 @@ public class SpringBootTestController { @Test public void checkPaymentTest() { QueryOrderDTO dto = new QueryOrderDTO(); - String startTime = "2023-07-01 00:00:00"; - String endTime = "2023-07-31 23:59:59"; + String startTime = "2023-10-01 00:00:00"; + String endTime = "2023-10-23 23:59:59"; dto.setStartTime(startTime); dto.setEndTime(endTime);