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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Jack 2025-05-30 01:35:27 +08:00
commit db591b9ecd
7 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/main/java/com/small/client/controller/WebController.java
View File

@ -28,7 +28,7 @@ public class WebController {
@RequestMapping("/synBrand") @RequestMapping("/synBrand")
public void synBrand(){ public void synBrand(){
log.info("synBrand"); log.info("synBrand");
sxDataService.getAppSign(); // sxDataService.getAppSign();
sxDataService.SyncBranchList(new DataBaseInfo(),sxDataService.getCommentModel()); sxDataService.SyncBranchList(new DataBaseInfo(),sxDataService.getCommentModel());
} }
@ -36,21 +36,21 @@ public class WebController {
@RequestMapping("/syncCategory") @RequestMapping("/syncCategory")
public void syncCategory(){ public void syncCategory(){
log.info("syncCategory"); log.info("syncCategory");
sxDataService.getAppSign(); //sxDataService.getAppSign();
sxDataService.SyncCategory(new DataBaseInfo(),sxDataService.getCommentModel()); sxDataService.SyncCategory(new DataBaseInfo(),sxDataService.getCommentModel());
} }
@RequestMapping("/syncGoods") @RequestMapping("/syncGoods")
public void syncGoods(){ public void syncGoods(){
log.info("syncGoods"); log.info("syncGoods");
sxDataService.getAppSign(); //sxDataService.getAppSign();
sxDataService.SyncGoods(new DataBaseInfo(),sxDataService.getCommentModel()); sxDataService.SyncGoods(new DataBaseInfo(),sxDataService.getCommentModel());
} }
@RequestMapping("/synvip") @RequestMapping("/synvip")
public void synvip(){ public void synvip(){
log.info("synvip"); log.info("synvip");
sxDataService.getAppSign(); // sxDataService.getAppSign();
sxDataService.SyncVipList(new DataBaseInfo(),sxDataService.getCommentModel()); sxDataService.SyncVipList(new DataBaseInfo(),sxDataService.getCommentModel());
} }

14
client/src/main/java/com/small/client/service/SxDataAbst/SxDataAbstService.java
View File

@ -81,16 +81,26 @@ public abstract class SxDataAbstService {
//寻找父级 //寻找父级
if(null!=sxSyncCategory.getCls_parent()){ if(null!=sxSyncCategory.getCls_parent()){
SxSyncCategory firstNode=getParentNode(allSxSyncCategories,sxSyncCategory.getCls_parent()); SxSyncCategory firstNode=getParentNode(allSxSyncCategories,sxSyncCategory.getCls_parent());
if(null==firstNode){
sxCategoryModel.setFirst_category_name("");
}
sxCategoryModel.setParent_name(firstNode.getItem_clsname());//todo 暂时无用 sxCategoryModel.setParent_name(firstNode.getItem_clsname());//todo 暂时无用
//如何存在上级的上级，则上级为第二层，上上及为第一层 //如何存在上级的上级，则上级为第二层，上上及为第一层
if(null!=firstNode.getCls_parent()) {//还存在上级 if(null!=firstNode.getCls_parent()) {//还存在上级
SxSyncCategory secondNode=getParentNode(allSxSyncCategories,sxSyncCategory.getCls_parent()); SxSyncCategory secondNode=getParentNode(allSxSyncCategories,sxSyncCategory.getCls_parent());
sxCategoryModel.setFirst_category_name(secondNode.getItem_clsname()); if(null!=secondNode && secondNode.getItem_clsno().equals(firstNode.getCls_parent())){
sxCategoryModel.setSecond_category_name(firstNode.getItem_clsname()); sxCategoryModel.setFirst_category_name(secondNode.getItem_clsname());
sxCategoryModel.setSecond_category_name(firstNode.getItem_clsname());
}else {
sxCategoryModel.setFirst_category_name(firstNode.getItem_clsname());
}
}else { }else {
sxCategoryModel.setFirst_category_name(firstNode.getItem_clsname()); sxCategoryModel.setFirst_category_name(firstNode.getItem_clsname());
} }
}else {
sxCategoryModel.setFirst_category_name("");
} }
sxCategoryModel.setProduct_type("食品生鲜");
sxCategoryModels.add(sxCategoryModel); sxCategoryModels.add(sxCategoryModel);
} }
return sxCategoryModels; return sxCategoryModels;

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

@ -120,8 +120,10 @@ public class ShopBaseProductBrandServiceImpl extends BaseServiceImpl<ShopBasePro
@Override @Override
public boolean saveOrUpdateBrand(ShopBaseProductBrand shopBaseProductBrand) { public boolean saveOrUpdateBrand(ShopBaseProductBrand shopBaseProductBrand) {
//shopBaseProductBrand.setBrand_name_pinyin("qi ta pin pai");
shopBaseProductBrand.setBrand_name_pinyin(PinyinUtil.getPinyin(shopBaseProductBrand.getBrand_name())); shopBaseProductBrand.setBrand_name_pinyin(PinyinUtil.getPinyin(shopBaseProductBrand.getBrand_name()));
shopBaseProductBrand.setBrand_initial(Convert.toStr(shopBaseProductBrand.getBrand_name_pinyin().charAt(0))); shopBaseProductBrand.setBrand_initial(Convert.toStr(shopBaseProductBrand.getBrand_name_pinyin().charAt(0)));
//shopBaseProductBrand.setBrand_initial("q");
Integer store_id = shopBaseProductBrand.getStore_id(); Integer store_id = shopBaseProductBrand.getStore_id();
boolean isPlatform = true; boolean isPlatform = true;

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

@ -1246,6 +1246,7 @@ public class ShopBaseProductCategoryServiceImpl extends BaseServiceImpl<ShopBase
if (CollUtil.isEmpty(map)) { if (CollUtil.isEmpty(map)) {
QueryWrapper<ShopBaseProductCategory> queryWrapper = new QueryWrapper<>(); QueryWrapper<ShopBaseProductCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("store_id", storeId); queryWrapper.eq("store_id", storeId);
// queryWrapper.eq("data_source", 2);
List<ShopBaseProductCategory> categoryList = find(queryWrapper); List<ShopBaseProductCategory> categoryList = find(queryWrapper);
// 类似数据可以放到前端整理 // 类似数据可以放到前端整理
List<Map> category_tmp_rows = Convert.toList(Map.class, categoryList); List<Map> category_tmp_rows = Convert.toList(Map.class, categoryList);

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

@ -86,7 +86,7 @@ public class ShopBaseProductTypeServiceImpl extends BaseServiceImpl<ShopBaseProd
data.put("brands", brandService.getBrandsByIds(shopBaseProductType.getType_brand_ids())); data.put("brands", brandService.getBrandsByIds(shopBaseProductType.getType_brand_ids()));
Integer store_id = Convert.toInt(userInfoService.getUser().getStore_id()); Integer store_id = Convert.toInt(userInfoService.getUser().getStore_id());
//Integer store_id =1; // Integer store_id =1;
data.put("specs", specService.getSpecsByIds(shopBaseProductType.getType_spec_ids(), store_id)); data.put("specs", specService.getSpecsByIds(shopBaseProductType.getType_spec_ids(), store_id));

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

@ -98,30 +98,29 @@ public abstract class SyncBaseThirdSxAbstract{
if (StrUtil.isNotBlank(o.getStr("product_type"))) { if (StrUtil.isNotBlank(o.getStr("product_type"))) {
ShopBaseProductType productType = productTypeService.getProductTypeByName(o.getStr("product_type")); ShopBaseProductType productType = productTypeService.getProductTypeByName(o.getStr("product_type"));
if (productType != null) { if (productType != null) {
list.get(i).setType_id(productType.getType_id()); typeId = productType.getType_id();
} else { } else {
// 新增一个类型 // 新增一个类型
ShopBaseProductType newProductType = new ShopBaseProductType(); ShopBaseProductType newProductType = new ShopBaseProductType();
newProductType.setType_name(o.getStr("product_type")); newProductType.setType_name(o.getStr("product_type"));
newProductType.setType_buildin(0); newProductType.setType_buildin(0);
if (productTypeService.save(newProductType)) { if (productTypeService.save(newProductType)) {
typeId = newProductType.getType_id(); typeId = newProductType.getType_id();
} }
} }
list.get(i).setType_id(typeId); list.get(i).setType_id(typeId);
} }
// 处理（第一级）父类字段 产品分类 // 处理（第一级）父类字段 产品分类
Integer firstParentId = 0; Integer firstParentId = 0;
list.get(i).setCategory_parent_id(firstParentId);//设置默认值
if (StrUtil.isNotBlank(o.getStr("first_category_name"))) { if (StrUtil.isNotBlank(o.getStr("first_category_name"))) {
// TODO storeId 不判断一下吗？ // TODO storeId 不判断一下吗？
ShopBaseProductCategory cate = productCategoryService.getCategoryByName(o.getStr("first_category_name")); ShopBaseProductCategory cate = productCategoryService.getCategoryByName(o.getStr("first_category_name"));
if (cate != null) { if (cate != null) {
list.get(i).setParent_id(cate.getCategory_id()); list.get(i).setCategory_parent_id(cate.getCategory_id());
} else { } else{
// 新增一个（第一级）父类 // 新增一个（第一级）父类
ShopBaseProductCategory firstCate = new ShopBaseProductCategory(); ShopBaseProductCategory firstCate = new ShopBaseProductCategory();
firstCate.setCategory_name(o.getStr("first_category_name")); firstCate.setCategory_name(o.getStr("first_category_name"));
@ -132,11 +131,10 @@ public abstract class SyncBaseThirdSxAbstract{
if (productCategoryService.saveOrUpdate(firstCate)) { if (productCategoryService.saveOrUpdate(firstCate)) {
// 当前子分类的父类id // 当前子分类的父类id
firstParentId = firstCate.getId(); firstParentId = firstCate.getId();
list.get(i).setParent_id(firstParentId); list.get(i).setCategory_parent_id(firstParentId);
} }
} }
list.get(i).setParent_id(firstParentId);
} }
// 处理（第二级）父类字段 产品分类 // 处理（第二级）父类字段 产品分类
@ -144,25 +142,26 @@ public abstract class SyncBaseThirdSxAbstract{
// TODO storeId 不判断一下吗？ // TODO storeId 不判断一下吗？
ShopBaseProductCategory cate = productCategoryService.getCategoryByName(o.getStr("second_category_name")); ShopBaseProductCategory cate = productCategoryService.getCategoryByName(o.getStr("second_category_name"));
if (cate != null) { if (cate != null) {
list.get(i).setParent_id(cate.getCategory_id()); list.get(i).setCategory_parent_id(cate.getCategory_id());
} else { } else {
// 新增一个（第二级）父类 // 新增一个（第二级）父类
ShopBaseProductCategory secondCate = new ShopBaseProductCategory(); ShopBaseProductCategory secondCate = new ShopBaseProductCategory();
secondCate.setCategory_name(o.getStr("second_category_name")); secondCate.setCategory_name(o.getStr("second_category_name"));
secondCate.setParent_id(firstParentId); secondCate.setCategory_parent_id(firstParentId);
secondCate.setStore_id(storeId); secondCate.setStore_id(storeId);
secondCate.setType_id(typeId); secondCate.setType_id(typeId);
secondCate.setData_source(2); secondCate.setData_source(2);
if (productCategoryService.saveOrUpdate(secondCate)) { if (productCategoryService.saveOrUpdate(secondCate)) {
// 当前子分类的第二级父类id // 当前子分类的第二级父类id
list.get(i).setParent_id(secondCate.getId()); list.get(i).setCategory_parent_id(secondCate.getId());
} }
} }
} }
} }
ShopBaseProductCategory productCategoryTemp = productCategoryService.getCategoryByName(list.get(i).getParent_id(), list.get(i).getCategory_name(), list.get(i).getStore_id()); ShopBaseProductCategory productCategoryTemp = productCategoryService.getCategoryByName(list.get(i).getCategory_parent_id(), list.get(i).getCategory_name(), list.get(i).getStore_id());
if (productCategoryTemp != null) { if (productCategoryTemp != null) {
// 更改记录 // 更改记录
if (!productCategoryTemp.getCategory_image().equals(list.get(i).getCategory_image()) if (!productCategoryTemp.getCategory_image().equals(list.get(i).getCategory_image())
@ -575,10 +574,14 @@ public abstract class SyncBaseThirdSxAbstract{
shopProductIndex.setProduct_transport_id(String.valueOf(StateCode.DELIVERY_TYPE_SAME_CITY)); shopProductIndex.setProduct_transport_id(String.valueOf(StateCode.DELIVERY_TYPE_SAME_CITY));
if(categoryId!=0){ if(categoryId!=0){
Integer typeId = (Integer) categoryMap.get(categoryId); Integer typeId = (Integer) categoryMap.get(categoryId.toString());
if (ObjectUtil.isNotEmpty(typeId)) { if (ObjectUtil.isNotEmpty(typeId)) {
shopProductIndex.setType_id(typeId); shopProductIndex.setType_id(typeId);
}else {
logger.info("typeId-{}",typeId);
} }
}else {
logger.info("cateGoryId-{}",cateGoryId);
} }
// shop_product_data // shop_product_data

2
mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java
View File

@ -130,6 +130,7 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
@Autowired @Autowired
private FileUtils fileUtils; private FileUtils fileUtils;
/** /**
* 批量保存商品的分类 * 批量保存商品的分类
* *
@ -488,6 +489,7 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
AtomicInteger fails= new AtomicInteger(); AtomicInteger fails= new AtomicInteger();
List<String> failFolders=new ArrayList<>(); List<String> failFolders=new ArrayList<>();
List<String> failMessage=new ArrayList<>(); List<String> failMessage=new ArrayList<>();
shopBaseProductCategoryService.getCategoryListByStoreId(storeId);
for (int i = 0; i < newFolders.size(); i++) { for (int i = 0; i < newFolders.size(); i++) {
final int taskId = i; final int taskId = i;
threadNum.incrementAndGet(); threadNum.incrementAndGet();