Merge remote-tracking branch 'origin/master'

cash-api/account-server/src/main/java/com/czg/controller/admin/ShopStaffController.java

@@ -1,9 +1,12 @@
 package com.czg.controller.admin;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.czg.account.dto.staff.ShopStaffAddDTO;
 import com.czg.account.dto.staff.ShopStaffEditDTO;
 import com.czg.account.dto.staff.ShopStaffRemoveDTO;
+import com.czg.account.entity.ShopInfo;
 import com.czg.account.entity.ShopStaff;
+import com.czg.account.service.ShopInfoService;
 import com.czg.account.service.ShopStaffService;
 import com.czg.annotation.SaAdminCheckPermission;
 import com.czg.resp.CzgResult;
@@ -27,6 +30,8 @@ public class ShopStaffController {
 
     @Resource
     private ShopStaffService shopStaffService;
+    @Resource
+    private ShopInfoService shopInfoService;
 
     /**
      * 员工列表
@@ -35,7 +40,7 @@ public class ShopStaffController {
      * @param code 员工编号
      * @return 分页数据
      */
-    @SaAdminCheckPermission("shopStaff:list")
+    @SaAdminCheckPermission(value = "shopStaff:list", name = "员工列表")
     @GetMapping
     public CzgResult<Page<ShopStaff>> list(String name, String code) {
         return CzgResult.success(shopStaffService.get(name, code));
@@ -46,7 +51,7 @@ public class ShopStaffController {
      * 权限标识: shopStaff:permission
      * @return 权限id集合
      */
-    @SaAdminCheckPermission("shopStaff:permission")
+    @SaAdminCheckPermission(value = "shopStaff:permission", name =  "获取员工对应的权限id")
     @GetMapping("/permission")
     public CzgResult<List<Long>> permission(@RequestParam Long id) {
         return CzgResult.success(shopStaffService.permission(id));
@@ -62,7 +67,8 @@ public class ShopStaffController {
             return CzgResult.success(shopStaffService.getOne(new QueryWrapper().eq(ShopStaff::getShopId, StpKit.USER.getShopId()).eq(ShopStaff::getId, StpKit.USER.getLoginIdAsLong())));
         }
 
-        return CzgResult.success();
+        ShopInfo shopInfo = shopInfoService.getById(StpKit.USER.getShopId());
+        return CzgResult.success(BeanUtil.copyProperties(shopInfo, ShopStaff.class));
     }
 
     /**
@@ -71,7 +77,7 @@ public class ShopStaffController {
      * @param id shopStaff id
      * @return 详细信息
      */
-    @SaAdminCheckPermission("shopStaff:detail")
+    @SaAdminCheckPermission(value = "shopStaff:detail", name = "员工详情")
     @GetMapping("/detail")
     public CzgResult<ShopStaff> detail(@RequestParam Long id) {
         return CzgResult.success(shopStaffService.detail(StpKit.USER.getShopId(), id));
@@ -83,7 +89,7 @@ public class ShopStaffController {
      * @param shopStaffAddDTO 添加信息
      * @return 是否成功
      */
-    @SaAdminCheckPermission("shopStaff:add")
+    @SaAdminCheckPermission(value = "shopStaff:add", name = "员工添加")
     @PostMapping
     public CzgResult<Boolean> add(@RequestBody @Validated ShopStaffAddDTO shopStaffAddDTO) {
         return CzgResult.success(shopStaffService.add(shopStaffAddDTO));
@@ -95,7 +101,7 @@ public class ShopStaffController {
      * @param shopStaffEditDTO 添加信息
      * @return 是否成功
      */
-    @SaAdminCheckPermission("shopStaff:edit")
+    @SaAdminCheckPermission(value = "shopStaff:edit", name = "员工修改")
     @PutMapping
     public CzgResult<Boolean> edit(@RequestBody @Validated ShopStaffEditDTO shopStaffEditDTO) {
         return CzgResult.success(shopStaffService.edit(shopStaffEditDTO));
@@ -107,7 +113,7 @@ public class ShopStaffController {
      * @param shopStaffRemoveDTO 删除信息
      * @return 是否成功
      */
-    @SaAdminCheckPermission("shopStaff:del")
+    @SaAdminCheckPermission(value = "shopStaff:del", name = "员工删除")
     @DeleteMapping
     public CzgResult<Boolean> delete(@RequestBody @Validated ShopStaffRemoveDTO shopStaffRemoveDTO) {
         return CzgResult.success(shopStaffService.delete(shopStaffRemoveDTO));

cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsGroupServiceImpl.java

@@ -83,7 +83,7 @@ public class ConsGroupServiceImpl extends ServiceImpl<ConsGroupMapper, ConsGroup
             throw new CzgException("耗材分组已存在");
         }
         ConsGroup entity = BeanUtil.copyProperties(dto, ConsGroup.class);
-        entity.setStatus(StatusEnum.ENABLED.value());
+        //entity.setStatus(StatusEnum.ENABLED.value());
         entity.setShopId(shopId);
         super.save(entity);
         List<Long> consIds = dto.getConsIds();