fix 脚本修改密码限制平台为奈飞

netflix-dao/src/main/java/com/cyksj/model/response/ExpiredAccountRep.java

@@ -1,7 +1,6 @@
 package com.cyksj.model.response;
 
 import com.ejlchina.searcher.bean.DbField;
-import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
@@ -18,7 +17,7 @@ import java.util.Date;
 @Getter
 @Setter
 @SearchBean(tables = "groups_relation gr left join groups_trips gt on gt.id = gr.groups_id" +
-		" left join account a on a.id = gt.account_id",
+		" left join account a on a.id = gt.account_id left join user u on u.id = gr.user_id",
 		where = "gr.status = 'validity'")
 public class ExpiredAccountRep {
 	/**
@@ -27,6 +26,10 @@ public class ExpiredAccountRep {
 	@DbField("a.id")
 	private Long accountId;
 
+	@DbField("a.goods_id")
+	@JsonIgnore
+	private Long goodsId;
+
 	/**
 	 * 账号
 	 */
@@ -49,7 +52,7 @@ public class ExpiredAccountRep {
 	/**
 	 * 用户昵称
 	 */
-	@DbIgnore
+	@DbField("u.nickname")
 	private String nickname;
 
 	/**

netflix-dao/src/main/java/com/cyksj/model/response/OrderDonAccountRep.java

@@ -23,6 +23,11 @@ import java.util.Date;
 		where = ":time: and od.status not in ('close','noPayment','refund')" +
 				" and gr.status = 'validity' and gr.expiry_time is not null")
 public class OrderDonAccountRep {
+
+	@DbField("od.goods_id")
+	@JsonIgnore
+	private Long goodsId;
+
 	/**
 	 * 账号id
 	 */

netflix-web/src/main/java/com/cyksj/web/controller/manage/account/CmsAccountController.java

@@ -19,23 +19,18 @@ import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.GroupsMapper;
 import com.cyksj.mapper.HomeGroupMapper;
+import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.UserTicketClearedRecordMapper;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.excel.ExcelImportAccountData;
-import com.cyksj.mapper.UserMapper;
-import com.cyksj.model.entity.Account;
-import com.cyksj.model.entity.GroupsTrips;
-import com.cyksj.model.entity.HomeGroup;
-import com.cyksj.model.entity.User;
-import com.cyksj.model.excel.ExcelAccountTemplateData;
 import com.cyksj.model.excel.ExcelManageAccountData;
 import com.cyksj.model.manage.request.ReqAccountIncrExpiryTime;
 import com.cyksj.model.manage.views.AccountView;
 import com.cyksj.model.manage.views.GroupsRelationView;
-import com.cyksj.model.views.GoodsDonSkuView;
-import com.cyksj.model.views.UserTicketClearedRecordView;
 import com.cyksj.model.response.ExpiredAccountRep;
 import com.cyksj.model.response.OrderDonAccountRep;
+import com.cyksj.model.views.GoodsDonSkuView;
+import com.cyksj.model.views.UserTicketClearedRecordView;
 import com.cyksj.service.mange.CmsAccountService;
 import com.cyksj.service.mange.CmsGroupService;
 import com.cyksj.service.template.TemplateCommonService;
@@ -433,6 +428,7 @@ public class CmsAccountController {
 		DateTime offFive = DateUtil.offsetMinute(DateTime.now(), -5);
 		List<OrderDonAccountRep> list = beanSearcher.searchAll(OrderDonAccountRep.class, MapUtils.builder()
 				.put("time", String.format("od.created_time >= '%s'", offFive))
+				.field(OrderDonAccountRep::getGoodsId, 1)
 				.orderBy(ExpiredAccountRep::getAccountId)
 				.orderBy(ExpiredAccountRep::getNum)
 				.build());
@@ -451,14 +447,11 @@ public class CmsAccountController {
 		//十五天后
 		DateTime afterFif = DateUtil.offsetDay(DateTime.now(), 15);
 		List<ExpiredAccountRep> list = beanSearcher.searchAll(ExpiredAccountRep.class, MapUtils.builder()
+				.field(ExpiredAccountRep::getGoodsId, 1)
 				.field(ExpiredAccountRep::getExpiredTime, afterFif).op(Operator.LessEqual)
 				.orderBy(ExpiredAccountRep::getAccountId)
 				.orderBy(ExpiredAccountRep::getNum)
 				.build());
-		list.forEach(data->{
-			User user = userMapper.selectById(data.getUserId());
-			data.setNickname(user != null ? user.getNickname() : "");
-		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(list);
 	}
 
@@ -474,6 +467,9 @@ public class CmsAccountController {
 		if (account == null) {
 			return GatewayResponse.FAIL.newBuilder().toResult("账号不存在");
 		}
+		if (account.getGoodsId() != 1l) {
+			return GatewayResponse.SUCCESS.newBuilder().toResult();
+		}
 		Boolean flag = false;
 		String oldPwd = account.getPassword();
 		if (account != null) {