diff --git a/run_shop_generator.sh b/docs/run_shop_generator.sh similarity index 100% rename from run_shop_generator.sh rename to docs/run_shop_generator.sh diff --git a/test_qr_business_type.md b/docs/test_qr_business_type.md similarity index 100% rename from test_qr_business_type.md rename to docs/test_qr_business_type.md diff --git a/src/main/java/com/gxwebsoft/payment/controller/PaymentController.java b/src/main/java/com/gxwebsoft/payment/controller/PaymentController.java index eb93f67..bc409fa 100644 --- a/src/main/java/com/gxwebsoft/payment/controller/PaymentController.java +++ b/src/main/java/com/gxwebsoft/payment/controller/PaymentController.java @@ -38,7 +38,7 @@ import java.util.Map; @RequestMapping("/api/payment") public class PaymentController extends BaseController { - @Resource + @Resource(name = "unifiedPaymentServiceImpl") private PaymentService paymentService; @Operation(summary = "创建支付订单", description = "支持微信、支付宝、银联等多种支付方式") diff --git a/src/main/java/com/gxwebsoft/payment/service/impl/PaymentServiceImpl.java b/src/main/java/com/gxwebsoft/payment/service/impl/PaymentServiceImpl.java index 58df9dc..dca8aff 100644 --- a/src/main/java/com/gxwebsoft/payment/service/impl/PaymentServiceImpl.java +++ b/src/main/java/com/gxwebsoft/payment/service/impl/PaymentServiceImpl.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; * @since 2025-01-26 */ @Slf4j -@Service +@Service("unifiedPaymentServiceImpl") public class PaymentServiceImpl implements PaymentService { /**