backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: backend:052a6e7e924243a009c351a18ab72c19c2f43065
Branches Tags
backend:main
backend:dev
backend:pre_20251101
backend:20251022
backend:dev2
backend:v1.0.0
..
compare: backend:6fbe11061ffc7c2e4df0c1faafc322b865da7532
Branches Tags
backend:main
backend:dev
backend:pre_20251101
backend:20251022
backend:dev2
backend:v1.0.0

No commits in common. "052a6e7e924243a009c351a18ab72c19c2f43065" and "6fbe11061ffc7c2e4df0c1faafc322b865da7532" have entirely different histories.
052a6e7e92 ... 6fbe11061f

4 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

1
mall-shop/src/main/java/com/suisung/mall/shop/base/controller/admin/ShopBaseProductCategoryController.java
View File

@ -117,7 +117,6 @@ public class ShopBaseProductCategoryController {
oldShopBaseProductCategory.setCategory_order(shopBaseProductCategory.getCategory_order());
}else {
oldShopBaseProductCategory.setCategory_order(shopBaseProductCategory.getCategory_order());
oldShopBaseProductCategory.setCategory_is_enable(shopBaseProductCategory.getCategory_is_enable());
}
return CommonResult.success(shopBaseProductCategoryService.editCategory(oldShopBaseProductCategory));
}

2
mall-shop/src/main/java/com/suisung/mall/shop/base/service/ShopBaseProductCategoryService.java
View File

@ -115,7 +115,7 @@ public interface ShopBaseProductCategoryService extends IBaseService<ShopBasePro
* @param categoryName
* @return
*/
ShopBaseProductCategory getCategoryByName(String categoryName,String storeId);
ShopBaseProductCategory getCategoryByName(String categoryName);
/**
* 根据父类id，分类名称，店铺Id获取一条记录

3
mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductCategoryServiceImpl.java
View File

@ -1141,10 +1141,9 @@ public class ShopBaseProductCategoryServiceImpl extends BaseServiceImpl<ShopBase
* @return
*/
@Override
public ShopBaseProductCategory getCategoryByName(String categoryName,String storeId) {
public ShopBaseProductCategory getCategoryByName(String categoryName) {
QueryWrapper<ShopBaseProductCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("category_name", categoryName);
queryWrapper.eq("store_id", storeId);
queryWrapper.orderByAsc("category_parent_id").orderByAsc("category_order");
List<ShopBaseProductCategory> list = list(queryWrapper);
if (CollUtil.isNotEmpty(list)) {

6
mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncBaseThirdSxAbstract.java
View File

@ -185,7 +185,7 @@ public abstract class SyncBaseThirdSxAbstract{
firstCategoryName=firstCategoryName.replace(forbidCategoryName,"");
}
// TODO storeId 不判断一下吗？
ShopBaseProductCategory cate = productCategoryService.getCategoryByName(firstCategoryName,storeId);
ShopBaseProductCategory cate = productCategoryService.getCategoryByName(firstCategoryName);
if (cate != null) {
list.get(i).setCategory_parent_id(cate.getCategory_id());
} else{
@ -217,7 +217,7 @@ public abstract class SyncBaseThirdSxAbstract{
secondCategoryName=secondCategoryName.replace(forbidCategoryName,"");
}
// TODO storeId 不判断一下吗？
ShopBaseProductCategory cate = productCategoryService.getCategoryByName(secondCategoryName,storeId);
ShopBaseProductCategory cate = productCategoryService.getCategoryByName(secondCategoryName);
if (cate != null) {
list.get(i).setCategory_parent_id(cate.getCategory_id());
} else {
@ -282,7 +282,7 @@ public abstract class SyncBaseThirdSxAbstract{
JSONObject o = (JSONObject) brandListJSON.get(i);
if (o != null && StrUtil.isNotBlank(o.getStr("category"))) {
// category 一般是父分类名
ShopBaseProductCategory cate = productCategoryService.getCategoryByName(o.getStr("category"),storeId);
ShopBaseProductCategory cate = productCategoryService.getCategoryByName(o.getStr("category"));
if (cate != null) {
goodBrandList.get(i).setCategory_id(cate.getCategory_id());
} else {