列表点开可展示接收短信手机号码，列表手机号码来源，可输入新增、可从用户库里选择，选择支持单选、多选、全选，列表手机号可增减

crmeb-admin/src/main/java/com/zbkj/admin/controller/merchant/NewMerchantApi.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.zbkj.admin.controller.newapi.request.ProductAttrValueIntegralRequest;
 import com.zbkj.admin.service.AAAService;
 import com.zbkj.admin.service.FinanceService;
@@ -22,6 +23,7 @@ import com.zbkj.common.model.order.Order;
 import com.zbkj.common.model.product.Product;
 import com.zbkj.common.model.product.ProductAttrValue;
 
+import com.zbkj.common.model.system.TaskMessage;
 import com.zbkj.common.model.user.User;
 import com.zbkj.common.model.user.UserBypassAccount;
 import com.zbkj.common.model.user.UserEnterprise;
@@ -43,10 +45,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 
 /**
  * @Created by:   zhulei
@@ -103,6 +102,8 @@ public class NewMerchantApi {
     private FinanceService financeService;
     @Autowired
     private DynamicScheduledTask dynamicScheduledTask;
+    @Autowired
+    private TaskMessageService taskMessageService;
 
 
     //    @PreAuthorize("hasAuthority('merchant:productAttrValueIntegral:edit')")
@@ -450,23 +451,19 @@ public class NewMerchantApi {
     public CommonResult<CommonPage<User>> getPhoneList(@RequestParam(value = "isMessage") String isMessage,
                                                        @ModelAttribute PageParamRequest pageParamRequest) {
         SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser();
-        Page<Order> orderPage = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-
-        List<Integer> orderUid = orderService.getPhoneList(systemAdmin.getMerId());
-        LambdaQueryWrapper<User> queryWrapper2 = new LambdaQueryWrapper<>();
 
-        queryWrapper2.in(User::getId, orderUid);
-
-        List<User> UserList = userService.list(queryWrapper2);
+        PageInfo<User> userPageInfo = orderService.getPhoneList(systemAdmin.getMerId(),pageParamRequest);
 
-        CommonPage<User> userCommonPage = CommonPage.restPage(CommonPage.copyPageInfo(orderPage, UserList));
+        CommonPage<User> userCommonPage = CommonPage.restPage(userPageInfo);
         return CommonResult.success(userCommonPage);
     }
 
     @ApiOperation(value = "发送短信手机号保存")
-    @RequestMapping(value = "/getPhoneList", method = RequestMethod.POST)
-    public CommonResult<?> getPhoneList(@RequestBody List<User> user) {
-        userService.updateBatchById(user);
+    @RequestMapping(value = "/savePhone", method = RequestMethod.POST)
+    public CommonResult<?> savePhone(@RequestBody List<User> user) {
+        SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser();
+
+        userService.savePhone(user, systemAdmin);
         return CommonResult.success("操作成功");
 
     }

crmeb-common/src/main/java/com/zbkj/common/model/system/TaskMessage.java

@@ -31,19 +31,19 @@ public class TaskMessage implements Serializable {
 
     @ApiModelProperty(value = "配置id")
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Integer id;
+    private String id;
 
     @ApiModelProperty(value = "真实姓名")
-    private String realName;
+    private String nickName;
 
     @ApiModelProperty(value = "用户Id")
-    private String uid;
+    private Integer uid;
 
     @ApiModelProperty(value = "手机号")
     private String phone;
 
     @ApiModelProperty(value = "商户id")
-    private String merId;
+    private Integer merId;
 
     @ApiModelProperty(value = "商户名称")
     private String merName;

crmeb-service/src/main/java/com/zbkj/service/dao/TaskMessageDao.java

@@ -0,0 +1,13 @@
+package com.zbkj.service.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zbkj.common.model.alipay.AliPayInfo;
+import com.zbkj.common.model.system.TaskMessage;
+
+import java.util.List;
+
+
+public interface TaskMessageDao extends BaseMapper<TaskMessage> {
+
+    List<TaskMessage> getMerByMerId(Integer merId);
+}

crmeb-service/src/main/java/com/zbkj/service/service/OrderService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.zbkj.common.model.order.Order;
 import com.zbkj.common.model.order.OrderDetail;
+import com.zbkj.common.model.user.User;
 import com.zbkj.common.request.OrderRemarkRequest;
 import com.zbkj.common.request.OrderSearchRequest;
 import com.zbkj.common.request.OrderSendRequest;
@@ -276,5 +277,5 @@ public interface OrderService extends IService<Order> {
 
     List<Integer> getOrderUid();
 
-    List<Integer> getPhoneList(Integer merId);
+    PageInfo<User> getPhoneList(Integer merId,PageParamRequest pageParamRequest);
 }

crmeb-service/src/main/java/com/zbkj/service/service/TaskMessageService.java

@@ -0,0 +1,22 @@
+package com.zbkj.service.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
+import com.zbkj.common.model.admin.SystemAdmin;
+import com.zbkj.common.model.system.TaskMessage;
+import com.zbkj.common.model.user.User;
+import com.zbkj.common.request.*;
+import com.zbkj.common.response.*;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.PrimitiveIterator;
+
+
+public interface TaskMessageService extends IService<TaskMessage> {
+
+
+     List<TaskMessage> getMerByMerId(Integer merId);
+}

crmeb-service/src/main/java/com/zbkj/service/service/UserService.java

@@ -2,6 +2,7 @@ package com.zbkj.service.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
+import com.zbkj.common.model.admin.SystemAdmin;
 import com.zbkj.common.model.user.User;
 import com.zbkj.common.request.*;
 import com.zbkj.common.response.*;
@@ -316,4 +317,11 @@ public interface UserService extends IService<User> {
      * @param id 用户ID
      */
     UserAdminDetailResponse getAdminDetail(Integer id);
+
+    /**
+     * 手机号定时任务保存
+     * @param user
+     * @param systemAdmin
+     */
+    void savePhone(List<User> user, SystemAdmin systemAdmin);
 }

crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java

@@ -21,6 +21,7 @@ import com.zbkj.common.model.express.Express;
 import com.zbkj.common.model.merchant.Merchant;
 import com.zbkj.common.model.order.*;
 import com.zbkj.common.model.system.SystemNotification;
+import com.zbkj.common.model.system.TaskMessage;
 import com.zbkj.common.model.user.User;
 import com.zbkj.common.model.user.UserBypassAccount;
 import com.zbkj.common.model.user.UserEnterprise;
@@ -92,9 +93,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
     @Autowired
     private SystemNotificationServiceImpl systemNotificationService;
     @Autowired
-    private UserEnterpriseService userEnterpriseService;
+    private OrderService orderService;
     @Autowired
-    private UserBypassAccountService userBypassAccountService;
+    private TaskMessageService taskMessageService;
+    @Autowired
+    private OrderDao orderDao;
 
     /**
      * 根据订单编号获取订单
@@ -1034,8 +1037,31 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         return dao.getProductNumCount(uid, proId, productType);
     }
     @Override
-    public List<Integer> getPhoneList(Integer merId) {
-        return dao.getPhoneList(merId);
+    public PageInfo<User> getPhoneList(Integer merId,PageParamRequest pageParamRequest) {
+        Page<Order> orderPage = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
+
+        List<Integer> orderUid = orderDao.getPhoneList(merId);
+        LambdaQueryWrapper<User> queryWrapper2 = new LambdaQueryWrapper<>();
+
+        queryWrapper2.in(User::getId, orderUid);
+
+        List<User> UserList = userService.list(queryWrapper2);
+
+
+        List<TaskMessage> taskMessages = taskMessageService.getMerByMerId(merId);
+        //如果下过订单的用户手机号存在定时任务发送手机号的列表中则不显示该条信息
+        if (null != taskMessages && taskMessages.size() > 0) {
+            for (TaskMessage taskMessage : taskMessages) {
+                for (int i = 0; i < UserList.size(); i++) {
+                    if (UserList.get(i).getPhone().equals(taskMessage.getPhone())) {
+                        UserList.remove(i);
+                        continue;
+                    }
+                }
+            }
+        }
+        PageInfo<User> userPageInfo = CommonPage.copyPageInfo(orderPage, UserList);
+        return userPageInfo;
     }
     @Override
     public List<Integer> getOrderUid() {

crmeb-service/src/main/java/com/zbkj/service/service/impl/TaskMessageServiceImpl.java

@@ -0,0 +1,56 @@
+package com.zbkj.service.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.URLUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.zbkj.common.config.CrmebConfig;
+import com.zbkj.common.constants.DateConstants;
+import com.zbkj.common.constants.ProductConstants;
+import com.zbkj.common.model.acticitystyle.ActivityStyle;
+import com.zbkj.common.model.product.Product;
+import com.zbkj.common.model.system.TaskMessage;
+import com.zbkj.common.request.ActivityStyleSearchRequest;
+import com.zbkj.common.request.PageParamRequest;
+import com.zbkj.common.response.ActivityStyleResponse;
+import com.zbkj.common.utils.CrmebDateUtil;
+import com.zbkj.common.utils.RedisUtil;
+import com.zbkj.service.dao.ActivityStyleDao;
+import com.zbkj.service.dao.TaskMessageDao;
+import com.zbkj.service.service.ActivityStyleService;
+import com.zbkj.service.service.TaskMessageService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * 活动样式
+ *
+ * @author dazongzi
+ * @description ActivityStyleServiceImpl 接口实现
+ * @date 2023-01-05
+ */
+@Service
+public class TaskMessageServiceImpl extends ServiceImpl<TaskMessageDao, TaskMessage> implements TaskMessageService {
+
+    @Autowired
+    private TaskMessageDao taskMessageDao;
+
+    @Override
+    public List<TaskMessage> getMerByMerId(Integer merId) {
+        return taskMessageDao.getMerByMerId(merId);
+    }
+}
+

crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java

@@ -20,6 +20,7 @@ import com.zbkj.common.exception.CrmebException;
 import com.zbkj.common.model.admin.SystemAdmin;
 import com.zbkj.common.model.bill.Bill;
 import com.zbkj.common.model.bill.UserBill;
+import com.zbkj.common.model.system.TaskMessage;
 import com.zbkj.common.model.user.User;
 import com.zbkj.common.model.user.UserBalanceRecord;
 import com.zbkj.common.model.user.UserIntegralRecord;
@@ -89,6 +90,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
     private ProductRelationService productRelationService;
     @Autowired
     private UserMerchantCollectService userMerchantCollectService;
+    @Autowired
+    private TaskMessageService taskMessageService;
 
     /**
      * 手机号注册用户
@@ -1201,6 +1204,19 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
         return response;
     }
 
+    @Override
+    public void savePhone(List<User> users, SystemAdmin systemAdmin) {
+        for (User user : users) {
+            TaskMessage taskMessage = new TaskMessage();
+            taskMessage.setId(UUID.randomUUID().toString().replace("-",""));
+            taskMessage.setIsMessage("1");
+            taskMessage.setMerId(systemAdmin.getMerId());
+            taskMessage.setUid(user.getId());
+            taskMessage.setNickName(user.getNickname());
+            taskMessageService.save(taskMessage);
+        }
+    }
+
     /**
      * 批量清除用户推广人
      * @param spreadUid 推广人id

crmeb-service/src/main/resources/mapper/system/TaskMessageMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zbkj.service.dao.TaskMessageDao">
+
+<select id="getMerByMerId" parameterType="java.lang.Integer" resultType="com.zbkj.common.model.system.TaskMessage">
+    select * from eb_task_message where mer_id =#{merId}
+    </select>
+</mapper>