fix 客服跟进增加字段

netflix-dao/src/main/java/com/cyksj/model/entity/GroupsRelationExpiryRecord.java

@@ -1,6 +1,7 @@
 package com.cyksj.model.entity;
 
 import com.cyksj.model.BaseEntity;
+import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
@@ -88,4 +89,10 @@ public class GroupsRelationExpiryRecord extends BaseEntity {
 	 * 0已到期
 	 */
 	private Integer accountStatus;
+
+	@DbIgnore
+	private String corpUserName;
+
+	@DbIgnore
+	private String corpHeadImgUrl;
 }

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -19,7 +19,6 @@ import com.alipay.api.request.AlipayTradeQueryRequest;
 import com.alipay.api.response.AlipayFundTransCommonQueryResponse;
 import com.alipay.api.response.AlipayTradeFastpayRefundQueryResponse;
 import com.alipay.api.response.AlipayTradeQueryResponse;
-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.cyksj.common.EnvCommonService;
@@ -764,7 +763,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 						}
 						//throw new BusinessRuntimeException("订单用户与车位用户不匹配！");
 					} else {
-						if (GroupsRelation.Status.locking == groupsRelation.getStatus() || GroupsRelation.Status.outside == groupsRelation.getStatus()) {
+						if (GroupsRelation.Status.locking == groupsRelation.getStatus()) {
 							log.info("清理用户userId:{}未支付订单", orderDon.getUserId());
 							groupsRelation.setUserId(0L);
 							Long groupsId = groupsRelation.getGroupsId();
@@ -777,19 +776,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 							groupsRelation.setYhsId(0l);
 							groupsRelationMapper.updateById(groupsRelation);
 							orderCommonService.delRelation(groupsRelation);
-
-							//车位空余发送模板消息
-//						TASK_POOL.execute(() -> {
-//							try {
-//								List<CustomerService> customerServices = customerServiceMapper.selectList(null);
-//								for (CustomerService customerService : customerServices) {
-//									log.info("发送客服{}空车位通知消息", customerService.getNickName());
-//									emptySendMsgNotify(orderDon, customerService.getOpenId());
-//								}
-//							} catch (Exception e) {
-//								log.error("发送{}空车位模板消息至客服失败:{}", orderDon.getGoodsId(), e);
-//							}
-//						});
 						}
 					}
 				}

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupsRelationExpiryController.java

@@ -68,7 +68,6 @@ public class CmsGroupsRelationExpiryController {
 			}
 		}
 		SearchResult<GroupsRelationExpiryRecord> search = beanSearcher.search(GroupsRelationExpiryRecord.class, builder
-				.orderBy(GroupsRelationExpiryRecord::getId).desc()
 				.build());
 		search.getDataList().forEach(data -> {
 			if (Constant.TRACK_RENEW_TYPE.contains(data.getRegister())) {
@@ -85,7 +84,8 @@ public class CmsGroupsRelationExpiryController {
 					Optional.ofNullable(corpUserMapper.selectOne(Wrappers.lambdaQuery(CorpUser.class)
 							.eq(CorpUser::getUserId, data.getUserId()).last("limit 1")))
 							.ifPresent(cu -> {
-								data.setNickname(cu.getName());
+								data.setCorpUserName(cu.getName());
+								data.setCorpHeadImgUrl(cu.getAvatar());
 							});
 				}
 			}