root/ludu-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
sin 2019-03-07 21:56:25 +08:00
commit f628bac565
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build_order.sh Normal file
View File

@ -0,0 +1 @@
mvn clean package -pl order/order-application -am -DskipTests

1
build_product.sh Normal file
View File

@ -0,0 +1 @@
mvn clean package -pl product/product-application -am -DskipTests

2
product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductCategoryController.java
View File

@ -77,7 +77,7 @@ public class AdminsProductCategoryController {
// 创建商品分类
CommonResult<ProductCategoryBO> result = productCategoryService.addProductCategory(AdminSecurityContextHolder.getContext().getAdminId(), productCategoryAddDTO);
// 返回结果
return ProductCategoryConvert.INSTANCE.convert(result);
return ProductCategoryConvert.INSTANCE.convert2(result);
}
@PostMapping("/update")

5
product/product-application/src/main/java/cn/iocoder/mall/product/application/convert/ProductCategoryConvert.java
View File

@ -19,10 +19,13 @@ public interface ProductCategoryConvert {
@Mappings({})
UsersProductCategoryVO convertToVO(ProductCategoryBO category);
@Mappings({})
List<UsersProductCategoryVO> convertToVO(List<ProductCategoryBO> categoryList);
@Mappings({})
AdminsProductCategoryTreeNodeVO convert(ProductCategoryBO category);
CommonResult<AdminsProductCategoryVO> convert(CommonResult<ProductCategoryBO> result);
@Mappings({})
CommonResult<AdminsProductCategoryVO> convert2(CommonResult<ProductCategoryBO> result);
}

6
product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/ProductAttrConvert.java
View File

@ -30,9 +30,9 @@ public interface ProductAttrConvert {
@Mappings({})
List<ProductAttrSimpleBO> convert3(List<ProductAttrDO> attrs);
// @Mappings({})
// ProductAttrValueSimpleBO convert3(ProductAttrValueDO value);
//
@Mappings({})
ProductAttrValueSimpleBO convert3(ProductAttrValueDO value); // 保证 convert4 能够映射到这个方法
@Mappings({})
List<ProductAttrValueSimpleBO> convert4(List<ProductAttrValueDO> values);