fix 过期人数大于5即需要修改密码

netflix-dao/src/main/java/com/cyksj/model/manage/views/AccountView.java

@@ -113,7 +113,7 @@ public class AccountView {
             " from (select ur.account_id, ur.relation_id" +
             " from user_ticket_cleared_record ur where ur.deleted is true and source = 'self' :yesTime:" +
             " group by ur.account_id, ur.relation_id) s" +
-            "  group by s.account_id) s left join groups_trips gt on gt.account_id = s.account_id where s.account_id = a.id and if(gt.sku_id = 161,s.num >= 10,s.num >= gt.num))is null,false,true)")
+            "  group by s.account_id) s left join groups_trips gt on gt.account_id = s.account_id where s.account_id = a.id and s.num >= 5)is null,false,true)")
     private Boolean expiredAll;
 
     @DbField("max(gr.expiry_time)")

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

@@ -622,9 +622,11 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 							orderDon.setStatus(OrderDon.Status.close);
 							updateById(orderDon);
 						});
-						User user = userMapper.selectById(orderDon.getUserId());
-						if (user != null) {
-							checkIsSameUser(groupsRelation.getUserId(), orderDon.getUserId(), user.getOpenId(), user.getLoginPhone());
+						if (groupsRelation.getUserId() != 0) {
+							User user = userMapper.selectById(orderDon.getUserId());
+							if (user != null) {
+								checkIsSameUser(groupsRelation.getUserId(), orderDon.getUserId(), user.getOpenId(), user.getLoginPhone());
+							}
 						}
 						//throw new BusinessRuntimeException("订单用户与车位用户不匹配！");
 					} else {