From b1f95f4ecf99e0c730e6ef0b1e6ed87f75ef21bb Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Fri, 12 Dec 2025 00:14:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=86=85=E9=83=A8=E9=85=8D?= =?UTF-8?q?=E9=80=81=E8=B4=B9=E7=9A=84=E9=80=BB=E8=BE=91=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E3=80=82=E6=8E=A5=E5=8F=A3=E5=B1=82=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...pStoreSameCityTransportBaseController.java | 4 +- ...SameCityTransportBaseMobileController.java | 4 +- ...ShopStoreSameCityTransportBaseService.java | 3 +- ...StoreSameCityTransportBaseServiceImpl.java | 52 +++++++++++++------ 4 files changed, 41 insertions(+), 22 deletions(-) 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 c3d35f76..cd3b2ff7 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 @@ -23,8 +23,8 @@ public class ShopStoreSameCityTransportBaseController { @ApiOperation(value = "获取同城配送运费设置详情", notes = "获取同城配送运费设置详情") @RequestMapping(value = "/detail", method = {RequestMethod.GET}) - public CommonResult shopStoreSameCityTransportBaseDetail(@RequestParam(name = "is_platfrom", defaultValue = "2") Integer isPlatform) { - return transportBaseService.ShopStoreSameCityTransportBaseDetail(isPlatform); + public CommonResult shopStoreSameCityTransportBaseDetail(@RequestParam(name = "store_id", required = false, defaultValue = "0") Long store_id) { + return transportBaseService.ShopStoreSameCityTransportBaseDetail(store_id); } @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 040b1028..de83613e 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 @@ -20,7 +20,7 @@ public class ShopStoreSameCityTransportBaseMobileController { @ApiOperation(value = "下单前检测同城订单配送是否符合要求", notes = "下单前检测同城订单配送是否符合要求") @RequestMapping(value = "/check/same-city/delivery", method = {RequestMethod.POST}) - public CommonResult checkSameCityDelivery(@RequestParam(name = "is_platfrom", defaultValue = "2") Integer isPlatform) { - return transportBaseService.ShopStoreSameCityTransportBaseDetail(isPlatform); + public CommonResult checkSameCityDelivery(@RequestParam(name = "store_id", required = false, defaultValue = "0") Long store_id) { + return transportBaseService.ShopStoreSameCityTransportBaseDetail(store_id); } } \ No newline at end of file diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreSameCityTransportBaseService.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreSameCityTransportBaseService.java index 037a86c1..1ceef44b 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreSameCityTransportBaseService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreSameCityTransportBaseService.java @@ -21,9 +21,10 @@ public interface ShopStoreSameCityTransportBaseService { /** * 获取同城配送设置详情信息 * + * @param storeId * @return */ - CommonResult ShopStoreSameCityTransportBaseDetail(Integer isPlatform); + CommonResult ShopStoreSameCityTransportBaseDetail(Long storeId); /** * 保存或更新同城配送各项设置 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 8579f4da..688e39e5 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 @@ -28,6 +28,7 @@ import com.suisung.mall.common.pojo.dto.DeliveryFeeResultDTO; import com.suisung.mall.common.pojo.dto.OrderCacDeliveryFeeDTO; import com.suisung.mall.common.pojo.dto.SameCityDeliveryFeeRespDTO; import com.suisung.mall.common.pojo.dto.ShopStoreSameCityTransportBaseDTO; +import com.suisung.mall.common.utils.CheckUtil; import com.suisung.mall.common.utils.CommonUtil; import com.suisung.mall.common.utils.I18nUtil; import com.suisung.mall.common.utils.PositionUtil; @@ -78,24 +79,30 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl 2) { - isPlatform = CommonConstant.Disable2; + Integer isPlatform = CommonConstant.Disable2; + if (user.isPlatform()) { + if (CheckUtil.isEmpty(storeId)) { + return CommonResult.failed("平台操作，请传入店铺Id"); + } + isPlatform = CommonConstant.Enable; + } else { + storeId = Convert.toLong(user.getStore_id()); } - Long storeId = Convert.toLong(user.getStore_id()); ShopStoreSameCityTransportBaseDTO retDTO = getShopStoreSameCityTransportBaseDTOById(storeId, isPlatform); if (retDTO == null) { - return CommonResult.failed("商家未设置店铺地址，请先设置店铺地址！"); + return CommonResult.failed("商家未设置店铺地址及经纬度相关信息，请先设置再试！"); } return CommonResult.success(retDTO); @@ -109,21 +116,30 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl pair = saveOrUpdateShopStoreSameCityTransportBase(transportBase); @@ -257,6 +274,7 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl