From 9552ca1443fb4401e4361a2f8b38c6a52eb151d0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 09 五月 2023 17:36:10 +0800
Subject: [PATCH] DEMO初步完成

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 56 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 e0ef299..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
@@ -5,13 +5,21 @@
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.shop.domain.dto.MerAgencyPageDto;
 import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
+import com.ruoyi.shop.domain.dto.MerShopCertificateEditDto;
+import com.ruoyi.shop.domain.dto.MerShopCertificateListDto;
 import com.ruoyi.shop.domain.vo.MerAgencyPageVo;
 import com.ruoyi.shop.domain.vo.MerMemberTaskPageVo;
+import com.ruoyi.shop.domain.vo.MerShopCertificateListVo;
 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;
@@ -38,6 +46,12 @@
     @Autowired
     private ShopService shopService;
 
+    @Autowired
+    private ShopCertificateService shopCertificateService;
+
+    @Autowired
+    private ShopStaffService shopStaffService;
+
     /**
      * 未完成实际统计
      * @param merBaseDto
@@ -63,4 +77,46 @@
         return R.ok(page.setRecords(merAgencyPageVoList));
     }
 
+    @RequestMapping(value = "/listShopCertificate", method = RequestMethod.POST)
+    @ApiOperation(value = "获取商户证书列表")
+    public R<List<MerShopCertificateListVo>> listShopCertificate(@RequestBody MerShopCertificateListDto merShopCertificateListDto) {
+        Long userId = SecurityUtils.getUserId();
+        List<MerShopCertificateListVo> merShopCertificateListVoList = shopCertificateService.listShopCertificateVo(merShopCertificateListDto);
+        return R.ok(merShopCertificateListVoList);
+    }
+
+    @RequestMapping(value = "/editShopCertificate", method = RequestMethod.POST)
+    @ApiOperation(value = "编辑商户证书")
+    public R editShopCertificate(@RequestBody MerShopCertificateEditDto merShopCertificateEditDto) {
+        Long userId = SecurityUtils.getUserId();
+        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