Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tankaikai
2025-04-12 14:36:31 +08:00

View File

@@ -467,6 +467,8 @@ public class ShopSyncServiceImpl implements ShopSyncService {
@Override
@Transactional(rollbackFor = Exception.class)
public void syncProductBySourceShop(Long sourceShopId, Long productId, Long sysUserId) {
try {
log.info("商品同步开始,源店铺ID:{},商品ID:{}", sourceShopId, productId);
assertAutoSync(sourceShopId);
AssertUtil.isNull(productId, "{}不能为空", "商品ID");
Set<Long> shopIds = checkSourceShopInfo(sourceShopId, 1);
@@ -548,6 +550,10 @@ public class ShopSyncServiceImpl implements ShopSyncService {
buildNotice(mainMapList, "商品变动", 1, "product", dataMap);
syncNoticeService.addNotice(shopId, sysUserId, "数据变动", JSON.toJSONString(mainMapList), JSON.toJSONString(newEntity));
}
} catch (Exception e) {
log.error("商品同步异常", e);
throw new CzgException("商品同步失败");
}
}
public Map<Long, Long> syncGroup(Long sourceShopId, Long pointShopId, Map<Long, Long> pros, List<Map<String, Object>> mainMapList) {