zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

物流管理修改

pull/2/head
js199000131 2023-05-10 17:52:53 +08:00
parent 82f18fb9d1
commit 53f9f8087e
15 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesDO.java
View File

@ -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;
}

6
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesFreeDO.java
View File

@ -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;
}

6
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesRegionDO.java
View File

@ -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;
}

2
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesFreeMapper.java
View File

@ -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 <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Mapper
public interface ShippingTemplatesFreeMapper extends BaseMapperX<ShippingTemplatesFreeDO> {
List<ShippingTemplatesFreeRespVO> getListGroup(Integer tempId);

2
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesMapper.java
View File

@ -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 <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Mapper
public interface ShippingTemplatesMapper extends BaseMapperX<ShippingTemplatesDO> {
}

2
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesNoDeliveryMapper.java
View File

@ -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 <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Mapper
public interface ShippingTemplatesNoDeliveryMapper extends BaseMapperX<ShippingTemplatesNoDeliveryDO> {
List<ShippingTemplatesNoDeliveryRespVO> getList(Integer tempId);

2
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/express/ShippingTemplatesRegionMapper.java
View File

@ -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 <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Mapper
public interface ShippingTemplatesRegionMapper extends BaseMapperX<ShippingTemplatesRegionDO> {
List<ShippingTemplatesRegionRespVO> getListGroup(Integer tempId);

4
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesFreeService.java
View File

@ -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 <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Service
@Validated
public interface ShippingTemplatesFreeService extends IService<ShippingTemplatesFreeDO> {
void saveAll(List<ShippingTemplatesFreeRespVO> shippingTemplatesFreeRespVOList, Integer type, Integer id);

5
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesNoDeliveryService.java
View File

@ -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 <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Service
@Validated
public interface ShippingTemplatesNoDeliveryService extends IService<ShippingTemplatesNoDeliveryDO> {
void saveAll(List<ShippingTemplatesNoDeliveryRespVO> shippingTemplatesFreeRespVOList, Integer id);

4
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesNoDeliveryServiceImpl.java
View File

@ -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<ShippingTemplatesNoDeliveryMapper, ShippingTemplatesNoDeliveryDO> implements ShippingTemplatesNoDeliveryService {
@Resource

5
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesRegionService.java
View File

@ -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 <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Service
@Validated
public interface ShippingTemplatesRegionService extends IService<ShippingTemplatesRegionDO> {
void saveAll(List<ShippingTemplatesRegionRespVO> shippingTemplatesRegionRespVOList, Integer type, Integer id);

5
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/express/ShippingTemplatesService.java
View File

@ -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 <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Service
@Validated
public interface ShippingTemplatesService extends IService<ShippingTemplatesDO> {
PageResult<ShippingTemplatesDO> getList(ShippingTemplatesSearchReqVO request);

2
yudao-module-mall/yudao-module-product-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml
View File

@ -3,6 +3,6 @@
<mapper namespace="cn.iocoder.yudao.module.product.dal.mysql.express.ShippingTemplatesNoDeliveryMapper">
<select id="getList" resultType="cn.iocoder.yudao.module.product.controller.admin.express.vo.ShippingTemplatesNoDeliveryRespVO" parameterType="integer">
SELECT id, group_concat(`city_id`) AS city_id, temp_id, province_idFROM eb_shipping_templates_free where temp_id = #{tempId, jdbcType=INTEGER} ORDER BY id ASC
SELECT group_concat(`city_id`) AS city_id, temp_id FROM eb_shipping_templates_no_delivery where temp_id = #{tempId, jdbcType=INTEGER} ORDER BY id ASC
</select>
</mapper>

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ip/AreaService.java
View File

@ -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<AreaNodeRespVO> getAreaTree();

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ip/AreaServiceImpl.java
View File

@ -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{
/**