From dece26fce76ee8a235e82649b49d249d637e80f1 Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Fri, 12 May 2023 19:04:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../express/vo/ShippingTemplatesFreeRespVO.java | 3 +++ .../vo/ShippingTemplatesNoDeliveryRespVO.java | 5 +++++ .../express/vo/ShippingTemplatesRegionRespVO.java | 2 ++ .../admin/express/vo/ShippingTemplatesReqVO.java | 6 +++++- .../dal/dataobject/express/ShippingTemplatesDO.java | 5 +++++ .../dataobject/express/ShippingTemplatesFreeDO.java | 2 ++ .../express/ShippingTemplatesNoDeliveryDO.java | 6 ++---- .../express/ShippingTemplatesRegionDO.java | 3 +++ .../service/order/impl/StoreOrderServiceImpl.java | 8 ++++---- .../product/impl/StoreProductServiceImpl.java | 2 +- .../shop/utils/{OrderUtils.java => OrderUtil.java} | 5 +++-- yudao-server/src/main/resources/application.yaml | 13 +++++++++++-- .../test/java/cn/iocoder/yudao/ProjectReactor.java | 2 +- yudao-ui-admin/.env.dev | 2 +- yudao-ui-admin/.env.front | 2 +- yudao-ui-admin/.env.local | 2 +- yudao-ui-admin/.env.prod | 2 +- yudao-ui-admin/.env.stage | 2 +- yudao-ui-admin/.env.static | 2 +- yudao-ui-admin/package.json | 4 ++-- .../src/layout/components/Sidebar/Logo.vue | 2 +- yudao-ui-admin/vue.config.js | 2 +- 22 files changed, 57 insertions(+), 25 deletions(-) rename yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/{OrderUtils.java => OrderUtil.java} (97%) diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesFreeRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesFreeRespVO.java index dd71eb8d6..3ef71cc89 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesFreeRespVO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesFreeRespVO.java @@ -36,6 +36,9 @@ public class ShippingTemplatesFreeRespVO implements Serializable { @NotNull(message = "请选择城市") private String cityId; + @Schema(description = "省ID, 多个逗号分割。 全国 all", required = true, example = "1,2,3,4") + private String provinceId; + @Schema(description = "城市名称描述") private String title; diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesNoDeliveryRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesNoDeliveryRespVO.java index e9115e619..347193cf1 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesNoDeliveryRespVO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesNoDeliveryRespVO.java @@ -33,4 +33,9 @@ public class ShippingTemplatesNoDeliveryRespVO implements Serializable { @Schema(description = "城市ID, 多个逗号分割。 全国 all", required = true, example = "1,2,3,4") @NotNull(message = "请选择城市") private String cityId; + + + + @Schema(description = "省ID, 多个逗号分割。 全国 all", required = true, example = "1,2,3,4") + private String provinceId; } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesRegionRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesRegionRespVO.java index 53cc84021..f3e84ea54 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesRegionRespVO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesRegionRespVO.java @@ -36,6 +36,8 @@ public class ShippingTemplatesRegionRespVO implements Serializable { @NotNull(message = "请选择城市") private String cityId; + @Schema(description = "省ID, 多个逗号分割。 全国 all", required = true, example = "1,2,3,4") + private String provinceId; @Schema(description = "城市名称描述") private String title; diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesReqVO.java index 9f2ac2c6b..336e81329 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesReqVO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/express/vo/ShippingTemplatesReqVO.java @@ -55,7 +55,11 @@ public class ShippingTemplatesReqVO implements Serializable { @Schema(description = "指定包邮设置", required = true) private List shippingTemplatesFreeRespVOList; - @Schema(description = "指定不包邮设置", required = true) + + @Schema(description = "指定不送", example = "1", required = true) + private Boolean noDelivery; + + @Schema(description = "指定不送设置", required = true) private List shippingTemplatesNoDeliveryRespVOS; @Schema(description = "排序", example = "0") diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesDO.java index f3eb3cb40..8f3bba26c 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesDO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesDO.java @@ -45,6 +45,11 @@ public class ShippingTemplatesDO extends TenantBaseDO { *指定包邮 */ private Boolean appoint; + /** + *指定不送 + */ + private Boolean noDelivery; + /** *排序 diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesFreeDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesFreeDO.java index 7e1a1774d..f340db926 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesFreeDO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesFreeDO.java @@ -38,6 +38,8 @@ public class ShippingTemplatesFreeDO implements Serializable { */ private Integer tempId; + + private Integer provinceId; /** *城市ID */ diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java index abab1d519..913fe581f 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java @@ -42,10 +42,8 @@ public class ShippingTemplatesNoDeliveryDO implements Serializable { */ private Integer cityId; - /** - *省份ID - */ - private Integer province_id; + + private Integer provinceId; } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesRegionDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesRegionDO.java index 231ee968c..b231cc684 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesRegionDO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesRegionDO.java @@ -43,6 +43,9 @@ public class ShippingTemplatesRegionDO implements Serializable { */ private Integer cityId; + + private Integer provinceId; + /** *描述 */ diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java index c00206032..29cba6ae6 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java @@ -23,7 +23,7 @@ import cn.iocoder.yudao.module.shop.service.order.StoreOrderRefundService; import cn.iocoder.yudao.module.shop.service.order.StoreOrderService; import cn.iocoder.yudao.module.shop.service.order.StoreOrderStatusService; import cn.iocoder.yudao.module.shop.utils.CommonPage; -import cn.iocoder.yudao.module.shop.utils.OrderUtils; +import cn.iocoder.yudao.module.shop.utils.OrderUtil; import cn.iocoder.yudao.module.shop.utils.RedisUtil; import cn.iocoder.yudao.module.shop.vo.order.LogisticsResultVo; import cn.iocoder.yudao.module.shop.vo.order.StoreDateRangeSqlPram; @@ -81,7 +81,7 @@ public class StoreOrderServiceImpl extends ServiceImpl getUserOrderList(Integer uid, Integer status, PageParam pageParamRequest) { PageHelper.startPage(pageParamRequest.getPageNo(), pageParamRequest.getPageSize()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - orderUtils.statusApiByWhere(lqw, status); + orderUtil.statusApiByWhere(lqw, status); lqw.eq(StoreOrder::getUid, uid); lqw.orderByDesc(StoreOrder::getId); return mapper.selectList(lqw); @@ -204,7 +204,7 @@ public class StoreOrderServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); - orderUtils.statusApiByWhere(lqw, status); + orderUtil.statusApiByWhere(lqw, status); lqw.eq(StoreOrder::getUid,userId); return mapper.selectCount(lqw); } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/product/impl/StoreProductServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/product/impl/StoreProductServiceImpl.java index f3913f00f..e4e4188ee 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/product/impl/StoreProductServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/product/impl/StoreProductServiceImpl.java @@ -92,7 +92,7 @@ public class StoreProductServiceImpl extends ServiceImpl