cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.dayouqiantu.cn/yshopb2c/yshop

Browse Source
This commit is contained in:
hupeng
2020-08-10 10:21:00 +08:00
parent 66131cfccb e49ded0d2b
commit 2b20c343ae
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
View File

@ -21,6 +21,7 @@ import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.constant.ShopConstants; import co.yixiang.constant.ShopConstants;
import co.yixiang.dozer.service.IGenerator; import co.yixiang.dozer.service.IGenerator;
import co.yixiang.enums.*; import co.yixiang.enums.*;
import co.yixiang.exception.BadRequestException;
import co.yixiang.exception.ErrorRequestException; import co.yixiang.exception.ErrorRequestException;
import co.yixiang.modules.category.service.YxStoreCategoryService; import co.yixiang.modules.category.service.YxStoreCategoryService;
import co.yixiang.modules.product.domain.YxStoreProduct; import co.yixiang.modules.product.domain.YxStoreProduct;
@ -34,6 +35,7 @@ import co.yixiang.modules.product.vo.YxStoreProductAttrQueryVo;
import co.yixiang.modules.product.vo.YxStoreProductQueryVo; import co.yixiang.modules.product.vo.YxStoreProductQueryVo;
import co.yixiang.modules.product.vo.YxStoreProductReplyQueryVo; import co.yixiang.modules.product.vo.YxStoreProductReplyQueryVo;
import co.yixiang.modules.shop.service.YxSystemStoreService; import co.yixiang.modules.shop.service.YxSystemStoreService;
import co.yixiang.modules.template.domain.YxShippingTemplates;
import co.yixiang.modules.template.service.YxShippingTemplatesService; import co.yixiang.modules.template.service.YxShippingTemplatesService;
import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.utils.FileUtil; import co.yixiang.utils.FileUtil;
@ -275,7 +277,13 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
|| Integer.valueOf(storeFreePostage) == 0){ || Integer.valueOf(storeFreePostage) == 0){
tempName = "全国包邮"; tempName = "全国包邮";
}else{ }else{
tempName = shippingTemplatesService.getById(storeProduct.getTempId()).getName(); YxShippingTemplates shippingTemplates = shippingTemplatesService.getById(storeProduct.getTempId());
if(ObjectUtil.isNotNull(shippingTemplates)){
tempName = shippingTemplates.getName();
}else {
throw new BadRequestException("请配置运费模板");
}
} }
productVo.setTempName(tempName); productVo.setTempName(tempName);

10
yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java
View File

@ -11,7 +11,10 @@ import java.util.Arrays;
import co.yixiang.constant.ShopConstants; import co.yixiang.constant.ShopConstants;
import co.yixiang.dozer.service.IGenerator; import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.aop.ForbidSubmit;
import co.yixiang.modules.product.domain.YxStoreProduct;
import co.yixiang.modules.product.service.YxStoreProductService;
import co.yixiang.modules.template.domain.YxShippingTemplates; import co.yixiang.modules.template.domain.YxShippingTemplates;
import co.yixiang.modules.template.domain.YxSystemCity; import co.yixiang.modules.template.domain.YxSystemCity;
import co.yixiang.modules.template.service.YxShippingTemplatesService; import co.yixiang.modules.template.service.YxShippingTemplatesService;
@ -47,6 +50,7 @@ public class ShippingTemplatesController {
private final YxShippingTemplatesService yxShippingTemplatesService; private final YxShippingTemplatesService yxShippingTemplatesService;
private final YxSystemCityService yxSystemCityService; private final YxSystemCityService yxSystemCityService;
private final IGenerator generator; private final IGenerator generator;
private final YxStoreProductService yxStoreProductService;
@Log("导出数据") @Log("导出数据")
@ -83,7 +87,13 @@ public class ShippingTemplatesController {
@PreAuthorize("@el.check('admin','yxShippingTemplates:del')") @PreAuthorize("@el.check('admin','yxShippingTemplates:del')")
@DeleteMapping @DeleteMapping
public ResponseEntity<Object> deleteAll(@RequestBody Integer[] ids) { public ResponseEntity<Object> deleteAll(@RequestBody Integer[] ids) {
List<YxStoreProduct> productList = yxStoreProductService.list();
Arrays.asList(ids).forEach(id->{ Arrays.asList(ids).forEach(id->{
for (YxStoreProduct yxStoreProduct : productList) {
if(id==yxStoreProduct.getTempId()){
throw new BadRequestException("运费模板存在商品关联，请删除对应商品");
}
}
yxShippingTemplatesService.removeById(id); yxShippingTemplatesService.removeById(id);
}); });
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);