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

Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

pull/16/head
TianYu 2023-05-25 17:00:25 +08:00
parent 56c8e53fa0 51581f66a6
commit 355f823192
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java
View File

@ -96,6 +96,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
shippingTemplatesDO.setSort(request.getSort()); shippingTemplatesDO.setSort(request.getSort());
shippingTemplatesDO.setType(request.getType()); shippingTemplatesDO.setType(request.getType());
shippingTemplatesDO.setDeleted(false); shippingTemplatesDO.setDeleted(false);
shippingTemplatesDO.setNoDelivery(request.getNoDelivery());
shippingTemplatesDO.setAppoint(request.getAppoint()); shippingTemplatesDO.setAppoint(request.getAppoint());
save(shippingTemplatesDO); save(shippingTemplatesDO);
@ -110,7 +111,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
} }
ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO = request.getShippingTemplatesNoDeliveryRespVOS(); ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO = request.getShippingTemplatesNoDeliveryRespVOS();
if(!ObjectUtil.isNull(shippingTemplatesNoDeliveryRespVO)){ if(!ObjectUtil.isNull(shippingTemplatesNoDeliveryRespVO) && request.getNoDelivery()){
shippingTemplatesNoDeliveryService.saveAll(shippingTemplatesNoDeliveryRespVO, shippingTemplatesDO.getId()); shippingTemplatesNoDeliveryService.saveAll(shippingTemplatesNoDeliveryRespVO, shippingTemplatesDO.getId());
} }
@ -140,7 +141,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
} }
/** /**
* 新增 * 修改
* @param id Integer 模板id * @param id Integer 模板id
* @param request ShippingTemplatesRequest 新增参数 * @param request ShippingTemplatesRequest 新增参数
*/ */
@ -152,6 +153,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
shippingTemplatesDO.setSort(request.getSort()); shippingTemplatesDO.setSort(request.getSort());
shippingTemplatesDO.setType(request.getType()); shippingTemplatesDO.setType(request.getType());
shippingTemplatesDO.setAppoint(request.getAppoint()); shippingTemplatesDO.setAppoint(request.getAppoint());
shippingTemplatesDO.setNoDelivery(request.getNoDelivery());
updateById(shippingTemplatesDO); updateById(shippingTemplatesDO);
@ -166,7 +168,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
List<ShippingTemplatesFreeRespVO> shippingTemplatesFreeRespVOList = request.getShippingTemplatesFreeRespVOList(); List<ShippingTemplatesFreeRespVO> shippingTemplatesFreeRespVOList = request.getShippingTemplatesFreeRespVOList();
if(CollUtil.isNotEmpty(shippingTemplatesFreeRespVOList) && request.getAppoint()){ if(CollUtil.isNotEmpty(shippingTemplatesFreeRespVOList) && request.getAppoint()){
shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRespVOList, request.getType(), shippingTemplatesDO.getId()); shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRespVOList, request.getType(), id);
} }
ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO= request.getShippingTemplatesNoDeliveryRespVOS(); ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO= request.getShippingTemplatesNoDeliveryRespVOS();
if(ObjectUtil.isNotNull(shippingTemplatesNoDeliveryRespVO)){ if(ObjectUtil.isNotNull(shippingTemplatesNoDeliveryRespVO)){