自提

buyer-api/src/main/java/cn/lili/controller/order/CartController.java

@@ -189,20 +189,38 @@ public class CartController {
         }
     }
 
+    @ApiOperation(value = "选择自提地址")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "storeAddressId", value = "自提地址id ", required = true, paramType = "query"),
+            @ApiImplicitParam(name = "way", value = "购物车类型 ", paramType = "query")
+    })
+    @GetMapping("/storeAddress")
+    public ResultMessage<Object> shippingSelfPickAddress(@NotNull(message = "自提地址ID不能为空") String storeAddressId,
+                                                 String way) {
+        try {
+            cartService.shippingSelfAddress(storeAddressId, way);
+            return ResultUtil.success();
+        } catch (ServiceException se) {
+            log.error(ResultCode.SHIPPING_NOT_APPLY.message(), se);
+            throw new ServiceException(ResultCode.SHIPPING_NOT_APPLY);
+        } catch (Exception e) {
+            log.error(ResultCode.CART_ERROR.message(), e);
+            throw new ServiceException(ResultCode.CART_ERROR);
+        }
+    }
+
     @ApiOperation(value = "选择配送方式")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "shippingMethod", value = "配送方式：SELF_PICK_UP(自提)," +
                     "LOCAL_TOWN_DELIVERY(同城配送)," +
                     "LOGISTICS(物流) ", required = true, paramType = "query"),
-            @ApiImplicitParam(name = "selleId", value = "店铺id", paramType = "query"),
             @ApiImplicitParam(name = "way", value = "购物车类型 ", paramType = "query")
     })
-    @GetMapping("/shippingMethod")
+    @PutMapping("/shippingMethod")
     public ResultMessage<Object> shippingMethod(@NotNull(message = "配送方式不能为空") String shippingMethod,
-                                                String selleId,
                                                 String way) {
         try {
-            cartService.shippingMethod(selleId, shippingMethod, way);
+            cartService.shippingMethod( shippingMethod, way);
             return ResultUtil.success();
         } catch (ServiceException se) {
             log.error(se.getMsg(), se);
@@ -213,6 +231,21 @@ public class CartController {
         }
     }
 
+    @ApiOperation(value = "获取用户可选择的物流方式")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "way", value = "购物车类型 ", paramType = "query")
+    })
+    @GetMapping("/shippingMethodList")
+    public ResultMessage<Object> shippingMethodList(String way) {
+        try {
+            return ResultUtil.data(cartService.shippingMethodList(way));
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            return ResultUtil.error(ResultCode.ERROR);
+        }
+    }
+
     @ApiOperation(value = "选择发票")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "way", value = "购物车购买：CART/立即购买：BUY_NOW/拼团购买：PINTUAN / 积分购买：POINT ", required = true, paramType = "query"),

buyer-api/src/main/java/cn/lili/controller/store/StoreAddressBuyerController.java

@@ -0,0 +1,53 @@
+package cn.lili.controller.store;
+
+import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.OperationalJudgment;
+import cn.lili.common.security.context.UserContext;
+import cn.lili.common.vo.PageVO;
+import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.store.entity.dos.StoreAddress;
+import cn.lili.modules.store.service.StoreAddressService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Objects;
+
+/**
+ * 买家端,商家地址（自提点）接口
+ *
+ * @author chc
+ * @since 2022/6/2114:46
+ */
+@RestController
+@Api(tags = "买家端,商家地址（自提点）接口")
+@RequestMapping("/buyer/store/address")
+public class StoreAddressBuyerController {
+
+    /**
+     * 店铺自提点
+     */
+    @Autowired
+    private StoreAddressService storeAddressService;
+
+    @ApiOperation(value = "获取商家自提点分页")
+    @ApiImplicitParam(name = "storeId", value = "店铺Id", required = true, dataType = "String", paramType = "path")
+    @GetMapping("/page/{storeId}")
+    public ResultMessage<IPage<StoreAddress>> get(PageVO pageVo,@PathVariable String storeId) {
+        return ResultUtil.data(storeAddressService.getStoreAddress(storeId, pageVo));
+    }
+
+    @ApiOperation(value = "获取商家自提点信息")
+    @ApiImplicitParam(name = "id", value = "自提点ID", required = true, paramType = "path")
+    @GetMapping("/{id}")
+    public ResultMessage<StoreAddress> get(@PathVariable String id) {
+        StoreAddress address = OperationalJudgment.judgment(storeAddressService.getById(id));
+        return ResultUtil.data(address);
+    }
+}