bug

jiangqs

2023-08-08 2d20929b57b4562959f355d20a09a474d46939dd

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java

@@ -61,7 +61,8 @@
    @ApiOperation(value = "获取商户端商业统计")
    public R<MerHomeShopTotalVo> getMerHomeTotal(@RequestBody MerBaseDto merBaseDto) {
        Long userId = SecurityUtils.getUserId();
        MerHomeShopTotalVo merHomeShopTotalVo = shopService.getMerHomeTotal(userId);
        merBaseDto.setUserId(userId);
        MerHomeShopTotalVo merHomeShopTotalVo = shopService.getMerHomeTotal(merBaseDto);
        return R.ok(merHomeShopTotalVo);
    }

@@ -116,7 +117,16 @@
    public R editShopStaffInfo(@RequestBody MerEditUserDto merEditUserDto) {
        Long userId = SecurityUtils.getUserId();
        merEditUserDto.setUserId(userId);
        shopStaffService.editShopStaffInfo(merEditUserDto);
        if(merEditUserDto.getEditType()!=5){
            shopStaffService.editShopStaffInfo(merEditUserDto);
        }else{
            Shop shop = shopService.getByShopId(merEditUserDto.getShopId());
            String editValue = merEditUserDto.getEditValue();
            String[] editArr = editValue.split("-");
            shop.setBusinessStartTime(editArr[0]);
            shop.setBusinessEndTime(editArr[1]);
            shopService.saveOrUpdate(shop);
        }
        return R.ok();
    }