From ab95fdd0d06f409b4f41ff9696f292248e86d9bc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 14 七月 2025 10:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java
index b450be5..349ac8d 100644
--- a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java
@@ -1,21 +1,29 @@
package cn.lili.controller.store;
+import cn.lili.base.Result;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.goods.entity.dos.GoodsUnit;
+import cn.lili.modules.goods.entity.dto.GoodsOperationDTO;
import cn.lili.modules.goods.entity.vos.StoreGoodsLabelVO;
+import cn.lili.modules.goods.service.GoodsService;
+import cn.lili.modules.goods.service.GoodsUnitService;
import cn.lili.modules.goods.service.StoreGoodsLabelService;
import cn.lili.modules.store.entity.dos.Store;
import cn.lili.modules.store.entity.dto.StoreBankDTO;
import cn.lili.modules.store.entity.dto.StoreCompanyDTO;
import cn.lili.modules.store.entity.dto.StoreOtherInfoDTO;
import cn.lili.modules.store.entity.vos.*;
+import cn.lili.modules.store.service.FreightTemplateService;
import cn.lili.modules.store.service.StoreDetailService;
import cn.lili.modules.store.service.StoreService;
+import cn.lili.mybatis.util.PageUtil;
import cn.lili.utils.COSUtil;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -24,8 +32,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.List;
+import java.util.Objects;
/**
@@ -56,6 +66,15 @@
private StoreDetailService storeDetailService;
@Autowired
private COSUtil cosUtil;
+
+ @Autowired
+ private FreightTemplateService freightTemplateService;
+
+ @Autowired
+ private GoodsUnitService goodsUnitService;
+
+ @Autowired
+ private GoodsService goodsService;
@ApiOperation(value = "鑾峰彇搴楅摵鍒楄〃鍒嗛〉")
@GetMapping
@@ -130,4 +149,25 @@
public ResultMessage<StoreDetailVO> apply() {
return ResultUtil.data(storeDetailService.getStoreDetailVOByMemberId(UserContext.getCurrentUser().getId()));
}
+
+
+ @ApiOperation(value = "鑾峰彇搴楅摵涓嬬殑鐗╂祦妯℃澘")
+ @GetMapping(value = "/freightTemplate")
+ public ResultMessage<List<FreightTemplateVO>> freightTemplate() {
+ String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
+ return ResultUtil.data(freightTemplateService.getFreightTemplateList(storeId));
+ }
+
+ @ApiOperation(value = "鑾峰彇搴楅摵涓嬬殑璁￠噺鍗曚綅")
+ @GetMapping(value = "/goods/unit")
+ public ResultMessage<IPage<GoodsUnit>> goodsUnit(PageVO pageVO) {
+ return ResultUtil.data(goodsUnitService.page(PageUtil.initPage(pageVO)));
+ }
+
+ @ApiOperation(value = "鏂板鍟嗗搧")
+ @PostMapping(value = "/goods/create", consumes = "application/json", produces = "application/json")
+ public ResultMessage<GoodsOperationDTO> save(@Valid @RequestBody GoodsOperationDTO goodsOperationDTO) {
+ goodsService.addGoods(goodsOperationDTO);
+ return ResultUtil.success();
+ }
}
--
Gitblit v1.8.0