From c2d38efe0c2516295abb968442ef765e3da9544d Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期二, 09 五月 2023 18:38:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
index d7a5533..c6a0eb7 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -13,9 +13,13 @@
import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
import com.ruoyi.shop.service.shop.ShopCertificateService;
import com.ruoyi.shop.service.shop.ShopService;
+import com.ruoyi.shop.service.shop.ShopStaffService;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
+import com.ruoyi.system.api.domain.dto.MerEditUserDto;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
+import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +48,9 @@
@Autowired
private ShopCertificateService shopCertificateService;
+
+ @Autowired
+ private ShopStaffService shopStaffService;
/**
* 未完成实际统计
@@ -85,4 +92,31 @@
shopCertificateService.editShopCertificate(merShopCertificateEditDto);
return R.ok();
}
+
+ @RequestMapping(value = "/deleteShopCertificate", method = RequestMethod.POST)
+ @ApiOperation(value = "删除商户证书")
+ public R deleteShopCertificate(@RequestBody MerBaseGetDto merBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ shopCertificateService.deleteShopCertificate(Long.valueOf(merBaseGetDto.getId()));
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/getShopStaffInfo", method = RequestMethod.POST)
+ @ApiOperation(value = "获取员工信息")
+ public R<MerStaffInfoVo> getShopStaffInfo() {
+ Long userId = SecurityUtils.getUserId();
+ MerStaffInfoVo merStaffInfoVo = shopStaffService.getShopStaffInfo(userId);
+ return R.ok(merStaffInfoVo);
+ }
+
+ @RequestMapping(value = "/editShopStaffInfo", method = RequestMethod.POST)
+ @ApiOperation(value = "修改员工信息")
+ public R editShopStaffInfo(@RequestBody MerEditUserDto merEditUserDto) {
+ Long userId = SecurityUtils.getUserId();
+ shopStaffService.editShopStaffInfo(merEditUserDto);
+ return R.ok();
+ }
+
+
+
}
--
Gitblit v1.7.1