From 53f9f8087ef6791c661ea9ed083bb3da5ee34507 Mon Sep 17 00:00:00 2001 From: js199000131 <2728757160@qq.com> Date: Wed, 10 May 2023 17:52:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/dal/dataobject/express/ShippingTemplatesDO.java | 6 +++--- .../dal/dataobject/express/ShippingTemplatesFreeDO.java | 6 +++--- .../dal/dataobject/express/ShippingTemplatesRegionDO.java | 6 +++--- .../dal/mysql/express/ShippingTemplatesFreeMapper.java | 2 ++ .../product/dal/mysql/express/ShippingTemplatesMapper.java | 2 ++ .../mysql/express/ShippingTemplatesNoDeliveryMapper.java | 2 ++ .../dal/mysql/express/ShippingTemplatesRegionMapper.java | 2 ++ .../service/express/ShippingTemplatesFreeService.java | 4 ++++ .../service/express/ShippingTemplatesNoDeliveryService.java | 5 +++++ .../express/ShippingTemplatesNoDeliveryServiceImpl.java | 4 ++++ .../service/express/ShippingTemplatesRegionService.java | 5 +++++ .../product/service/express/ShippingTemplatesService.java | 5 +++++ .../mapper/express/ShippingTemplatesNoDeliveryMapper.xml | 2 +- .../iocoder/yudao/module/system/service/ip/AreaService.java | 4 ++++ .../yudao/module/system/service/ip/AreaServiceImpl.java | 2 ++ 15 files changed, 47 insertions(+), 10 deletions(-) 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 3f13e0570..b4dd011dc 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 @@ -8,7 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.util.Date; +import java.time.LocalDateTime; /** * 运费模版对象 @@ -56,12 +56,12 @@ public class ShippingTemplatesDO extends TenantBaseDO { /** *创建时间 */ - private Date createTime; + private LocalDateTime createTime; /** *修改时间 */ - private Date updateTime; + private LocalDateTime updateTime; } 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 929b6bcb0..35a5a46a0 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 @@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDateTime; /** * 免费运费模版 @@ -77,12 +77,12 @@ public class ShippingTemplatesFreeDO extends TenantBaseDO { /** *创建时间 */ - private Date createTime; + private LocalDateTime createTime; /** *修改时间 */ - private Date updateTime; + private LocalDateTime updateTime; } 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 7fcc9e268..ed81bd5c8 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 @@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDateTime; /** * 运费模版区域 @@ -87,12 +87,12 @@ public class ShippingTemplatesRegionDO extends TenantBaseDO { /** *创建时间 */ - private Date createTime; + private LocalDateTime createTime; /** *修改时间 */ - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesFreeMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesFreeMapper.java index 9c081fd10..e1ca02dd8 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesFreeMapper.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesFreeMapper.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.product.dal.mysql.express; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.product.controller.admin.express.vo.ShippingTemplatesFreeRespVO; import cn.iocoder.yudao.module.product.dal.dataobject.express.ShippingTemplatesFreeDO; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -18,6 +19,7 @@ import java.util.List; * | Author: CRMEB Team * +---------------------------------------------------------------------- */ +@Mapper public interface ShippingTemplatesFreeMapper extends BaseMapperX { List getListGroup(Integer tempId); diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesMapper.java index 655ecfd4a..00439abd3 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesMapper.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesMapper.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.product.dal.mysql.express; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.product.dal.dataobject.express.ShippingTemplatesDO; +import org.apache.ibatis.annotations.Mapper; /** * Mapper 接口 @@ -15,6 +16,7 @@ import cn.iocoder.yudao.module.product.dal.dataobject.express.ShippingTemplatesD * | Author: CRMEB Team * +---------------------------------------------------------------------- */ +@Mapper public interface ShippingTemplatesMapper extends BaseMapperX { } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesNoDeliveryMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesNoDeliveryMapper.java index 5eca077c6..cfb7ceb67 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesNoDeliveryMapper.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesNoDeliveryMapper.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.product.dal.mysql.express; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.product.controller.admin.express.vo.ShippingTemplatesNoDeliveryRespVO; import cn.iocoder.yudao.module.product.dal.dataobject.express.ShippingTemplatesNoDeliveryDO; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -18,6 +19,7 @@ import java.util.List; * | Author: CRMEB Team * +---------------------------------------------------------------------- */ +@Mapper public interface ShippingTemplatesNoDeliveryMapper extends BaseMapperX { List getList(Integer tempId); diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesRegionMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesRegionMapper.java index 03daafa81..4c59c6d33 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesRegionMapper.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesRegionMapper.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.product.dal.mysql.express; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.product.controller.admin.express.vo.ShippingTemplatesRegionRespVO; import cn.iocoder.yudao.module.product.dal.dataobject.express.ShippingTemplatesRegionDO; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -18,6 +19,7 @@ import java.util.List; * | Author: CRMEB Team * +---------------------------------------------------------------------- */ +@Mapper public interface ShippingTemplatesRegionMapper extends BaseMapperX { List getListGroup(Integer tempId); diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesFreeService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesFreeService.java index 73bb55af1..5a206efc2 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesFreeService.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesFreeService.java @@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.product.service.express; import cn.iocoder.yudao.module.product.controller.admin.express.vo.ShippingTemplatesFreeRespVO; import cn.iocoder.yudao.module.product.dal.dataobject.express.ShippingTemplatesFreeDO; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; import java.util.List; @@ -18,6 +20,8 @@ import java.util.List; * | Author: CRMEB Team * +---------------------------------------------------------------------- */ +@Service +@Validated public interface ShippingTemplatesFreeService extends IService { void saveAll(List shippingTemplatesFreeRespVOList, Integer type, Integer id); diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesNoDeliveryService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesNoDeliveryService.java index 63e3e3a58..ad1d5344d 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesNoDeliveryService.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesNoDeliveryService.java @@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.product.service.express; import cn.iocoder.yudao.module.product.controller.admin.express.vo.ShippingTemplatesNoDeliveryRespVO; import cn.iocoder.yudao.module.product.dal.dataobject.express.ShippingTemplatesNoDeliveryDO; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; import java.util.List; @@ -18,6 +20,9 @@ import java.util.List; * | Author: CRMEB Team * +---------------------------------------------------------------------- */ + +@Service +@Validated public interface ShippingTemplatesNoDeliveryService extends IService { void saveAll(List shippingTemplatesFreeRespVOList, Integer id); diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesNoDeliveryServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesNoDeliveryServiceImpl.java index dc361c5d1..c9d887826 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesNoDeliveryServiceImpl.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesNoDeliveryServiceImpl.java @@ -9,12 +9,16 @@ import cn.iocoder.yudao.module.system.service.ip.AreaService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +@Service +@Validated public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl implements ShippingTemplatesNoDeliveryService { @Resource diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesRegionService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesRegionService.java index e6f20488f..643dbbf57 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesRegionService.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesRegionService.java @@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.product.service.express; import cn.iocoder.yudao.module.product.controller.admin.express.vo.ShippingTemplatesRegionRespVO; import cn.iocoder.yudao.module.product.dal.dataobject.express.ShippingTemplatesRegionDO; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; import java.util.List; @@ -18,6 +20,9 @@ import java.util.List; * | Author: CRMEB Team * +---------------------------------------------------------------------- */ + +@Service +@Validated public interface ShippingTemplatesRegionService extends IService { void saveAll(List shippingTemplatesRegionRespVOList, Integer type, Integer id); diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesService.java index 7b8b5bea8..3c5cd4e5a 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesService.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesService.java @@ -5,6 +5,8 @@ import cn.iocoder.yudao.module.product.controller.admin.express.vo.ShippingTempl import cn.iocoder.yudao.module.product.controller.admin.express.vo.ShippingTemplatesSearchReqVO; import cn.iocoder.yudao.module.product.dal.dataobject.express.ShippingTemplatesDO; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; /** * ShippingTemplatesService 接口 @@ -18,6 +20,9 @@ import com.baomidou.mybatisplus.extension.service.IService; * | Author: CRMEB Team * +---------------------------------------------------------------------- */ + +@Service +@Validated public interface ShippingTemplatesService extends IService { PageResult getList(ShippingTemplatesSearchReqVO request); diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml b/yudao-module-mall/yudao-module-product-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml index 1e2374f80..364a3aaee 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml +++ b/yudao-module-mall/yudao-module-product-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml @@ -3,6 +3,6 @@ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ip/AreaService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ip/AreaService.java index 3dca50d31..45391cad1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ip/AreaService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ip/AreaService.java @@ -1,9 +1,13 @@ package cn.iocoder.yudao.module.system.service.ip; import cn.iocoder.yudao.module.system.controller.admin.ip.vo.AreaNodeRespVO; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; import java.util.List; +@Service +@Validated public interface AreaService { List getAreaTree(); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ip/AreaServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ip/AreaServiceImpl.java index bf2ab8a9a..47fb5380f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ip/AreaServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ip/AreaServiceImpl.java @@ -5,9 +5,11 @@ import cn.iocoder.yudao.framework.ip.core.Area; import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils; import cn.iocoder.yudao.module.system.controller.admin.ip.vo.AreaNodeRespVO; import cn.iocoder.yudao.module.system.convert.ip.AreaConvert; +import org.springframework.stereotype.Service; import java.util.List; +@Service public class AreaServiceImpl implements AreaService{ /**