Compare commits

..

No commits in common. "32ef77830d399c221e723f65120dbc828dedd841" and "a6877b3684f54f2ac8be851e7321c29c09087370" have entirely different histories.

3 changed files with 5 additions and 7 deletions

View File

@ -818,7 +818,6 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
shopProductBase.setProduct_unit_price(item_unit_price); shopProductBase.setProduct_unit_price(item_unit_price);
shopProductBase.setProduct_unit_points(item_unit_points); shopProductBase.setProduct_unit_points(item_unit_points);
shopProductBase.setProduct_unit_sp(item_unit_sp.intValue()); shopProductBase.setProduct_unit_sp(item_unit_sp.intValue());
shopProductBase.setProduct_number(shopProductInfo.getProduct_number());
// todo 定制可以增加市场价 item_market_price // todo 定制可以增加市场价 item_market_price
BigDecimal max_item_unit_price = shopProductItemList.stream().map(ShopProductItem::getItem_unit_price).max(BigDecimal::compareTo).get(); BigDecimal max_item_unit_price = shopProductItemList.stream().map(ShopProductItem::getItem_unit_price).max(BigDecimal::compareTo).get();
@ -5373,7 +5372,7 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
// shopProductIndexList.get(i).setProduct_unit_points(BigDecimal.ZERO); // shopProductIndexList.get(i).setProduct_unit_points(BigDecimal.ZERO);
shopProductIndexList.get(i).setProduct_unit_price_max(base.getProduct_market_price()); shopProductIndexList.get(i).setProduct_unit_price_max(base.getProduct_market_price());
shopProductIndexList.get(i).setProduct_unit_sp(Convert.toBigDecimal(base.getProduct_unit_sp())); shopProductIndexList.get(i).setProduct_unit_sp(Convert.toBigDecimal(base.getProduct_unit_sp()));
// shopProductIndexList.get(i).setProduct_sale_time(base.getProduct_sale_time().getTime()); shopProductIndexList.get(i).setProduct_sale_time(base.getProduct_sale_time().getTime());
shopProductIndexList.get(i).setProduct_verify_id(base.getProduct_verify_id()); shopProductIndexList.get(i).setProduct_verify_id(base.getProduct_verify_id());
shopProductIndexList.get(i).setProduct_state_id(base.getProduct_state_id()); shopProductIndexList.get(i).setProduct_state_id(base.getProduct_state_id());
shopProductIndexList.get(i).setProduct_src_id(existId); shopProductIndexList.get(i).setProduct_src_id(existId);
@ -5420,7 +5419,7 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
shopProductIndexList.get(i).setProduct_unit_points(BigDecimal.ZERO); shopProductIndexList.get(i).setProduct_unit_points(BigDecimal.ZERO);
shopProductIndexList.get(i).setProduct_unit_price_max(base.getProduct_market_price()); shopProductIndexList.get(i).setProduct_unit_price_max(base.getProduct_market_price());
shopProductIndexList.get(i).setProduct_unit_sp(Convert.toBigDecimal(base.getProduct_unit_sp())); shopProductIndexList.get(i).setProduct_unit_sp(Convert.toBigDecimal(base.getProduct_unit_sp()));
//shopProductIndexList.get(i).setProduct_sale_time(base.getProduct_sale_time().getTime()); shopProductIndexList.get(i).setProduct_sale_time(base.getProduct_sale_time().getTime());
shopProductIndexList.get(i).setProduct_verify_id(base.getProduct_verify_id()); shopProductIndexList.get(i).setProduct_verify_id(base.getProduct_verify_id());
shopProductIndexList.get(i).setProduct_state_id(base.getProduct_state_id()); shopProductIndexList.get(i).setProduct_state_id(base.getProduct_state_id());
// 判断店铺是否开启 // 判断店铺是否开启

View File

@ -799,7 +799,8 @@ public abstract class SyncBaseThirdSxAbstract{
ShopProductBase shopProductBase = new ShopProductBase(); ShopProductBase shopProductBase = new ShopProductBase();
shopProductBase.setCategoryId(categoryId); shopProductBase.setCategoryId(categoryId);
shopProductBase.setProduct_sale_time(currentDate); long seconds=System.currentTimeMillis();
shopProductBase.setProduct_sale_time(Date.from(Instant.now().plusSeconds(seconds))); //10分钟
shopProductBase.setStore_id(storeIdInt); shopProductBase.setStore_id(storeIdInt);
shopProductBase.setProduct_number((String) jsonObj.get("product_number")); shopProductBase.setProduct_number((String) jsonObj.get("product_number"));
@ -866,7 +867,7 @@ public abstract class SyncBaseThirdSxAbstract{
// ShopProductIndex // ShopProductIndex
ShopProductIndex shopProductIndex = new ShopProductIndex(); ShopProductIndex shopProductIndex = new ShopProductIndex();
shopProductIndex.setProduct_add_time(currentDate.getTime()); shopProductIndex.setProduct_add_time(currentDate.getTime());
shopProductIndex.setProduct_sale_time(currentDate.getTime()); shopProductIndex.setProduct_sale_time(seconds);
shopProductIndex.setStore_category_ids(""); // 店铺分类编号(DOT) shopProductIndex.setStore_category_ids(""); // 店铺分类编号(DOT)
shopProductIndex.setProduct_tags("");// 商品标签(DOT) shopProductIndex.setProduct_tags("");// 商品标签(DOT)
shopProductIndex.setBrand_id(0); shopProductIndex.setBrand_id(0);

View File

@ -591,8 +591,6 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
// Map shopProductSpecItemMap = shopProductSpecItemService.getExistItem(Integer.valueOf(storeId));//切割缓存 // Map shopProductSpecItemMap = shopProductSpecItemService.getExistItem(Integer.valueOf(storeId));//切割缓存
// Map productMappingMap = productMappingService.getProductMapping(Integer.valueOf(storeId));//切割缓存 // Map productMappingMap = productMappingService.getProductMapping(Integer.valueOf(storeId));//切割缓存
// Map ShopBaseProductSpecMap = baseProductSpecService.getShopBaseProductSpecMap(Integer.valueOf(storeId));//切割商品缓存 // Map ShopBaseProductSpecMap = baseProductSpecService.getShopBaseProductSpecMap(Integer.valueOf(storeId));//切割商品缓存
// long seconds=System.currentTimeMillis();
// Date productSaleTime=Date.from(Instant.now().plusSeconds(seconds));
for (int i = 0; i < newFolders.size(); i++) { for (int i = 0; i < newFolders.size(); i++) {
final int taskId = i; final int taskId = i;
final String isNegativeAllowed = storeDbConfig.getIsNegativeAllowed(); final String isNegativeAllowed = storeDbConfig.getIsNegativeAllowed();