From a22ec2ebf7bf142941728575762e49d0b08d5883 Mon Sep 17 00:00:00 2001 From: liyj <1617420630@qq.com> Date: Fri, 20 Jun 2025 18:30:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=9A=84=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sync/service/SyncThirdDataService.java | 4 +- .../impl/SyncThirdDataServiceImpl.java | 53 +++++-------------- 2 files changed, 17 insertions(+), 40 deletions(-) diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/SyncThirdDataService.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/SyncThirdDataService.java index 51854ab1..556001dd 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/SyncThirdDataService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/SyncThirdDataService.java @@ -16,6 +16,7 @@ import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; +import java.util.Date; import java.util.List; import java.util.Map; @@ -130,12 +131,13 @@ public interface SyncThirdDataService { /** + *上传文件到cos * @param appKey * @param sign * @param folders * @return */ - ThirdApiRes fileUploadToOss(String appKey, String sign, String syncType, List folders); + ThirdApiRes fileUploadToOss(String appKey, String sign, String syncType, Date refreshDate, List folders); /** *同步活动 diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java index 8b7edbad..04d2ac1b 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java @@ -24,11 +24,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.qcloud.cos.model.COSObjectSummary; import com.suisung.mall.common.api.CommonResult; +import com.suisung.mall.common.api.StateCode; import com.suisung.mall.common.enums.DicEnum; import com.suisung.mall.common.modules.base.ShopBaseProductBrand; import com.suisung.mall.common.modules.base.ShopBaseProductCategory; import com.suisung.mall.common.modules.sixun.SxSyncGoods; import com.suisung.mall.common.modules.sixun.SxSyncVip; +import com.suisung.mall.common.modules.store.ShopStoreActivityBase; import com.suisung.mall.common.modules.sync.StoreDbConfig; import com.suisung.mall.common.modules.sync.SyncApp; import com.suisung.mall.common.modules.sync.SyncConfig; @@ -42,6 +44,8 @@ import com.suisung.mall.shop.base.service.ShopBaseProductCategoryService; import com.suisung.mall.shop.base.service.ShopBaseProductSpecService; import com.suisung.mall.shop.number.service.ShopNumberSeqService; import com.suisung.mall.shop.page.service.OssService; +import com.suisung.mall.shop.product.service.ShopProductBaseService; +import com.suisung.mall.shop.product.service.ShopProductItemService; import com.suisung.mall.shop.product.service.ShopProductSpecItemService; import com.suisung.mall.shop.sixun.dao.SxDataDao; import com.suisung.mall.shop.sixun.dto.DataBaseInfo; @@ -52,6 +56,9 @@ import com.suisung.mall.shop.sixun.service.SxSyncGoodsService; import com.suisung.mall.shop.sixun.service.SxSyncVipService; import com.suisung.mall.shop.sixun.utils.CommonUtil; import com.suisung.mall.shop.sixun.utils.FileUtils; +import com.suisung.mall.shop.store.service.ShopStoreActivityBaseService; +import com.suisung.mall.shop.sync.Utils.ActiveShopJsonUtils; +import com.suisung.mall.shop.sync.Utils.BigDecimalFormatter; import com.suisung.mall.shop.sync.Utils.ThreadFileUtils; import com.suisung.mall.shop.sync.keymanage.RedisKey; import com.suisung.mall.shop.sync.service.*; @@ -138,6 +145,13 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements @Value("#{accountBaseConfigService.getConfig('tengxun_default_dir')}") private String TENGXUN_DEFA; + @Autowired + private ShopProductBaseService shopProductBaseService; + + @Autowired + private ShopProductItemService shopProductItemService; + @Autowired + private ShopStoreActivityBaseService shopStoreActivityBaseService; /** * 批量保存商品的分类 * @@ -830,45 +844,6 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements } } - @Override - public ThirdApiRes fileUploadToOss(String appKey, String sign, String syncType,Date refreshDate, List folders) { - if (StrUtil.isBlank(appKey) || StrUtil.isBlank(sign) ) { - return new ThirdApiRes().fail(1003, I18nUtil._("缺少必要参数！")); - } - // 验签、appid，必要参数判断 - SyncApp syncApp = syncAppService.getOne(new LambdaQueryWrapper() - .select(SyncApp::getApp_key, SyncApp::getApp_secret,SyncApp::getStore_id) - .eq(SyncApp::getApp_key, appKey) - .eq(SyncApp::getApp_secret,sign)); - if (syncApp == null) { - return new ThirdApiRes().fail(1001, I18nUtil._("签名有误！")); - } - String storeId = syncApp.getStore_id(); - if(null==syncApp.getStore_id()|| syncApp.getStore_id().isEmpty()){ - logger.info("商店id为空"); - return new ThirdApiRes().fail(250,"商店id为空"); - } - if(folders==null||folders.isEmpty()){ - logger.info("没有商品数据"); - return new ThirdApiRes().fail(250,"没有商品数据"); - } - - String newfolder=new FileUtils().getSyncTypeFlag(syncType,clientPath)+storeId+FileUtils.pathSeparator+folders.get(0)+FileUtils.pathSeparator; - upLoadZipToOss(newfolder);//上传文件到cos - //更新当前的获取时间，用户客户端获取 - try { - QueryWrapper storeDbConfigQueryWrapper = new QueryWrapper<>(); - storeDbConfigQueryWrapper.eq("store_id", storeId); - StoreDbConfig storeDbConfig=storeDbConfigService.getOne(storeDbConfigQueryWrapper); - if(ObjectUtil.isNotEmpty(storeDbConfig)){ - storeDbConfig.setRefreshTime(refreshDate); - storeDbConfigService.saveOrUpdate(storeDbConfig); - } - }catch (RuntimeException e){ - logger.error("同步时间失败"+e.getMessage()); - } - return new ThirdApiRes().success("上传成功"); - } @Override public ThirdApiRes fileUploadToOss(String appKey, String sign, String syncType,Date refreshDate, List folders) {