Commit f677dde1 by manxiaoqiang

adi

parent c9169a52
...@@ -179,6 +179,7 @@ public class ADIAccountServiceImpl implements ADIAccountService { ...@@ -179,6 +179,7 @@ public class ADIAccountServiceImpl implements ADIAccountService {
System.out.println(object); System.out.println(object);
val = new ObjectMapper().readValue(object, ADIUser.class); val = new ObjectMapper().readValue(object, ADIUser.class);
System.out.println(val); System.out.println(val);
val.setPackageType("试用套餐");
if(dicContract.containsKey(val.getEmail())){ if(dicContract.containsKey(val.getEmail())){
Contract contract = dicContract.get(val.getEmail()); Contract contract = dicContract.get(val.getEmail());
String date = DateUtil.format(val.getExpriedTime(), "yyyy-MM-dd"); String date = DateUtil.format(val.getExpriedTime(), "yyyy-MM-dd");
...@@ -275,6 +276,7 @@ public class ADIAccountServiceImpl implements ADIAccountService { ...@@ -275,6 +276,7 @@ public class ADIAccountServiceImpl implements ADIAccountService {
} }
if (saleMap.containsKey(aw.getSaleEamil())) { if (saleMap.containsKey(aw.getSaleEamil())) {
aw.setSale(saleMap.get(aw.getSaleEamil())); aw.setSale(saleMap.get(aw.getSaleEamil()));
aw.setBussinessMan(saleMap.get(aw.getSaleEamil()) );
} }
aw.setStatus(statusMap.get(aw.getStatus())); aw.setStatus(statusMap.get(aw.getStatus()));
aw.setPastDate(null == aw.getExpriedTime() ? "" :DateUtil.getFormatDate(aw.getExpriedTime())); aw.setPastDate(null == aw.getExpriedTime() ? "" :DateUtil.getFormatDate(aw.getExpriedTime()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment