diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/ProductLimitController.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/ProductLimitController.java index 6eb7417ded..77d0dfc434 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/ProductLimitController.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/ProductLimitController.java @@ -69,7 +69,7 @@ public class ProductLimitController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('haoka:product-limit:query')") public CommonResult getProductLimit(@RequestParam("id") Long id) { - ProductLimitDO productLimit = productLimitService.getProductLimit(id); + ProductLimitRespVO productLimit = productLimitService.getProductLimit(id); return success(BeanUtils.toBean(productLimit, ProductLimitRespVO.class)); } @@ -114,4 +114,4 @@ public class ProductLimitController { return success(productLimitService.getProductLimitCardListByHaokaProductLimitId(haokaProductLimitId)); } -} \ No newline at end of file +} diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitAreaPageReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitAreaPageReqVO.java index 25b9e2bd1d..2f9c19c155 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitAreaPageReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitAreaPageReqVO.java @@ -19,7 +19,7 @@ public class ProductLimitAreaPageReqVO extends PageParam { private Long haokaProductLimitId; @Schema(description = "地区") - private Integer addressCode; + private String addressCode; @Schema(description = "地区", example = "张三") private String addressName; @@ -31,4 +31,4 @@ public class ProductLimitAreaPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; -} \ No newline at end of file +} diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitAreaRespVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitAreaRespVO.java index 42799a03bb..813aa8de52 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitAreaRespVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitAreaRespVO.java @@ -24,7 +24,7 @@ public class ProductLimitAreaRespVO { @Schema(description = "地区", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("地区") - private Integer addressCode; + private String addressCode; @Schema(description = "地区", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") @ExcelProperty("地区") @@ -39,4 +39,4 @@ public class ProductLimitAreaRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; -} \ No newline at end of file +} diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitAreaSaveReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitAreaSaveReqVO.java index 655dc00767..fa3a80fa2a 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitAreaSaveReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitAreaSaveReqVO.java @@ -18,7 +18,7 @@ public class ProductLimitAreaSaveReqVO { @Schema(description = "地区", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "地区不能为空") - private Integer addressCode; + private String addressCode; @Schema(description = "地区", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") @NotEmpty(message = "地区不能为空") @@ -27,4 +27,4 @@ public class ProductLimitAreaSaveReqVO { @Schema(description = "是否允许") private Boolean allowed; -} \ No newline at end of file +} diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitRespVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitRespVO.java index 8af04e2644..f3b79d32cf 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitRespVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/ProductLimitRespVO.java @@ -57,4 +57,6 @@ public class ProductLimitRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; -} \ No newline at end of file + private List productLimitAreaVos; + private List productLimitCardRespVO; +} diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/product/ProductLimitAreaDO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/product/ProductLimitAreaDO.java index 8ea356bfb0..d4aea6ca1f 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/product/ProductLimitAreaDO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/product/ProductLimitAreaDO.java @@ -34,7 +34,7 @@ public class ProductLimitAreaDO extends BaseDO { /** * 地区 */ - private Integer addressCode; + private String addressCode; /** * 地区 */ diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/product/ProductLimitDO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/product/ProductLimitDO.java index 5e1398cf7b..5736a5b7fe 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/product/ProductLimitDO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/product/ProductLimitDO.java @@ -70,4 +70,5 @@ public class ProductLimitDO extends BaseDO { */ private Long deptId; + } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/schedule/HaokaUpdateOrderSchedule.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/schedule/HaokaUpdateOrderSchedule.java index b363dc3c5f..bf419ede71 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/schedule/HaokaUpdateOrderSchedule.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/schedule/HaokaUpdateOrderSchedule.java @@ -9,8 +9,11 @@ import cn.iocoder.yudao.module.haoka.api.ApiFrom; import cn.iocoder.yudao.module.haoka.controller.admin.orders.vo.OrdersPageReqVO; import cn.iocoder.yudao.module.haoka.dal.dataobject.orders.OrdersDO; import cn.iocoder.yudao.module.haoka.service.api.ApiDealStrategyService; +import cn.iocoder.yudao.module.haoka.service.api.models.ApiDealResp; +import cn.iocoder.yudao.module.haoka.service.api.models.OrderApiQueryResp; import cn.iocoder.yudao.module.haoka.service.orders.OrdersService; import com.alibaba.fastjson.JSON; +import com.google.common.collect.Lists; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +51,10 @@ public class HaokaUpdateOrderSchedule { pageNo += 1; pageReqVO.setPageNo(pageNo); pageReqVO.setPageSize(pageSize); + + // 需要更新的订单过滤 todo + // pageReqVO.setStatus(Lists.asList(1)); + PageResult ordersPage = ordersService.getOrdersPage(pageReqVO); total = ordersPage.getTotal(); for (OrdersDO ordersDO : ordersPage.getList()) { @@ -61,7 +68,8 @@ public class HaokaUpdateOrderSchedule { private void updateOrderInfo(final OrdersDO ordersDO) { log.info("更新前--:{}", JSON.toJSONString(ordersDO)); - apiDealStrategyService.updateOrderInfo(ordersDO); + ApiDealResp updateOrderInfo = apiDealStrategyService.getUpdateOrderInfo(ordersDO); + // todo 上游更新 ordersService.updateById(ordersDO); log.info("更新后--:{}", JSON.toJSONString(ordersDO)); } 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 b0c7ce946e..bc861e1ac1 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 @@ -122,56 +122,61 @@ public class ApiDealServiceImpl implements ApiDealStrategyService { } } + // @Override - public void updateOrderInfo(final OrdersDO ordersDO) { + public ApiDealResp getUpdateOrderInfo(final OrdersDO ordersDO) { OrderApiQueryParam param = new OrderApiQueryParam(); + // 幂等 orderId,上游状态,上游备注 + + // + param.setId(ordersDO.getId()); param.setSupplierOrderId(ordersDO.getId().toString()); param.setProductId(ordersDO.getProductId()); param.setPlanMobileProduced(ordersDO.getPlanMobileProduced()); - ApiDealResp resp = this.queryOrder(new SuperiorApiLogSaveReqVO(),param); + return this.queryOrder(new SuperiorApiLogSaveReqVO(),param); - // 上游接口不支持根据订单ID查询 - if (!resp.getIsSupport()) { - return; - } - - // 查询接口是否调用成功 - if (!resp.getSuccess()) { - return; - } - - // 是否被上游拉黑 - if (resp.getIsBlack()) { - - } - - OrderApiQueryResp data = resp.getData(); - if (data == null) { - return; - } - - // 上游对订单状态的描述 - String orderStatusDesc = data.getSupplierOrderStatusDesc(); - if (StringUtils.isNotEmpty(orderStatusDesc)) { - ordersDO.setUpStatus(orderStatusDesc); - } - // 对应好卡的订单状态:Todo - String orderStatusCode = data.getOrderStatusCode(); - if (StringUtils.isNotEmpty(orderStatusCode)) { - // 对应好卡的订单状态:Todo - } - // 物流信息 头都 - String trackingNumber = data.getTrackingNumber(); - if (StringUtils.isNotEmpty(trackingNumber)) { - ordersDO.setTrackingNumber(trackingNumber); - } - String trackingCompany = data.getTrackingCompany(); - if (StringUtils.isNotEmpty(trackingCompany)) { - ordersDO.setTrackingCompany(trackingCompany); - } +// // 上游接口不支持根据订单ID查询 +// if (!resp.getIsSupport()) { +// return; +// } +// +// // 查询接口是否调用成功 +// if (!resp.getSuccess()) { +// return; +// } +// +// // 是否被上游拉黑 +// if (resp.getIsBlack()) { +// +// } +// +// OrderApiQueryResp data = resp.getData(); +// if (data == null) { +// return; +// } +// +// // 上游对订单状态的描述 +// String orderStatusDesc = data.getSupplierOrderStatusDesc(); +// if (StringUtils.isNotEmpty(orderStatusDesc)) { +// ordersDO.setUpStatus(orderStatusDesc); +// } +// // 对应好卡的订单状态:Todo +// String orderStatusCode = data.getOrderStatusCode(); +// if (StringUtils.isNotEmpty(orderStatusCode)) { +// // 对应好卡的订单状态:Todo +// } +// // 物流信息 头都 +// String trackingNumber = data.getTrackingNumber(); +// if (StringUtils.isNotEmpty(trackingNumber)) { +// ordersDO.setTrackingNumber(trackingNumber); +// } +// String trackingCompany = data.getTrackingCompany(); +// if (StringUtils.isNotEmpty(trackingCompany)) { +// ordersDO.setTrackingCompany(trackingCompany); +// } } @Override 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 70b5691c67..f7e0b142d4 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 @@ -26,7 +26,7 @@ public interface ApiDealStrategy { ApiDealResp queryOrder(final SuperiorApiLogSaveReqVO logVO, OrderApiQueryParam param) throws Exception; - default void updateOrderInfo(final OrdersDO ordersDO) { - + default ApiDealResp getUpdateOrderInfo(final OrdersDO ordersDO) { + return ApiDealResp.failed("未处理"); } } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/models/ApiDealResp.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/models/ApiDealResp.java index 864ee626ac..672fb32619 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/models/ApiDealResp.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/models/ApiDealResp.java @@ -10,7 +10,7 @@ public class ApiDealResp { private T data; private Boolean isBlack =false; - private ApiDealResp(Boolean success, String msg, Boolean isSupport, T data) { + public ApiDealResp(Boolean success, String msg, Boolean isSupport, T data) { this.success = success; this.msg = msg; this.isSupport = isSupport; diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/models/OrderApiCreateParam.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/models/OrderApiCreateParam.java index e52c1e1a3f..78c8392f92 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/models/OrderApiCreateParam.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/models/OrderApiCreateParam.java @@ -18,9 +18,7 @@ import java.time.LocalDateTime; @AllArgsConstructor public class OrderApiCreateParam { - private String jsonParam; - - private String outerOrderId; + private String orderCreateParam; /** * 订单ID AAA @@ -29,7 +27,7 @@ public class OrderApiCreateParam { private Long id; /** - * 产品ID AAA + * 产品ID SKU AAA */ private Long productId; @@ -39,6 +37,9 @@ public class OrderApiCreateParam { */ private String planMobile; + /** + * 收获地址 + */ private String addressMobile; /** diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/models/OrderApiCreateResp.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/models/OrderApiCreateResp.java index 868f0b227e..7a5747a085 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/models/OrderApiCreateResp.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/models/OrderApiCreateResp.java @@ -24,7 +24,7 @@ public class OrderApiCreateResp extends BaseDO { /** * 接口数据对象 */ - private Object data; + private String orderCreateResponse; /** * 上游订单ID 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 e25d8a2636..9be5f3a611 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 @@ -90,7 +90,7 @@ public class GuangZhouDxApiDealStrategy implements ApiDealStrategy { OrderApiCreateResp orderApiCreateResp = new OrderApiCreateResp(); orderApiCreateResp.setSupplierOrderId(supplierOrderId); - orderApiCreateResp.setData(supplierOrderId); + orderApiCreateResp.setOrderCreateResponse(supplierOrderId); return ApiDealResp.ok(orderApiCreateResp); } 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 198900ea36..4b55920eea 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 @@ -107,7 +107,7 @@ public class HaiNanDxApiDealStrategy implements ApiDealStrategy { } OrderApiCreateResp orderApiCreateResp = new OrderApiCreateResp(); - orderApiCreateResp.setData(responseInfo); + orderApiCreateResp.setOrderCreateResponse(JSON.toJSONString(responseInfo)); return ApiDealResp.ok(orderApiCreateResp); } catch (UnirestException e) { return ApiDealResp.failed(e.getMessage()); 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 43c6cad3aa..8df4b18ba2 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 @@ -90,8 +90,8 @@ public class HuNanDxApiDealStrategy implements ApiDealStrategy { orderParam.setServiceOrderReceiverDistrictCode(addressDistrict.getName()); orderParam.setServiceOrderReceiverAddress(param.getAddress()); - if (StringUtils.isNotEmpty(param.getJsonParam())) { - JSONObject objectParam = JSON.parseObject(param.getJsonParam()); + if (StringUtils.isNotEmpty(param.getOrderCreateParam())) { + JSONObject objectParam = JSON.parseObject(param.getOrderCreateParam()); possessParam.setNumberId(objectParam.getString("numberId")); possessParam.setPoolId(objectParam.getString("poolId")); } @@ -191,7 +191,7 @@ public class HuNanDxApiDealStrategy implements ApiDealStrategy { OrderApiCreateResp orderApiCreateResp = new OrderApiCreateResp(); - orderApiCreateResp.setData(responseInfo); + orderApiCreateResp.setOrderCreateResponse(JSON.toJSONString(responseInfo)); orderApiCreateResp.setSupplierOrderId(param.getId().toString()); return ApiDealResp.ok(orderApiCreateResp); 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 8371cc5dd2..18f31cf02f 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 @@ -190,7 +190,7 @@ public class LianTongApiDealStrategy implements ApiDealStrategy { } OrderApiCreateResp orderApiCreateResp = new OrderApiCreateResp(); - orderApiCreateResp.setData(response); + orderApiCreateResp.setOrderCreateResponse(JSON.toJSONString(response)); return ApiDealResp.ok(orderApiCreateResp); } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java index ccd6d36269..5ddcf1a76e 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java @@ -38,8 +38,11 @@ public class OrdersServiceImpl extends ServiceImpl implem @Qualifier(ApiFrom.ApiDealStrategyImpl) private ApiDealStrategyService apiDealStrategyService; + // 19547688 -> 电信 19547688 湖南电信,:号码+号码ID @Override public Long createOrders(OrdersSaveReqVO createReqVO) { + // orderCreateParam='{号码ID:1666666}' + // createReqVO.getOrderCreateParam(); // 插入 OrdersDO orders = BeanUtils.toBean(createReqVO, OrdersDO.class); orders.setId(SnowflakeId.generate()); @@ -82,7 +85,22 @@ public class OrdersServiceImpl extends ServiceImpl implem ApiDealResp order = apiDealStrategyService.createOrder(null); OrderApiCreateParam param = new OrderApiCreateParam(); BeanUtils.copyProperties(ordersDO,param); - apiDealStrategyService.createOrder(param); + ApiDealResp orderResponse = apiDealStrategyService.createOrder(param); + // 是否是是上游黑名单 如果是 存本地黑名单 + Boolean isBlack = orderResponse.getIsBlack(); + // 上游是否支持这个接口 + // Boolean isSupport = orderResponse.getIsSupport(); 都支持创建订单的 查询不一定 + // 成功? + Boolean success = orderResponse.getSuccess(); + // 响应信息 + String msg = orderResponse.getMsg(); + // 订单创结果 + OrderApiCreateResp orderData = orderResponse.getData(); + // 上游订单ID + orderData.getSupplierOrderId(); + + // ordersDO 记录 create param 和 响应信息 + } } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/product/ProductLimitService.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/product/ProductLimitService.java index 18bbc7c002..8344bcab78 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/product/ProductLimitService.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/product/ProductLimitService.java @@ -44,7 +44,7 @@ public interface ProductLimitService { * @param id 编号 * @return 产品限制条件 */ - ProductLimitDO getProductLimit(Long id); + ProductLimitRespVO getProductLimit(Long id); /** * 获得产品限制条件分页 @@ -74,4 +74,4 @@ public interface ProductLimitService { */ List getProductLimitCardListByHaokaProductLimitId(Long haokaProductLimitId); -} \ No newline at end of file +} diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/product/ProductLimitServiceImpl.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/product/ProductLimitServiceImpl.java index 03f76876af..4da608036b 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/product/ProductLimitServiceImpl.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/product/ProductLimitServiceImpl.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.haoka.service.product; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; import java.util.*; + import cn.iocoder.yudao.module.haoka.controller.admin.product.vo.*; import cn.iocoder.yudao.module.haoka.dal.dataobject.product.ProductLimitDO; import cn.iocoder.yudao.module.haoka.dal.dataobject.product.ProductLimitAreaDO; @@ -85,8 +87,26 @@ public class ProductLimitServiceImpl implements ProductLimitService { } @Override - public ProductLimitDO getProductLimit(Long id) { - return productLimitMapper.selectById(id); + public ProductLimitRespVO getProductLimit(Long id) { + ProductLimitDO productLimitDO = productLimitMapper.selectById(id); + + if (productLimitDO == null) { + return null; + } + ProductLimitRespVO bean = BeanUtils.toBean(productLimitDO, ProductLimitRespVO.class); + List productLimitAreaDOS = productLimitAreaMapper.selectList(new LambdaQueryWrapperX() + .eqIfPresent(ProductLimitAreaDO::getHaokaProductLimitId, id) + ); + bean.setProductLimitAreaVos(BeanUtils.toBean(productLimitAreaDOS,ProductLimitAreaRespVO.class)); + + + List productLimitCard = productLimitCardMapper.selectList(new LambdaQueryWrapperX() + .eqIfPresent(ProductLimitCardDO::getHaokaProductLimitId, id) + ); + bean.setProductLimitCardRespVO(BeanUtils.toBean(productLimitCard,ProductLimitCardRespVO.class)); + + + return bean; } @Override @@ -108,7 +128,7 @@ public class ProductLimitServiceImpl implements ProductLimitService { private void updateProductLimitAreaList(Long haokaProductLimitId, List list) { deleteProductLimitAreaByHaokaProductLimitId(haokaProductLimitId); - list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下:1)id 冲突;2)updateTime 不更新 + list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下:1)id 冲突;2)updateTime 不更新 createProductLimitAreaList(haokaProductLimitId, list); } @@ -130,7 +150,7 @@ public class ProductLimitServiceImpl implements ProductLimitService { private void updateProductLimitCardList(Long haokaProductLimitId, List list) { deleteProductLimitCardByHaokaProductLimitId(haokaProductLimitId); - list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下:1)id 冲突;2)updateTime 不更新 + list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下:1)id 冲突;2)updateTime 不更新 createProductLimitCardList(haokaProductLimitId, list); } @@ -138,4 +158,4 @@ public class ProductLimitServiceImpl implements ProductLimitService { productLimitCardMapper.deleteByHaokaProductLimitId(haokaProductLimitId); } -} \ No newline at end of file +} diff --git a/yudao-server/src/main/resources/db/migration/V3.0.17__alter_product_belongType.sql b/yudao-server/src/main/resources/db/migration/V3.0.17__alter_product_belongType.sql index b3a5ebf1f6..7b8bc28dc9 100644 --- a/yudao-server/src/main/resources/db/migration/V3.0.17__alter_product_belongType.sql +++ b/yudao-server/src/main/resources/db/migration/V3.0.17__alter_product_belongType.sql @@ -1,2 +1,2 @@ -ALTER TABLE `haoka_dev`.`haoka_product` +ALTER TABLE `haoka_product` MODIFY COLUMN `belong_area_code` varchar(64) NOT NULL COMMENT '归属地' AFTER `haoka_product_type_id`; diff --git a/yudao-server/src/main/resources/db/migration/V3.0.21__alter_product_limit_area.sql b/yudao-server/src/main/resources/db/migration/V3.0.21__alter_product_limit_area.sql new file mode 100644 index 0000000000..3df5ac69cf --- /dev/null +++ b/yudao-server/src/main/resources/db/migration/V3.0.21__alter_product_limit_area.sql @@ -0,0 +1,2 @@ +ALTER TABLE `haoka_product_limit_area` + MODIFY COLUMN `address_code` varchar(128) NOT NULL COMMENT '地区' AFTER `haoka_product_limit_id`;