code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'clerk' and 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop into clerk

Browse Source
This commit is contained in:
fengtianyangyang
2022-03-03 17:44:53 +08:00
parent d5091bf659 f4d7c07f57
commit 4d551366ed
284 changed files with 922 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seller-api/src/main/java/cn/lili/StoreApiApplication.java
View File

@@ -28,7 +28,7 @@ public class StoreApiApplication {
}
public static void main(String[] args) {
System.setProperty("rocketmq.client.logUseSlf4j","true");
System.setProperty("es.set.netty.runtime.available.processors", "false");
SpringApplication.run(StoreApiApplication.class, args);
}

2
seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java
View File

@@ -29,7 +29,7 @@ import java.util.Objects;
*/
@RestController
@Api(tags = "店铺端,分销商品接口")
@RequestMapping("/store/distributionGoods")
@RequestMapping("/store/distribution/goods")
public class DistributionGoodsStoreController {
/**

2
seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java
View File

@@ -24,7 +24,7 @@ import java.util.Objects;
*/
@RestController
@Api(tags = "店铺端,分销订单接口")
@RequestMapping("/store/distributionOrder")
@RequestMapping("/store/distribution/order")
public class DistributionOrderStoreController {
/**

3
seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java
View File

@@ -6,7 +6,6 @@ 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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +21,7 @@ import java.util.List;
*/
@RestController
@Api(tags = "店铺端,分类绑定参数组管理接口")
@RequestMapping("/store/goods/category/parameters")
@RequestMapping("/store/goods/categoryParameters")
public class CategoryParameterGroupStoreController {

3
seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java
View File

@@ -6,7 +6,6 @@ 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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +21,7 @@ import java.util.List;
*/
@RestController
@Api(tags = "店铺端,商品分类规格接口")
@RequestMapping("/store/goods/category/spec")
@RequestMapping("/store/goods/categorySpec")
public class CategorySpecificationStoreController {
@Autowired
private CategorySpecificationService categorySpecificationService;

1
seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java
View File

@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;

2
seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java
View File

@@ -27,7 +27,7 @@ import java.util.Objects;
*/
@RestController
@Api(tags = "店铺端,草稿商品接口")
@RequestMapping("/store/draft/goods")
@RequestMapping("/store/goods/draftGoods")
public class DraftGoodsStoreController {
@Autowired
private DraftGoodsService draftGoodsService;

2
seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
View File

@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
*/
@RestController
@Api(tags = "店铺端,商品接口")
@RequestMapping("/store/goods")
@RequestMapping("/store/goods/goods")
public class GoodsStoreController {
/**

5
seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java
View File

@@ -1,17 +1,16 @@
package cn.lili.controller.goods;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.enums.ResultUtil;
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.service.GoodsUnitService;
import cn.lili.mybatis.util.PageUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -24,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
*/
@RestController
@Api(tags = "店铺端,商品计量单位接口")
@RequestMapping("/store/goods/unit")
@RequestMapping("/store/goods/goodsUnit")
public class GoodsUnitStoreController {
@Autowired
private GoodsUnitService goodsUnitService;

2
seller-api/src/main/java/cn/lili/controller/member/BillStoreController.java
View File

@@ -31,7 +31,7 @@ import java.util.Objects;
*/
@RestController
@Api(tags = "店铺端,结算单接口")
@RequestMapping("/store/bill")
@RequestMapping("/store/order/bill")
public class BillStoreController {
@Autowired

2
seller-api/src/main/java/cn/lili/controller/member/MemberEvaluationStoreController.java
View File

@@ -26,7 +26,7 @@ import java.util.Objects;
*/
@RestController
@Api(tags = "店铺端,商品评价管理接口")
@RequestMapping("/store/memberEvaluation")
@RequestMapping("/store/member/evaluation")
public class MemberEvaluationStoreController {
@Autowired

2
seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java
View File

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
*/
@RestController
@Api(tags = "店铺端,管理员接口")
@RequestMapping("/store/user")
@RequestMapping("/store/member/user")
public class StoreUserController {
@Autowired
private MemberService memberService;

2
seller-api/src/main/java/cn/lili/controller/message/StoreMessageController.java
View File

@@ -29,7 +29,7 @@ import java.util.Objects;
*/
@RestController
@Api(tags = "店铺端,消息接口")
@RequestMapping("/store/message")
@RequestMapping("/store/message/storeMessage")
public class StoreMessageController {
/**

2
seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java
View File

@@ -31,7 +31,7 @@ import java.util.Objects;
*/
@RestController
@Api(tags = "店铺端,售后管理接口")
@RequestMapping("/store/afterSale")
@RequestMapping("/store/order/afterSale")
public class AfterSaleStoreController {
@Autowired

2
seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java
View File

@@ -30,7 +30,7 @@ import java.util.Objects;
**/
@RestController
@Api(tags = "店铺端,交易投诉接口")
@RequestMapping("/store/complain")
@RequestMapping("/store/order/complain")
public class OrderComplaintStoreController {
/**

2
seller-api/src/main/java/cn/lili/controller/order/OrderLogStoreController.java
View File

@@ -25,7 +25,7 @@ import java.util.List;
**/
@RestController
@Api(tags = "店铺端,订单日志接口")
@RequestMapping("/store/orderLog")
@RequestMapping("/store/order/orderLog")
public class OrderLogStoreController {
@Autowired

2
seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
View File

@@ -41,7 +41,7 @@ import java.util.Objects;
**/
@Slf4j
@RestController
@RequestMapping("/store/orders")
@RequestMapping("/store/order/order")
@Api(tags = "店铺端,订单接口")
public class OrderStoreController {

2
seller-api/src/main/java/cn/lili/controller/order/ReceiptStoreController.java
View File

@@ -27,7 +27,7 @@ import java.util.Objects;
**/
@RestController
@Api(tags = "店铺端,发票接口")
@RequestMapping("/store/receipt")
@RequestMapping("/store/trade/receipt")
public class ReceiptStoreController {
@Autowired

4
seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java → seller-api/src/main/java/cn/lili/controller/other/ArticleStoreController.java
View File

@@ -1,4 +1,4 @@
package cn.lili.controller.other.article;
package cn.lili.controller.other;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
*/
@RestController
@Api(tags = "店铺端,文章接口")
@RequestMapping("/store/article")
@RequestMapping("/store/other/article")
public class ArticleStoreController {
/**

4
seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java → seller-api/src/main/java/cn/lili/controller/other/LogisticsStoreController.java
View File

@@ -1,4 +1,4 @@
package cn.lili.controller.settings;
package cn.lili.controller.other;
import cn.lili.common.enums.ResultUtil;
@@ -25,7 +25,7 @@ import java.util.Objects;
*/
@RestController
@Api(tags = "店铺端,物流公司接口")
@RequestMapping("/store/logistics")
@RequestMapping("/store/other/logistics")
public class LogisticsStoreController {
/**

2
seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java
View File

@@ -32,7 +32,7 @@ import javax.validation.constraints.NotNull;
@RestController
@Api(tags = "店铺端,商家登录接口 ")
@RequestMapping("/store/login")
@RequestMapping("/store/passport/login")
public class StorePassportController {
/**

2
seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java
View File

@@ -24,7 +24,7 @@ import java.util.Objects;
**/
@RestController
@Api(tags = "店铺端,运费模板接口")
@RequestMapping("/store/freightTemplate")
@RequestMapping("/store/setting/freightTemplate")
public class FreightTemplateStoreController {
@Autowired
private FreightTemplateService freightTemplateService;

2
seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java
View File

@@ -25,7 +25,7 @@ import java.util.Objects;
*/
@RestController
@Api(tags = "店铺端,日志管理接口")
@RequestMapping("/store/log")
@RequestMapping("/store/settings/log")
public class LogStoreController {
@Autowired
private SystemLogService systemLogService;

2
seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java
View File

@@ -26,7 +26,7 @@ import java.util.Objects;
*/
@RestController
@Api(tags = "店铺端,商家地址（自提点）接口")
@RequestMapping("/store/storeAddress")
@RequestMapping("/store/member/storeAddress")
public class StoreAddressController {
/**

2
seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java
View File

@@ -31,7 +31,7 @@ import java.util.Objects;
*/
@RestController
@Api(tags = "店铺端,页面接口")
@RequestMapping("/store/pageData")
@RequestMapping("/store/settings/pageData")
public class StorePageDataController {
@Autowired
private PageDataService pageDataService;

2
seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java
View File

@@ -27,7 +27,7 @@ import javax.validation.Valid;
*/
@RestController
@Api(tags = "店铺端,店铺设置接口")
@RequestMapping("/store/settings")
@RequestMapping("/store/settings/storeSettings")
public class StoreSettingsController {
/**

2
seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java
View File

@@ -25,7 +25,7 @@ import java.util.Objects;
*/
@Api(tags = "店铺端,退款统计接口")
@RestController
@RequestMapping("/store/statistics/refund/order")
@RequestMapping("/store/statistics/refundOrder")
public class RefundOrderStatisticsStoreController {
@Autowired