diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/ApiFrom.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/ApiFrom.java index a196fbb7d2..f9bb682c3f 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/ApiFrom.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/ApiFrom.java @@ -16,6 +16,7 @@ public enum ApiFrom { private final String apiDealStrategy; + public static final String ApiDealStrategyImpl = "ApiDealStrategyImpl"; public static final String LianTongApiDealStrategy = "LianTongApiDealStrategy"; public static final String GuangZhouDXApiDealStrategy = "GuangZhouDXApiDealStrategy"; public static final String HaiNanDXApiDealStrategy = "HaiNanDXApiDealStrategy"; diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/address/AddressAreaController.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/address/AddressAreaController.java index b3a29108a5..de6e644da6 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/address/AddressAreaController.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/address/AddressAreaController.java @@ -4,9 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.haoka.api.ApiFrom; import cn.iocoder.yudao.module.haoka.controller.admin.address.vo.AddressVo; import cn.iocoder.yudao.module.haoka.service.address.HaoKaAddressService; -import cn.iocoder.yudao.module.haoka.service.api.ApiDealResp; -import cn.iocoder.yudao.module.haoka.service.api.OrderApiCreateParam; -import cn.iocoder.yudao.module.haoka.service.api.OrderApiCreateResp; +import cn.iocoder.yudao.module.haoka.service.api.*; import cn.iocoder.yudao.module.haoka.service.api.strategy.LianTongApiDealStrategy; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -22,7 +20,7 @@ import java.util.List; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - 地址") +@Tag(name = "管理后台 -好卡---- 地址") @RestController @RequestMapping("/haoka/address") @Validated @@ -51,13 +49,20 @@ public class AddressAreaController { } @Autowired - @Qualifier(ApiFrom.LianTongApiDealStrategy) - private LianTongApiDealStrategy lianTongApiDealStrategy; + @Qualifier(ApiFrom.ApiDealStrategyImpl) + private ApiDealStrategyService apiDealStrategyService; - @Operation(summary = "联通订单全部流程接口") - @PostMapping("/preOrder") - public CommonResult> proOrder(@RequestBody OrderApiCreateParam param) { - ApiDealResp order = lianTongApiDealStrategy.createOrder(param); + @Operation(summary = "创建订单") + @PostMapping("/createOrder") + public CommonResult> createOrder(@RequestBody OrderApiCreateParam param) { + ApiDealResp order = apiDealStrategyService.createOrder(param); + return success(order); + } + + @Operation(summary = "查询订单") + @PostMapping("/queryOrder") + public CommonResult> queryOrder(@RequestBody OrderApiQueryParam param) { + ApiDealResp order = apiDealStrategyService.queryOrder(param); return success(order); } } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/ApiDealServiceImpl.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/ApiDealServiceImpl.java index 32c7d400d8..5276ca07d1 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/ApiDealServiceImpl.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/ApiDealServiceImpl.java @@ -4,11 +4,12 @@ import cn.iocoder.yudao.module.haoka.api.ApiFrom; import cn.iocoder.yudao.module.haoka.controller.admin.onsaleproduct.vo.OnSaleProductPreOrderRespVO; import cn.iocoder.yudao.module.haoka.service.onsaleproduct.OnSaleProductService; import jakarta.annotation.Resource; +import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import java.util.Map; -@Service +@Component(ApiFrom.ApiDealStrategyImpl) public class ApiDealServiceImpl implements ApiDealStrategyService { @Resource @@ -40,7 +41,7 @@ public class ApiDealServiceImpl implements ApiDealStrategyService { } @Override - public ApiDealResp queryOrder(OrderApiCreateParam param) { + public ApiDealResp queryOrder(OrderApiQueryParam param) { ApiDealStrategy apiDealStrategy = this.getApiDealStrategy(param.getProductId()); if (apiDealStrategy == null) { return new ApiDealResp<>(false, "NoneService", null); diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/ApiDealStrategy.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/ApiDealStrategy.java index d7540d5b04..71f3ecabcb 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/ApiDealStrategy.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/ApiDealStrategy.java @@ -3,5 +3,6 @@ package cn.iocoder.yudao.module.haoka.service.api; public interface ApiDealStrategy { ApiDealResp createOrder(OrderApiCreateParam param); - ApiDealResp queryOrder(OrderApiCreateParam param); + ApiDealResp queryOrder( + OrderApiQueryParam param); } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/OrderApiQueryParam.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/OrderApiQueryParam.java index 21bf8de698..16180f6121 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/OrderApiQueryParam.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/OrderApiQueryParam.java @@ -12,6 +12,8 @@ import lombok.*; @AllArgsConstructor public class OrderApiQueryParam { + private String outerOrderId; + /** * 订单ID AAA */ diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/GuangZhouDxApiDealStrategy.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/GuangZhouDxApiDealStrategy.java index dd6e735132..40195f0dc4 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/GuangZhouDxApiDealStrategy.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/GuangZhouDxApiDealStrategy.java @@ -69,7 +69,7 @@ public class GuangZhouDxApiDealStrategy implements ApiDealStrategy { } @Override - public ApiDealResp queryOrder(OrderApiCreateParam param) { + public ApiDealResp queryOrder(OrderApiQueryParam param) { ApiDealResp result = new ApiDealResp<>(); diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/HaiNanDxApiDealStrategy.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/HaiNanDxApiDealStrategy.java index cf389388a0..39b7ba0bf0 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/HaiNanDxApiDealStrategy.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/HaiNanDxApiDealStrategy.java @@ -76,7 +76,7 @@ public class HaiNanDxApiDealStrategy implements ApiDealStrategy { } @Override - public ApiDealResp queryOrder(OrderApiCreateParam param) { + public ApiDealResp queryOrder( OrderApiQueryParam param) { ApiDealResp result = new ApiDealResp<>(); try { diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/HuNanDxApiDealStrategy.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/HuNanDxApiDealStrategy.java index 7d6676430f..317becd027 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/HuNanDxApiDealStrategy.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/HuNanDxApiDealStrategy.java @@ -78,7 +78,7 @@ public class HuNanDxApiDealStrategy implements ApiDealStrategy { } @Override - public ApiDealResp queryOrder(OrderApiCreateParam param) { + public ApiDealResp queryOrder(OrderApiQueryParam param) { ApiDealResp result = new ApiDealResp<>(); diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/LianTongApiDealStrategy.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/LianTongApiDealStrategy.java index c11919e725..6c42cf17d1 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/LianTongApiDealStrategy.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/LianTongApiDealStrategy.java @@ -140,7 +140,7 @@ public class LianTongApiDealStrategy implements ApiDealStrategy { } @Override - public ApiDealResp queryOrder(OrderApiCreateParam param) { + public ApiDealResp queryOrder(OrderApiQueryParam param) { return null; } }