From 046aff7463c36b6438700144116258bdd841cbef Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Sun, 24 Nov 2024 14:41:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E8=AE=BE=E7=BD=AE=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E7=B1=BB=20=E6=B7=BB=E5=8A=A0=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...pStoreSameCityTransportBaseController.java | 31 +++++++++++++++++++
 .../store/service/ShopStoreBaseService.java   |  2 +-
 .../impl/ShopStoreBaseServiceImpl.java        |  4 +--
 ...StoreSameCityTransportBaseServiceImpl.java | 23 ++++++++++----
 4 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreSameCityTransportBaseController.java

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
new file mode 100644
index 00000000..81b7ce48
--- /dev/null
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreSameCityTransportBaseController.java
@@ -0,0 +1,31 @@
+package com.suisung.mall.shop.store.controller.admin;
+
+import com.suisung.mall.common.api.CommonResult;
+import com.suisung.mall.common.modules.store.ShopStorePrinter;
+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;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags = "门店打票机打印业务")
+@RestController
+@RequestMapping("/admin/shop/store/same-city-transport")
+public class ShopStoreSameCityTransportBaseController {
+
+    @Resource
+    private ShopStoreSameCityTransportBaseService transportBaseService;
+
+    @ApiOperation(value = "同城配送运费设置详情", notes = "同城配送运费设置详情")
+    @RequestMapping(value = "/detail", method = {RequestMethod.GET})
+    public CommonResult shopStorePrinterDetail() {
+        return transportBaseService.ShopStoreSameCityTransportBaseDetail();
+    }
+
+}
\ No newline at end of file
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreBaseService.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreBaseService.java
index 9d53a565..7920da31 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreBaseService.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreBaseService.java
@@ -96,5 +96,5 @@ public interface ShopStoreBaseService extends IBaseService<ShopStoreBase> {
      * @param store_id
      * @return
      */
-    ShopStoreBase storeBase(Integer store_id);
+    ShopStoreBase getShopStoreBaseByStoreId(Integer store_id);
 }
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
index 0b833dca..688faf4b 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
@@ -2811,14 +2811,14 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
      * @param store_id
      * @return
      */
-    @Override
-    public ShopStoreBase storeBase(Integer store_id) {
+    public ShopStoreBase getShopStoreBaseByStoreId(Integer store_id) {
         if (store_id == null || store_id <= 0) {
             return null;
         }
 
         QueryWrapper<ShopStoreBase> queryWrapper = new QueryWrapper();
         queryWrapper.eq("store_id", store_id);
+
         return getOne(queryWrapper);
     }
 
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 69e28b4a..3c1add7f 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
@@ -12,20 +12,24 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.suisung.mall.common.api.CommonResult;
+import com.suisung.mall.common.constant.ConstantError;
 import com.suisung.mall.common.domain.UserDto;
 import com.suisung.mall.common.modules.store.ShopStoreBase;
 import com.suisung.mall.common.modules.store.ShopStoreSameCityTransport;
 import com.suisung.mall.common.modules.store.ShopStoreSameCityTransportBase;
 import com.suisung.mall.common.pojo.dto.ShopStoreSameCityTransportBaseDTO;
 import com.suisung.mall.core.web.service.impl.BaseServiceImpl;
+import com.suisung.mall.shop.chain.controller.admin.ShopChainUserController;
 import com.suisung.mall.shop.store.mapper.ShopStoreSameCityTransportBaseMapper;
 import com.suisung.mall.shop.store.service.ShopStoreBaseService;
 import com.suisung.mall.shop.store.service.ShopStoreSameCityTransportBaseService;
 import com.suisung.mall.shop.store.service.ShopStoreSameCityTransportService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 import static com.suisung.mall.common.utils.ContextUtil.getCurrentUser;
@@ -38,6 +42,8 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
 
     @Resource
     private ShopStoreBaseService shopStoreBaseService;
+    @Autowired
+    private ShopChainUserController user;
 
     /**
      * 获取同城配送设置详情信息
@@ -47,12 +53,12 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
     @Override
     public CommonResult ShopStoreSameCityTransportBaseDetail() {
         // 判断有没有权限
-        UserDto user = getCurrentUser();
-        if (user == null || !user.isStore()) {
-            return CommonResult.failed("无权限操作!");
-        }
+//        UserDto user = getCurrentUser();
+//        if (user == null || !user.isStore()) {
+//            return CommonResult.failed("无权限操作!");
+//        }
 
-        Long storeId = Convert.toLong(user.getStore_id());
+        Long storeId = 2L; //Convert.toLong(user.getStore_id());
         ShopStoreSameCityTransportBaseDTO retDTO = getDetailById(storeId);
         if (retDTO == null) {
             return CommonResult.failed("商家未设置店铺地址，请先设置店铺地址！");
@@ -109,7 +115,7 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
         }
 
         // 店铺基本信息
-        ShopStoreBase shopStoreBase = shopStoreBaseService.storeBase(storeId.intValue());
+        ShopStoreBase shopStoreBase = shopStoreBaseService.getShopStoreBaseByStoreId(storeId.intValue());
         if (shopStoreBase == null) {
             return null;
         }
@@ -132,6 +138,11 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
             transportBase.setDistance_increase_fee(BigDecimal.valueOf(1));
             transportBase.setWeight_increase_kg(1);
             transportBase.setWeight_increase_fee(BigDecimal.valueOf(1));
+            transportBase.setStatus(ConstantError.Enable);
+
+            Date now = new Date();
+            transportBase.setCreated_at(now);
+            transportBase.setUpdated_at(transportBase.getCreated_at());
 
             // 从 shop_store_base 表获取店铺的地址和经纬度
             transportBase.setStore_address(StrUtil.removeAll(shopStoreBase.getStore_area(), "/") + shopStoreBase.getStore_address());