From b4fd278f1d61f8d664c600397cc0f17564678131 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 17 四月 2021 17:36:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
index 6a69217..08c9f33 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -2,11 +2,14 @@
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.*;
+import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
+import com.panzhihua.service_community.service.ComShopOperLogService;
import com.panzhihua.service_community.service.ComShopStoreService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
@@ -23,6 +26,8 @@
@Resource
private ComShopStoreService comShopStoreService;
+ @Resource
+ private ComShopOperLogService comShopOperLogService;
@Resource
private ComShopGoodsService comShopGoodsService;
@Resource
@@ -87,7 +92,27 @@
return comShopStoreService.getOneInfo(id);
}
+ /**
+ * 添加商城后台日志
+ *
+ * @param shopOperlog 商城日志
+ * @return 添加结果
+ */
+ @PostMapping("/addShopOperLog")
+ public R addShopOperLog(@RequestBody ShopOperLogVO shopOperlog) {
+ return comShopOperLogService.saveLog(shopOperlog);
+ }
+
+ /**
+ * 分页查询 商家后台操作日志
+ * @param pageDTO 分页数据
+ * @return 分页日志
+ */
+ @PostMapping("/pageShopOperLog")
+ public R pageShopOperLog(@RequestBody PageDTO pageDTO) {
+ return comShopOperLogService.pageShopOperLog(pageDTO);
+ }
/**
* 根据店铺id查询店铺详情
* @param comShopStoreDTO 请求参数
--
Gitblit v1.7.1