From 1c60f938b6e288e9cef903861330ba32c3b23063 Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Mon, 13 Jan 2025 21:38:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mall-common/pom.xml | 24 ++--- .../service/impl/PayUserPayServiceImpl.java | 1 + mall-shop/pom.xml | 12 +-- .../ShopBaseProductCategoryServiceImpl.java | 2 +- .../order/listener/OrderPayedListener.java | 2 +- .../impl/ShopOrderBaseServiceImpl.java | 12 +-- .../impl/ShopOrderInfoServiceImpl.java | 4 +- .../service/impl/ShopPageBaseServiceImpl.java | 8 +- .../impl/ShopProductBaseServiceImpl.java | 94 +++++++++---------- .../mobile/SFExpressController.java | 5 +- .../service/impl/SFExpressApiServiceImpl.java | 7 +- .../sixun/controller/SxSyncController.java | 11 ++- .../admin/ShopStoreBaseController.java | 2 +- .../admin/ShopStorePrinterController.java | 7 +- ...pStoreSameCityTransportBaseController.java | 5 +- ...SameCityTransportBaseMobileController.java | 3 +- .../impl/ShopStoreEmployeeServiceImpl.java | 9 +- ...StoreSameCityTransportBaseServiceImpl.java | 5 +- .../controller/SyncThirdDataController.java | 12 +-- .../shop/sync/service/SyncAppService.java | 7 ++ .../sync/service/SyncThirdDataService.java | 5 +- .../sync/service/impl/SyncAppServiceImpl.java | 19 ++-- .../impl/SyncThirdDataServiceImpl.java | 20 ++-- .../service/impl/ShopUserCartServiceImpl.java | 2 +- .../mapper/product/ShopProductItemMapper.xml | 6 +- pom.xml | 11 +++ 26 files changed, 163 insertions(+), 132 deletions(-) diff --git a/mall-common/pom.xml b/mall-common/pom.xml index 515adab9..626d5647 100644 --- a/mall-common/pom.xml +++ b/mall-common/pom.xml @@ -100,19 +100,19 @@ --> - - - org.springframework.boot - spring-boot-starter-data-jpa - 2.7.18 - + + + + + + - - - org.springframework.data - spring-data-jpa - 2.7.18 - + + + + + + diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java index 8ff7766d..a2c27410 100644 --- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java +++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java @@ -61,6 +61,7 @@ import io.seata.spring.annotation.GlobalTransactional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.stereotype.Service; import org.springframework.transaction.TransactionDefinition; diff --git a/mall-shop/pom.xml b/mall-shop/pom.xml index 8e3fb3c3..0331c6d9 100644 --- a/mall-shop/pom.xml +++ b/mall-shop/pom.xml @@ -292,12 +292,12 @@ org.apache.httpcomponents httpclient - - com.suisung.mall - mall-account - 1.0-SNAPSHOT - compile - + + + + + + diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductCategoryServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductCategoryServiceImpl.java index c882538a..d2e941d9 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductCategoryServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductCategoryServiceImpl.java @@ -136,7 +136,7 @@ public class ShopBaseProductCategoryServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", shopOrderId); List shopOrderItemList = shopOrderItemService.list(queryWrapper); - if (shopOrderBase == null || shopOrderData==null || CollUtil.isEmpty(shopOrderItemList)) { + if (shopOrderBase == null || shopOrderData == null || CollUtil.isEmpty(shopOrderItemList)) { logger.error("无法获取订单信息！"); return null; } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java index 8cbf4e3b..90f8ca70 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java @@ -103,10 +103,10 @@ public class ShopOrderInfoServiceImpl extends BaseServiceImpl item_ids = new ArrayList<>(); - List item_ids_key = shopProductItemService.findKey(new QueryWrapper().in("item_id", item_id_104).eq("item_enable", 1001)); - if (CollUtil.isNotEmpty(item_ids_key)) { - item_ids = Convert.toList(Long.class, item_ids_key); + if(CollUtil.isNotEmpty(item_id_104)) { + List item_ids_key = shopProductItemService.findKey(new QueryWrapper().in("item_id", item_id_104).eq("item_enable", 1001)); + if (CollUtil.isNotEmpty(item_ids_key)) { + item_ids = Convert.toList(Long.class, item_ids_key); + } } JSONArray data1 = new JSONArray(); diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java index ed06718f..0c2210b7 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java @@ -100,99 +100,99 @@ import static io.seata.common.util.LambdaUtils.distinctByKey; @Service public class ShopProductBaseServiceImpl extends BaseServiceImpl implements ShopProductBaseService { private final Logger logger = LoggerFactory.getLogger(ShopProductBaseServiceImpl.class); - @Resource + @Autowired private ShopBaseProductCategoryService shopBaseProductCategoryService; - @Resource + @Autowired private ShopProductMetaService shopProductMetaService; - @Resource + @Autowired private ShopProductPreSaleService shopProductPreSaleService; - @Resource + @Autowired private ShopProductBaseService shopProductBaseService; - @Resource + @Autowired private ShopStoreAnalyticsService shopStoreAnalyticsService; - @Resource + @Autowired private ShopProductAnalyticsService shopProductAnalyticsService; - @Resource + @Autowired private ShopProductDetailService shopProductDetailService; - @Resource + @Autowired private ShopProductInfoService shopProductInfoService; - @Resource + @Autowired private ShopProductValidPeriodService shopProductValidPeriodService; - @Resource + @Autowired private ShopProductItemService shopProductItemService; - @Resource + @Autowired private AccountBaseConfigService accountBaseConfigService; - @Resource + @Autowired private ShopBaseCurrencyService shopBaseCurrencyService; - @Resource + @Autowired private ShopUserCartService shopUserCartService; - @Resource + @Autowired private ShopStoreTransportTypeService transportTypeService; - @Resource + @Autowired private ShopBaseProductCategoryService productCategoryService; - @Resource + @Autowired private ShopProductIndexService shopProductIndexService; - @Resource + @Autowired private ShopProductImageService shopProductImageService; - @Resource + @Autowired private ShopStoreBaseService shopStoreBaseService; - @Resource + @Autowired private ShopBaseProductSpecService baseProductSpecService; - @Resource + @Autowired private ShopBaseStoreGradeService baseStoreGradeService; - @Resource + @Autowired private ShopProductAssistIndexService assistIndexService; - @Resource + @Autowired private ShopProductDataService shopProductDataService; - @Resource + @Autowired private ShopProductItemSeqService shopProductItemSeqService; - @Resource + @Autowired private ShopProductValidPeriodService validPeriodService; - @Resource + @Autowired private ShopUserSearchHistoryService shopUserSearchHistoryService; - @Resource + @Autowired private ShopBaseStateCodeService shopBaseStateCodeService; - @Resource + @Autowired private ShopProductBaseMapper shopProductBaseMapper; - @Resource + @Autowired private ShopStoreActivityBaseService shopStoreActivityBaseService; - @Resource + @Autowired private ShopStoreActivityItemService shopStoreActivityItemService; - @Resource + @Autowired private ShopActivityGroupbookingService shopActivityGroupbookingService; - @Resource + @Autowired private ShopBaseProductTypeService shopBaseProductTypeService; - @Resource + @Autowired private ShopNumberSeqService shopNumberSeqService; - @Resource + @Autowired private EduService eduService; - @Resource + @Autowired private ShopBaseDistrictService shopBaseDistrictService; - @Resource + @Autowired private ShopBaseContractTypeService shopBaseContractTypeService; - @Resource + @Autowired private ShopBaseMarketCategoryService shopBaseMarketCategoryService; - @Resource + @Autowired private MessageService messageService; - @Resource + @Autowired private ShopOrderItemService shopOrderItemService; - @Resource + @Autowired private SearchService searchService; - @Resource + @Autowired private ShopChainItemService shopChainItemService; - @Resource + @Autowired private ShopUserProductBrowseService shopUserProductBrowseService; - @Resource + @Autowired private ShopUserProductBuyService shopUserProductBuyService; - @Resource + @Autowired private ShopUserFavoritesItemService shopUserFavoritesItemService; - @Resource + @Autowired private MqMessageService mqMessageService; - @Resource + @Autowired private ThreadPoolExecutor executor; - @Resource + @Autowired private ShopBaseLangMetaService shopBaseLangMetaService; - @Resource + @Autowired private SxSyncGoodsService sxSyncGoodsService; @Override diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/controller/mobile/SFExpressController.java b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/controller/mobile/SFExpressController.java index a7cd9814..13d3f15c 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/controller/mobile/SFExpressController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/controller/mobile/SFExpressController.java @@ -15,6 +15,7 @@ import com.suisung.mall.shop.sfexpress.service.SFExpressApiService; import com.suisung.mall.shop.store.service.ShopStoreSfOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; @@ -31,9 +32,9 @@ import java.util.concurrent.Executors; @RequestMapping("/mobile/shop/sf-express") public class SFExpressController { private final ExecutorService executor = Executors.newSingleThreadExecutor(); - @Resource + @Autowired private SFExpressApiService sfExpressApiService; - @Resource + @Autowired private ShopStoreSfOrderService shopStoreSfOrderService; @ApiOperation(value = "顺丰同城店铺发单", notes = "顺丰同城店铺发单") diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java index e2ce4266..c5043680 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java @@ -31,6 +31,7 @@ import com.suisung.mall.shop.sfexpress.service.SFExpressApiService; import com.suisung.mall.shop.store.service.ShopStoreSfOrderService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; @@ -54,13 +55,13 @@ public class SFExpressApiServiceImpl implements SFExpressApiService { @Value("${sf-express.dev_id}") private Integer devId; - @Resource + @Autowired private ShopStoreSfOrderService shopStoreSfOrderService; - @Resource + @Autowired private ShopOrderBaseService shopOrderBaseService; - @Resource + @Autowired private ShopOrderInfoService shopOrderInfoService; @Override diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sixun/controller/SxSyncController.java b/mall-shop/src/main/java/com/suisung/mall/shop/sixun/controller/SxSyncController.java index 4381a4c9..3173eb0a 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sixun/controller/SxSyncController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sixun/controller/SxSyncController.java @@ -17,6 +17,7 @@ import com.suisung.mall.shop.sixun.service.SxSyncGoodsService; import com.suisung.mall.shop.sixun.service.SxSyncVipService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @@ -28,19 +29,19 @@ import javax.annotation.Resource; @RestController @RequestMapping("/admin/sixun") public class SxSyncController { - @Resource + @Autowired private SxSyncCategoryService sxSyncCategoryService; - @Resource + @Autowired private SxSyncVipService sxSyncVipService; - @Resource + @Autowired private SxSyncGoodsService sxSyncGoodsService; - @Resource + @Autowired private ShopBaseProductCategoryService shopBaseProductCategoryService; - @Resource + @Autowired private ShopProductBaseService shopProductBaseService; @ApiOperation(value = "获取思迅商品分类新增到数据库", notes = "获取思迅商品分类新增到数据库") diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreBaseController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreBaseController.java index eb57b10d..60c43423 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreBaseController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreBaseController.java @@ -46,7 +46,7 @@ public class ShopStoreBaseController extends BaseControllerImpl { @Autowired private ShopBaseStoreGradeService shopBaseStoreGradeService; - @Resource + @Autowired private ShopStoreSameCityTransportBaseService transportBaseService; @ApiOperation(value = "店铺基础信息表-分页列表查询", notes = "店铺基础信息表-分页列表查询") diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java index 5a07e44f..1992bf83 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java @@ -9,6 +9,7 @@ import com.suisung.mall.shop.store.service.ShopStorePrinterService; import com.suisung.mall.shop.store.service.ShopStoreSameCityTransportBaseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @@ -22,13 +23,13 @@ import java.math.BigDecimal; @RequestMapping("/admin/shop/store/printer") public class ShopStorePrinterController { - @Resource + @Autowired private ShopStorePrinterService shopStorePrinterService; - @Resource + @Autowired private ShopStoreSameCityTransportBaseService shopStoreSameCityTransportBaseService; - @Resource + @Autowired private ShopStoreEmployeeService shopStoreEmployeeService; @ApiOperation(value = "内部测试案例", notes = "内部测试案例") diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreSameCityTransportBaseController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreSameCityTransportBaseController.java index a7793e8d..4855ecaa 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreSameCityTransportBaseController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreSameCityTransportBaseController.java @@ -7,6 +7,7 @@ import com.suisung.mall.shop.store.service.ShopStoreSameCityTransportBaseService import com.suisung.mall.shop.store.service.ShopStoreSameCityTransportService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -16,10 +17,10 @@ import javax.annotation.Resource; @RequestMapping("/admin/shop/store/same-city-transport") public class ShopStoreSameCityTransportBaseController { - @Resource + @Autowired private ShopStoreSameCityTransportBaseService transportBaseService; - @Resource + @Autowired private ShopStoreSameCityTransportService transportService; @ApiOperation(value = "获取同城配送运费设置详情", notes = "获取同城配送运费设置详情") diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/mobile/ShopStoreSameCityTransportBaseMobileController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/mobile/ShopStoreSameCityTransportBaseMobileController.java index 53129a8f..c7cb57b3 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/mobile/ShopStoreSameCityTransportBaseMobileController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/mobile/ShopStoreSameCityTransportBaseMobileController.java @@ -4,6 +4,7 @@ import com.suisung.mall.common.api.CommonResult; import com.suisung.mall.shop.store.service.ShopStoreSameCityTransportBaseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @@ -16,7 +17,7 @@ import javax.annotation.Resource; @RequestMapping("/mobile/shop/store/same-city-transport") public class ShopStoreSameCityTransportBaseMobileController { - @Resource + @Autowired private ShopStoreSameCityTransportBaseService transportBaseService; @ApiOperation(value = "下单前检测同城订单配送是否符合要求", notes = "下单前检测同城订单配送是否符合要求") diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreEmployeeServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreEmployeeServiceImpl.java index 0f5331ce..fe9af327 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreEmployeeServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreEmployeeServiceImpl.java @@ -23,6 +23,7 @@ import com.suisung.mall.shop.store.mapper.ShopStoreEmployeeMapper; import com.suisung.mall.shop.store.service.ShopStoreEmployeeRightsGroupService; import com.suisung.mall.shop.store.service.ShopStoreEmployeeService; import io.seata.spring.annotation.GlobalTransactional; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -44,16 +45,16 @@ import static com.suisung.mall.common.utils.ContextUtil.getCurrentUser; @Service public class ShopStoreEmployeeServiceImpl extends BaseServiceImpl implements ShopStoreEmployeeService { -// @Resource +// @Autowired // private ShopStoreEmployeeService shopStoreEmployeeService; - @Resource + @Autowired private AccountService accountService; - @Resource + @Autowired private ShopStoreEmployeeRightsGroupService shopStoreEmployeeRightsGroupService; - @Resource + @Autowired private ShopStoreEmployeeMapper shopStoreEmployeeMapper; @Override diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java index a522ca10..cdc989db 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java @@ -36,6 +36,7 @@ import com.suisung.mall.shop.store.service.ShopStoreSameCityTransportBaseService import com.suisung.mall.shop.store.service.ShopStoreSameCityTransportService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; @@ -54,9 +55,9 @@ import static com.suisung.mall.common.utils.ContextUtil.getCurrentUser; public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl implements ShopStoreSameCityTransportBaseService { private static final Logger logger = LoggerFactory.getLogger(ShopStoreSameCityTransportBaseServiceImpl.class); - @Resource + @Autowired private ShopStoreSameCityTransportService shopStoreSameCityTransportService; - @Resource + @Autowired private ShopStoreBaseService shopStoreBaseService; /** diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/SyncThirdDataController.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/SyncThirdDataController.java index a66cb493..25704c9f 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/SyncThirdDataController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/SyncThirdDataController.java @@ -9,21 +9,21 @@ package com.suisung.mall.shop.sync.controller; import cn.hutool.json.JSONArray; -import com.suisung.mall.common.api.CommonResult; -import com.suisung.mall.common.modules.base.ShopBaseProductBrand; import com.suisung.mall.common.pojo.res.ThirdApiRes; import com.suisung.mall.shop.sync.service.SyncThirdDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; @Api(tags = "第三方数据同步") @RestController @RequestMapping("/shop/sync/third") public class SyncThirdDataController { - @Resource + @Autowired private SyncThirdDataService syncThirdDataService; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/SyncAppService.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/SyncAppService.java index b3c741a1..60bb5ca1 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/SyncAppService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/SyncAppService.java @@ -15,6 +15,7 @@ public interface SyncAppService { /** * 根据 appId 获取一条记录 + * * @param appId * @return */ @@ -22,6 +23,7 @@ public interface SyncAppService { /** * 根据关键字搜索记录分页列表 + * * @param keyword * @param status * @param pageNum @@ -32,6 +34,7 @@ public interface SyncAppService { /** * 新增一条记录 + * * @param syncApp * @return */ @@ -39,6 +42,7 @@ public interface SyncAppService { /** * 修改一条记录 + * * @param syncApp * @return */ @@ -46,6 +50,7 @@ public interface SyncAppService { /** * 修改 app key 和 app 密钥 + * * @param appId * @param appKey * @param appSecret @@ -55,6 +60,7 @@ public interface SyncAppService { /** * 删除一条记录 + * * @param appId * @return */ @@ -62,6 +68,7 @@ public interface SyncAppService { /** * 删除一条记录 + * * @param id * @return */ 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 c882b61e..d0239240 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 @@ -9,15 +9,13 @@ package com.suisung.mall.shop.sync.service; import cn.hutool.json.JSONArray; -import com.suisung.mall.common.modules.base.ShopBaseProductBrand; import com.suisung.mall.common.pojo.res.ThirdApiRes; -import java.util.List; - public interface SyncThirdDataService { /** * 批量保存商品的分类 + * * @param categoryListJSON * @return */ @@ -25,6 +23,7 @@ public interface SyncThirdDataService { /** * 批量保存商品品牌记录 + * * @param brandListJSON * @return */ diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncAppServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncAppServiceImpl.java index 08b7ffb2..d3cac5b7 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncAppServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncAppServiceImpl.java @@ -12,22 +12,19 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.suisung.mall.common.modules.sixun.SxSyncGoods; import com.suisung.mall.common.modules.sync.SyncApp; import com.suisung.mall.core.web.service.impl.BaseServiceImpl; -import com.suisung.mall.shop.sixun.mapper.SxSyncGoodsMapper; -import com.suisung.mall.shop.sixun.service.SxSyncGoodsService; import com.suisung.mall.shop.sync.mapper.SyncAppMapper; import com.suisung.mall.shop.sync.service.SyncAppService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.util.function.Consumer; @Service public class SyncAppServiceImpl extends BaseServiceImpl implements SyncAppService { - @Resource + @Autowired private SyncAppMapper syncAppMapper; /** @@ -63,12 +60,12 @@ public class SyncAppServiceImpl extends BaseServiceImpl QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.like("intro", keyword).or((Consumer>) queryWrapper); - if(status!=null && status>0){ - queryWrapper.eq("status",status); - queryWrapper2.eq("status",status); + if (status != null && status > 0) { + queryWrapper.eq("status", status); + queryWrapper2.eq("status", status); } - return lists(queryWrapper2,pageNum,pageSize); + return lists(queryWrapper2, pageNum, pageSize); } /** @@ -79,7 +76,7 @@ public class SyncAppServiceImpl extends BaseServiceImpl */ @Override public Boolean addSyncApp(SyncApp syncApp) { - if(syncApp==null){ + if (syncApp == null) { return false; } return add(syncApp); @@ -93,7 +90,7 @@ public class SyncAppServiceImpl extends BaseServiceImpl */ @Override public Boolean updateSyncApp(SyncApp syncApp) { - if(syncApp==null){ + if (syncApp == null) { return false; } return updateById(syncApp); 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 6ceee17b..351b5293 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 @@ -22,22 +22,22 @@ import com.suisung.mall.shop.base.service.ShopBaseProductBrandService; import com.suisung.mall.shop.base.service.ShopBaseProductCategoryService; import com.suisung.mall.shop.base.service.ShopBaseProductTypeService; import com.suisung.mall.shop.sync.service.SyncThirdDataService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; -import javax.annotation.Resource; import java.util.HashMap; import java.util.List; +import java.util.Map; @Service public class SyncThirdDataServiceImpl implements SyncThirdDataService { - @Resource + @Autowired private ShopBaseProductBrandService productBrandService; - @Resource + @Autowired private ShopBaseProductCategoryService productCategoryService; - @Resource + @Autowired private ShopBaseProductTypeService productTypeService; /** @@ -116,7 +116,10 @@ public class SyncThirdDataServiceImpl implements SyncThirdDataService { } } - return new ThirdApiRes().success("成功同步" + count + "条记录！", count); + Map resp = new HashMap<>(); + resp.put("count", count); + + return new ThirdApiRes().success("成功同步" + count + "条记录！", resp); } /** @@ -157,6 +160,9 @@ public class SyncThirdDataServiceImpl implements SyncThirdDataService { count += productBrandService.saveOrUpdateBrand2(goodBrandList.get(i)); } - return new ThirdApiRes().success("成功同步" + count + "条记录！", count); + Map resp = new HashMap<>(); + resp.put("count", count); + + return new ThirdApiRes().success("成功同步" + count + "条记录！", resp); } } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java index a5c25373..d34fb277 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java @@ -146,7 +146,7 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl AND b.product_id = #{param.product_id} - + AND i.item_id in #{item_id} @@ -28,8 +28,8 @@ AND b.category_id in - #{category_id} + + #{category_id} diff --git a/pom.xml b/pom.xml index aa6e894c..1d1ff4b2 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,7 @@ spring-boot-configuration-processor true + com.baomidou @@ -321,6 +322,12 @@ root B1x1GuKZr55PPmox com.mysql.cj.jdbc.Driver + + + + + + 114.132.210.208 15 @@ -490,6 +497,10 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-dependency-plugin + com.spotify docker-maven-plugin