Merge remote-tracking branch 'origin/master' into test

sys-api-service/src/main/java/com/xy/service/UserInfoServiceImpl.java

@@ -238,13 +238,16 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     @ApiOperation("删除用户")
     @Override
     public R del(@RequestBody @Validated UserInfoDto.DelDto dto) {
+        List<Long> userIds = dto.getId();
+        List<UserInfo> userInfos = this.listByIds(userIds);
+        List<Long> authUserIds = userInfos.stream().map(UserInfo::getAuthorizeUserId).collect(Collectors.toList());
         // sys_work_user 权限用户表
-        R r = sysWorkUserService.del(copy(DelDto.class, dto));
+        R r = sysWorkUserService.del(new DelDto().setId(authUserIds));
         if (R.Enum.SUCCESS.getCode() != r.getCode()) {
             return R.fail(r.getMsg());
         }
         // user_info 用户表
-        return R.ok(removeBatchByIds(dto.getId()));
+        return R.ok(removeBatchByIds(userIds));
     }
 
     @PostMapping("webUserMqtt")

sys-api/src/main/java/com/xy/enums/SmsSceneEnum.java

@@ -22,7 +22,9 @@ public enum SmsSceneEnum {
     B_PAY_ACCOUNT_ALIPAY_FACE_CONFIG(6, "商户信息修改 - 支付刷脸收款号配置"),
     C_UN_PAY_NOTIFY(7, "C端订单 - 余额不足-未支付"),
     C_FILL_ORDER_NOTIFY(8, "C端订单 - 补单"),
-    B_CHANGE_TEL(9, "B端个人中心 - 修改手机号");
+    B_CHANGE_TEL(9, "B端个人中心 - 修改手机号"),
+    B_EXTRA_FEE_CONFIG(10, "商管端 - 佣金配置"),
+    B_SEPARATE_ACCOUNT(11, "商管端 - 分账比例配置");
 
 
     /**