diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizPatrolReportEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizPatrolReportEntity.java index 3a3d44b..af0f0c6 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizPatrolReportEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizPatrolReportEntity.java @@ -41,11 +41,6 @@ public class BizPatrolReportEntity { */ private String address; - /** - * 车牌 - */ - private String licensePlate; - /** * 上报时间 */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SearchBizPatrolReportParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SearchBizPatrolReportParam.java index 0599470..a0353da 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SearchBizPatrolReportParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SearchBizPatrolReportParam.java @@ -25,9 +25,4 @@ public class SearchBizPatrolReportParam { */ private String phone; - /** - * 车牌 - */ - private String licensePlate; - } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizPatrolReportService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizPatrolReportService.java index 0286923..56c5af8 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizPatrolReportService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizPatrolReportService.java @@ -16,6 +16,7 @@ import org.springframework.stereotype.Service; /** * 巡查上报 + * * @author ljw */ @Slf4j @@ -76,19 +77,17 @@ public class BizPatrolReportService extends ServiceImpl 分页结果 */ public PageResult paging(PageParam pageParam, SearchBizPatrolReportParam searchParam) { String contact = searchParam.getContact(); String phone = searchParam.getPhone(); - String licensePlate = searchParam.getLicensePlate(); Page page = this.page(pageParam.toPage(), Wrappers.lambdaQuery() .like(StrUtil.isNotBlank(contact), BizPatrolReportEntity::getContact, contact) .like(StrUtil.isNotBlank(phone), BizPatrolReportEntity::getPhone, phone) - .like(StrUtil.isNotBlank(licensePlate), BizPatrolReportEntity::getLicensePlate, licensePlate) .orderByDesc(BizPatrolReportEntity::getCreateTime)); return PageResult.of(page); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index a40540c..cf0fbcc 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -10,7 +10,6 @@ import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import cn.hutool.extra.qrcode.QrConfig; -import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -877,14 +876,19 @@ public class OrderInfoService extends ServiceImpl openId = new HashSet<>(); + UserEntity orderUserEntity = userService.getById(orderInfo.getUserId()); + param.setCfCompanyName(orderUserEntity.getNickname()); for (SysUserRoleEntity userRoleEntity : userIds) { - UserEntity userEntity = userService.getById(orderInfo.getUserId()); - if (null != userEntity) { - param.setUserId(userRoleEntity.getUserId()); - param.setCfCompanyName(userEntity.getNickname()); - wechatTemplateMessageService.sendTemplateMessage(param); + UserEntity userEntity = userService.getById(userRoleEntity.getUserId()); + if (null != userEntity && !Strings.isNullOrEmpty(userEntity.getOpenid())) { + if (openId.add(userEntity.getOpenid())) { + param.setUserId(userRoleEntity.getUserId()); + log.info("发送审核通知模板消息,参数:{}", param); + wechatTemplateMessageService.sendTemplateMessage(param); + } } else { - log.info("未查到用户信息:" + userRoleEntity.getUserId()); + log.info("未查到用户信息:{}", userRoleEntity.getUserId()); } } }