Merge remote-tracking branch 'origin/master'

zhanglin8526

2023-05-09 c2d38efe0c2516295abb968442ef765e3da9544d

 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();
    }



}