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

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

@@ -1,12 +1,10 @@
 package com.xy.service;
 
-import cn.hutool.json.JSONUtil;
 import com.xy.dto.SmsDTO;
 import com.xy.dto.SmsSendCommonDTO;
 import com.xy.dto.SmsSendDTO;
 import com.xy.enums.SmsSceneEnum;
 import com.xy.error.CommRuntimeException;
-import com.xy.utils.AuthorizeUtils;
 import com.xy.utils.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,8 +40,8 @@ public class AliSmsServiceImpl implements AliSmsService {
         if (smsSceneEnum == null) {
             throw new CommRuntimeException("发送场景有误！");
         }
-        //发短信验证码
-        smsUtil.sendSmsCode(mobile, smsSceneEnum, AuthorizeUtils.getLoginId(String.class));
+        // 发短信验证码
+        smsUtil.sendSmsCode(mobile, smsSceneEnum, String.valueOf(smsSendDTO.getUserInfoId()));
         return R.ok();
     }
 
@@ -56,7 +54,7 @@ public class AliSmsServiceImpl implements AliSmsService {
         if (smsSceneEnum == null) {
             throw new CommRuntimeException("发送场景有误！");
         }
-        //发短信验证码
+        // 发短信验证码
         smsUtil.sendSmsCode(mobile, smsSceneEnum, String.valueOf(userInfoId));
         return R.ok();
     }
@@ -78,7 +76,7 @@ public class AliSmsServiceImpl implements AliSmsService {
             log.error("通用短信发送发送场景有误");
             throw new CommRuntimeException("发送场景有误！");
         }
-        //发短信验证码
+        // 发短信验证码
         smsUtil.sendSmsCommon(mobile, msgConfigId, templateParams);
         return R.ok();
     }

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

@@ -93,7 +93,10 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         if (userVo != null) {
             lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(selectList.getUserVo(), UserInfo.class).build();
         }
+
         lambdaQueryWrapper.in(CollUtil.isNotEmpty(userIds), UserInfo::getUserId, userIds);
+        lambdaQueryWrapper.likeRight(StrUtil.isNotEmpty(selectList.getNameQuery()), UserInfo::getName, selectList.getNameQuery());
+        lambdaQueryWrapper.likeRight(StrUtil.isNotEmpty(selectList.getTelQuery()), UserInfo::getTel, selectList.getTelQuery());
         List<UserInfo> list = list(lambdaQueryWrapper);
         return R.ok(copy(UserInfoDto.Vo.class, list));
     }
@@ -235,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/dto/UserInfoDto.java

@@ -34,6 +34,10 @@ public class UserInfoDto {
         private List<Long> userIds;
         @ApiModelProperty("用户对象Vo")
         private Vo userVo;
+        @ApiModelProperty("姓名查询")
+        private String nameQuery;
+        @ApiModelProperty("手机查询")
+        private String telQuery;
     }
 
 

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, "商管端 - 分账比例配置");
 
 
     /**