Merge remote-tracking branch 'origin/main'

This commit is contained in:
Jack 2025-03-04 23:42:18 +08:00
commit 6ea72029c9

View File

@ -295,8 +295,8 @@ public class SyncThirdDataServiceImpl implements SyncThirdDataService {
ShopProductBase shopProductBase = new ShopProductBase(); ShopProductBase shopProductBase = new ShopProductBase();
shopProductBase.setProduct_sale_time(Convert.toDate(DateUtil.current() + 600)); //10分钟 shopProductBase.setProduct_sale_time(Convert.toDate(DateUtil.current() + 600)); //10分钟
shopProductBase.setStore_id(storeIdInt); shopProductBase.setStore_id(storeIdInt);
shopProductBase.setProduct_number((String) jsonObj.get("first_category_name")); shopProductBase.setProduct_number((String) jsonObj.get("product_number"));
shopProductBase.setProduct_name((String) jsonObj.get("first_category_name")); shopProductBase.setProduct_name((String) jsonObj.get("product_name"));
shopProductBase.setStore_name(store_row.getStore_name()); shopProductBase.setStore_name(store_row.getStore_name());
shopProductBase.setProduct_tips(""); shopProductBase.setProduct_tips("");
shopProductBase.setProduct_video(""); shopProductBase.setProduct_video("");
@ -353,7 +353,7 @@ public class SyncThirdDataServiceImpl implements SyncThirdDataService {
// shop_product_info // shop_product_info
ShopProductInfo shopProductInfo = new ShopProductInfo(); ShopProductInfo shopProductInfo = new ShopProductInfo();
shopProductInfo.setProduct_number((String) jsonObj.get("first_category_name"));// SPU商家编码:货号 shopProductInfo.setProduct_number((String) jsonObj.get("product_number"));// SPU商家编码:货号
shopProductInfo.setProduct_assist(""); shopProductInfo.setProduct_assist("");
shopProductInfo.setProduct_spec(""); shopProductInfo.setProduct_spec("");
shopProductInfo.setProduct_buy_limit(0); // 不限购 shopProductInfo.setProduct_buy_limit(0); // 不限购
@ -364,14 +364,16 @@ public class SyncThirdDataServiceImpl implements SyncThirdDataService {
ShopProductItem shopProductItem = new ShopProductItem(); ShopProductItem shopProductItem = new ShopProductItem();
shopProductItem.setStore_id(storeIdInt); shopProductItem.setStore_id(storeIdInt);
shopProductItem.setCategory_id(categoryId); shopProductItem.setCategory_id(categoryId);
shopProductItem.setItem_unit_price((BigDecimal) jsonObj.get("first_category_name")); //零售价
shopProductItem.setItem_advice_price((BigDecimal) jsonObj.get("first_category_name")); shopProductItem.setItem_unit_price((BigDecimal) jsonObj.get("retail_price"));
shopProductItem.setItem_market_price((BigDecimal) jsonObj.get("first_category_name")); shopProductItem.setItem_advice_price((BigDecimal) jsonObj.get("retail_price"));
shopProductItem.setItem_unit_points((BigDecimal) jsonObj.get("first_category_name")); shopProductItem.setItem_market_price((BigDecimal) jsonObj.get("retail_price"));
shopProductItem.setItem_quantity((Integer) jsonObj.get("first_category_name")); // 库存 //积分价
shopProductItem.setItem_unit_points((BigDecimal) jsonObj.get("points"));
shopProductItem.setItem_quantity((Integer) jsonObj.get("stock")); // 库存
shopProductItem.setItem_quantity_frozen(0); shopProductItem.setItem_quantity_frozen(0);
shopProductItem.setItem_number((String) jsonObj.get("first_category_name"));// SKU商家编码 shopProductItem.setItem_number((String) jsonObj.get("product_number"));// SKU商家编码
shopProductItem.setItem_barcode((String) jsonObj.get("first_category_name")); // 条形码正常情况下就是货号 shopProductItem.setItem_barcode((String) jsonObj.get("product_number")); // 条形码正常情况下就是货号
shopProductItem.setItem_is_default(1); shopProductItem.setItem_is_default(1);
shopProductItem.setItem_enable(1); shopProductItem.setItem_enable(1);