定时任务接口

组织机构字段更改

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

@@ -463,25 +463,29 @@ public class NewMerchantApi {
 
     @ApiOperation(value = "获取已经发送手机号根据登录merId")
     @RequestMapping(value = "/getPhoneNoList", method = RequestMethod.POST)
-    public CommonResult<?> getPhoneNoList(@ModelAttribute @Validated User request,
+    public CommonResult<?> getPhoneNoList(@RequestParam(value = "id") String id,
                                           @Validated PageParamRequest pageParamRequest) {
-        SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser();
-        LambdaQueryWrapper<TaskMessage> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TaskMessage::getMerId, systemAdmin.getMerId());
-        queryWrapper.eq(TaskMessage::getIsMessage, "1");
-        Page<TaskMessage> page = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-        List<TaskMessage> list = taskMessageService.list(queryWrapper);
+        LambdaQueryWrapper<MerchantSmsTiming> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MerchantSmsTiming::getId, id);
+
+        Page<User> page = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
+        MerchantSmsTiming merchantSmsTiming = merchantSmsTimingService.getOne(queryWrapper);
+        String phone = merchantSmsTiming.getPhone();
+        String[] split = phone.split(",");
+        LambdaQueryWrapper<User> queryWrapper2 = new LambdaQueryWrapper<>();
+        queryWrapper2.in(User::getPhone,split);
+        List<User> list = userService.list(queryWrapper2);
         return CommonResult.success(CommonPage.restPage(CommonPage.copyPageInfo(page, list)));
 
     }
 
-    @ApiOperation(value = "发送短信手机号保存")
-    @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("操作成功");
-    }
+//    @ApiOperation(value = "发送短信手机号保存")
+//    @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/organization/OrganizationDepartment.java

@@ -55,6 +55,12 @@ public class OrganizationDepartment implements Serializable {
     /**部门编码*/
     @ApiModelProperty(value = "部门编码")
     private String departmentCode;
+    /**企业名称*/
+    @ApiModelProperty(value = "联系人")
+    private String contacts;
+    /**企业编码*/
+    @ApiModelProperty(value = "联系方式")
+    private String phone;
 
     /**企业id*/
     @ApiModelProperty(value = "企业id")

crmeb-common/src/main/java/com/zbkj/common/model/organization/OrganizationDepartmentUser.java

@@ -54,6 +54,12 @@ public class OrganizationDepartmentUser implements Serializable {
     /**用户id*/
     @ApiModelProperty(value = "用户id")
     private String userId;
+    /**企业名称*/
+    @ApiModelProperty(value = "联系人")
+    private String contacts;
+    /**企业编码*/
+    @ApiModelProperty(value = "联系方式")
+    private String phone;
 
     /**企业id*/
     @ApiModelProperty(value = "企业id")

crmeb-common/src/main/java/com/zbkj/common/model/organization/VO/OrganizationDepartmentVO.java

@@ -55,6 +55,12 @@ public class OrganizationDepartmentVO implements Serializable {
     /**部门编码*/
     @ApiModelProperty(value = "部门编码")
     private String departmentCode;
+    /**企业名称*/
+    @ApiModelProperty(value = "联系人")
+    private String contacts;
+    /**企业编码*/
+    @ApiModelProperty(value = "联系方式")
+    private String phone;
 
     /**企业id*/
     @ApiModelProperty(value = "企业id")

crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java

@@ -136,8 +136,8 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
             OrganizationDepartmentUser organizationDepartmentUser= organizationDepartmentUserService.selectIdByUserId(user.getId());
             Organization organization = organizationService.getById(organizationDepartmentUser.getOrganizationId());
             OrganizationDepartment organizationDepartment = organizationDepartmentService.getById(organizationDepartmentUser.getDepartmentId());
-            response.setQyName(organization.getCompanyName());
-            response.setBmName(organizationDepartment.getDepartmentName());
+            response.setQyName(organization.getName());
+            response.setBmName(organizationDepartment.getName());
             response.setRealName(user.getRealName());
         }
 

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

@@ -19,6 +19,7 @@ import com.zbkj.common.exception.CrmebException;
 import com.zbkj.common.model.admin.SystemAdmin;
 import com.zbkj.common.model.express.Express;
 import com.zbkj.common.model.merchant.Merchant;
+import com.zbkj.common.model.merchant.MerchantSmsTiming;
 import com.zbkj.common.model.order.*;
 import com.zbkj.common.model.system.SystemNotification;
 import com.zbkj.common.model.system.TaskMessage;
@@ -98,6 +99,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
     private TaskMessageService taskMessageService;
     @Autowired
     private OrderDao orderDao;
+    @Autowired
+    private MerchantSmsTimingService merchantSmsTimingService ;
 
     /**
      * 根据订单编号获取订单
@@ -1075,11 +1078,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
 
         List<User> UserList = userService.list(queryWrapper2);
 
-
-        List<TaskMessage> taskMessages = taskMessageService.getMerByMerId(merId);
+        LambdaQueryWrapper<MerchantSmsTiming> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MerchantSmsTiming::getId,id);
+        List<MerchantSmsTiming> list = merchantSmsTimingService.list(queryWrapper);
         //如果下过订单的用户手机号存在定时任务发送手机号的列表中则不显示该条信息
-        if (null != taskMessages && taskMessages.size() > 0) {
-            for (TaskMessage taskMessage : taskMessages) {
+        if (null != list && list.size() > 0) {
+            for (MerchantSmsTiming taskMessage : list) {
                 for (int i = 0; i < UserList.size(); i++) {
                     if (UserList.get(i).getPhone().equals(taskMessage.getPhone())) {
                         UserList.remove(i);