|
|
@@ -3,6 +3,7 @@ package com.goafanti.customer.service.impl;
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
+import java.time.LocalDate;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
|
@@ -92,6 +93,8 @@ import com.goafanti.customer.bo.LockingReleaseBo;
|
|
|
import com.goafanti.customer.bo.StatisticBo;
|
|
|
import com.goafanti.customer.bo.transferListBo;
|
|
|
import com.goafanti.customer.service.CustomerService;
|
|
|
+import com.goafanti.user.bo.OutUserChannel;
|
|
|
+import com.mysql.fabric.xmlrpc.base.Data;
|
|
|
|
|
|
@Service
|
|
|
public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements CustomerService {
|
|
|
@@ -2082,8 +2085,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
params.put("maid", TokenManager.getAdminId());
|
|
|
}
|
|
|
params.put("aid", in.getAid() == null ? TokenManager.getAdminId() : in.getAid());
|
|
|
- return findPage("selectChannelCustomerList", "selectChannelCustomerCount", params, in.getPageNo(),
|
|
|
+ Pagination<?> p=findPage("selectChannelCustomerList", "selectChannelCustomerCount", params, in.getPageNo(),
|
|
|
in.getPageSize());
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
+ List<OutUserChannel> list=(List<OutUserChannel>) p.getList();
|
|
|
+ Date date=new Date();
|
|
|
+ for (OutUserChannel o : list) {
|
|
|
+ int days = (int) ((o.getDistributionTime().getTime() + AFTConstants.USER_CHENNL_LIMIT_MS - date.getTime()) / (24 * 3600 * 1000));
|
|
|
+ o.setDays(days);
|
|
|
+ }
|
|
|
+ return p;
|
|
|
|
|
|
}
|
|
|
|