Skip to content

M
manager
Commit 31830e55 by manxiaoqiang
Options

Merge remote-tracking branch 'remotes/origin/20180525_adi' into 20180530_bpu

* remotes/origin/20180525_adi: adi adi # Conflicts: # .idea/workspace.xml # src/main/java/common/service/impl/ContractServiceImpl.java
parents 45a65f1c eaabae4c
Showing with 971 additions and 43 deletions
pom.xml
......@@ -827,7 +827,7 @@
<version>${maven.jetty.version}</version>
<configuration>
<httpConnector>
<port>8080</port>
<port>8082</port>
</httpConnector>
<webAppConfig>
<defaultsDescriptor>src/main/resources/webdefault.xml</defaultsDescriptor>
......
src/main/java/adi/controller/ADIAccountController.java 0 → 100644
package adi.controller;
import adi.model.ADIUser;
import adi.service.ADIAccountService;
import common.model.*;
import dic.OperateObjectTypeEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import security.annotation.CurrentAccount;
import userio.service.IOAccountService;
import util.ResultModel;
import util.ResultStatus;
import util.UserLogThread;
import javax.servlet.http.HttpServletRequest;
/**
* Created by mxq on 2017/12/21.
*/
@Controller
@RequestMapping("adi/marketing/accountmng")
public class ADIAccountController {
@Autowired
ADIAccountService tkioAccountService;
//sale
@RequestMapping(value = "/findSale", method = RequestMethod.GET)
@ResponseBody
public ResultModel findSale(@CurrentAccount User loginAccount, @RequestParam(required = false) Long sale) {
return ResultModel.OK(tkioAccountService.findSale(loginAccount, sale));
}
//sale
@RequestMapping(value = "/findSaleInfo", method = RequestMethod.GET)
@ResponseBody
public ResultModel findSale( @RequestParam String email) {
return ResultModel.OK(tkioAccountService.findSale(email));
}
//sale
@RequestMapping(value = "/update/sale", method = RequestMethod.PUT)
@ResponseBody
public ResultModel updateSale(@CurrentAccount User loginAccount,
@RequestParam String email, @RequestParam String accountEmail, HttpServletRequest request) {
UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), accountEmail, "tkio修改销售为 " + email, request,loginAccount.getRole());
userlog.start();
return ResultModel.OK(tkioAccountService.updateSale(email, accountEmail));
}
//客户列表
@RequestMapping(value = "/findAll", method = RequestMethod.GET)
@ResponseBody
public ResultModel find(@CurrentAccount User loginAccount) {
return ResultModel.OK(tkioAccountService.findAll(loginAccount));
}
@RequestMapping(value = "/findone", method = RequestMethod.GET)
@ResponseBody
public ResultModel findOne(@CurrentAccount User loginAccount, @RequestParam String email) {
ADIUser account4Web = tkioAccountService.findOne(email);
if(null == account4Web){
return ResultModel.ERROR(ResultStatus.USER_EMPTY);
}
return ResultModel.OK(account4Web);
}
@RequestMapping(value = "/find/reminderlevel", method = RequestMethod.GET)
@ResponseBody
public ResultModel findReminderlevel() {
return ResultModel.OK(tkioAccountService.findReminderlevel());
}
//关闭缴费提醒
@RequestMapping(value = "/forbidenpress", method = RequestMethod.PUT)
@ResponseBody
public ResultModel forbidenPress(@CurrentAccount User loginAccount, @RequestBody PressMoney resource, HttpServletRequest request) {
UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "关闭异常状态跟进", request,loginAccount.getRole());
userlog.start();
return ResultModel.OK(tkioAccountService.forbidenPress(loginAccount, resource));
}
//开启缴费提醒
@RequestMapping(value = "/enablepress", method = RequestMethod.PUT)
@ResponseBody
public ResultModel enablePress(@CurrentAccount User loginAccount, @RequestBody PressMoney resource, HttpServletRequest request) {
UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "开启异常状态跟进", request,loginAccount.getRole());
userlog.start();
return ResultModel.OK(tkioAccountService.enablePress(loginAccount, resource));
}
//回访
@RequestMapping(value = "/visit", method = RequestMethod.PUT)
@ResponseBody
public ResultModel visit(@CurrentAccount User loginAccount, @RequestBody BackVisit resource, HttpServletRequest request) {
UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "回访", request,loginAccount.getRole());
userlog.start();
return ResultModel.OK( tkioAccountService.visit(loginAccount, resource));
}
//回访查询
@RequestMapping(value = "/find/visit/{accountId}", method = RequestMethod.GET)
@ResponseBody
public ResultModel findVisit(@CurrentAccount User loginAccount, @RequestParam String startDate,
@RequestParam String endDate, @PathVariable Long accountId) {
return ResultModel.OK(tkioAccountService.findVisit(accountId,startDate,endDate));
}
//缴费查询
@RequestMapping(value = "/find/pay/{accountId}", method = RequestMethod.GET)
@ResponseBody
public ResultModel findPay(@CurrentAccount User loginAccount, @RequestParam String startDate,
@RequestParam String endDate, @RequestParam String email, @PathVariable Long accountId) {
return ResultModel.OK(tkioAccountService.findPay(email,startDate,endDate));
}
//合同查询
@RequestMapping(value = "/find/contract/{accountId}", method = RequestMethod.GET)
@ResponseBody
public ResultModel findContract(@CurrentAccount User loginAccount, @RequestParam(required =false) String startDate,
@RequestParam(required =false) String endDate, @RequestParam String email) {
return ResultModel.OK(tkioAccountService.findContractChange(email,startDate,endDate));
}
}
src/main/java/adi/dic/PackageEnum.java 0 → 100644
package adi.dic;
public enum PackageEnum {
PROBATION(1,"试用套餐"),
FORMAL(2,"正式套餐");
private Integer key;
private String value;
PackageEnum(Integer key, String value) {
this.key = key;
this.value = value;
}
public Integer getKey() {
return key;
}
public String getValue() {
return value;
}
}
src/main/java/adi/dic/StatusEnum.java 0 → 100644
package adi.dic;
public enum StatusEnum {
INIT(0,"未激活"),
ACTIVE(1,"已开通"),
PAST(2,"已过期"),
FORBIDEN(3,"已停用");
private Integer key;
private String value;
StatusEnum(Integer key, String value) {
this.key = key;
this.value = value;
}
public Integer getKey() {
return key;
}
public String getValue() {
return value;
}
}
src/main/java/adi/dic/TypeEnum.java 0 → 100644
package adi.dic;
public enum TypeEnum {
COMPANY(1,"企业用户"),
OWNER(2,"个人用户");
private Integer key;
private String value;
TypeEnum(Integer key, String value) {
this.key = key;
this.value = value;
}
public Integer getKey() {
return key;
}
public String getValue() {
return value;
}
}
src/main/java/adi/model/ADIUser.java 0 → 100644
package adi.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
public class ADIUser implements Serializable{
private Long id;
private Long accountId;
private String email;
private String password;
private String name;
private String company;
private String phone;
private String qq;
private String wechat;
private String status;//是否激活: true-激活
private Long modifyAccount;
private Long createAccount;
private Date modifyTime = new Date();
private Date createTime;
private Boolean delFlag;
private String regIpAddr;
private String regIpLocation;
private Long activeTime;//激活时间
private Boolean whetherCompany;//是否企业用户
private Boolean onMedia;//是否选择媒体
private Boolean onTrial;//是否试用账户
private Date expriedTime;//账户到期时间
private Boolean closeFloat;//是否已关闭“试用”提示框
private String packageType;
private String bussinessManEmail;
private List<String> mediaList;
private Date constractStartTime;//合同开始时间
private Long bussinessMan;
private String contractStatus;
private Integer contractTime;
private String saleName;
private Boolean pressStatus;
private String saleEamil;
private Long sale;
private Long money;
private Integer backTime;
private String pastDate;
public Long getAccountId() {
return accountId;
}
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
public String getPastDate() {
return pastDate;
}
public void setPastDate(String pastDate) {
this.pastDate = pastDate;
}
public List<String> getMediaList() {
return mediaList;
}
public Integer getBackTime() {
return backTime;
}
public void setBackTime(Integer backTime) {
this.backTime = backTime;
}
public void setMediaList(List<String> mediaList) {
this.mediaList = mediaList;
}
public String getContractStatus() {
return contractStatus;
}
public void setContractStatus(String contractStatus) {
this.contractStatus = contractStatus;
}
public Integer getContractTime() {
return contractTime;
}
public void setContractTime(Integer contractTime) {
this.contractTime = contractTime;
}
public String getSaleName() {
return saleName;
}
public void setSaleName(String saleName) {
this.saleName = saleName;
}
public Boolean getPressStatus() {
return pressStatus;
}
public void setPressStatus(Boolean pressStatus) {
this.pressStatus = pressStatus;
}
public String getSaleEamil() {
return saleEamil;
}
public void setSaleEamil(String saleEamil) {
this.saleEamil = saleEamil;
}
public Long getSale() {
return sale;
}
public void setSale(Long sale) {
this.sale = sale;
}
public Long getMoney() {
return money;
}
public void setMoney(Long money) {
this.money = money;
}
public String getBussinessManEmail() {
return bussinessManEmail;
}
public void setBussinessManEmail(String bussinessManEmail) {
this.bussinessManEmail = bussinessManEmail;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Long getModifyAccount() {
return modifyAccount;
}
public void setModifyAccount(Long modifyAccount) {
this.modifyAccount = modifyAccount;
}
public Long getCreateAccount() {
return createAccount;
}
public void setCreateAccount(Long createAccount) {
this.createAccount = createAccount;
}
public Date getModifyTime() {
return modifyTime;
}
public void setModifyTime(Date modifyTime) {
this.modifyTime = modifyTime;
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Boolean getDelFlag() {
return delFlag;
}
public void setDelFlag(Boolean delFlag) {
this.delFlag = delFlag;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getCompany() {
return company;
}
public void setCompany(String company) {
this.company = company;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getQq() {
return qq;
}
public void setQq(String qq) {
this.qq = qq;
}
public String getWechat() {
return wechat;
}
public void setWechat(String wechat) {
this.wechat = wechat;
}
public String getRegIpAddr() {
return regIpAddr;
}
public void setRegIpAddr(String regIpAddr) {
this.regIpAddr = regIpAddr;
}
public String getRegIpLocation() {
return regIpLocation;
}
public void setRegIpLocation(String regIpLocation) {
this.regIpLocation = regIpLocation;
}
public Long getActiveTime() {
return activeTime;
}
public void setActiveTime(Long activeTime) {
this.activeTime = activeTime;
}
public Boolean getOnMedia() {
return onMedia;
}
public void setOnMedia(Boolean onMedia) {
this.onMedia = onMedia;
}
public Boolean getOnTrial() {
return onTrial;
}
public void setOnTrial(Boolean onTrial) {
this.onTrial = onTrial;
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
public Date getExpriedTime() {
return expriedTime;
}
public void setExpriedTime(Date expriedTime) {
this.expriedTime = expriedTime;
}
public Boolean getWhetherCompany() {
return whetherCompany;
}
public void setWhetherCompany(Boolean whetherCompany) {
this.whetherCompany = whetherCompany;
}
public Boolean getCloseFloat() {
return closeFloat;
}
public void setCloseFloat(Boolean closeFloat) {
this.closeFloat = closeFloat;
}
public String getPackageType() {
return packageType;
}
public void setPackageType(String packageType) {
this.packageType = packageType;
}
public Long getBussinessMan() {
return bussinessMan;
}
public void setBussinessMan(Long bussinessMan) {
this.bussinessMan = bussinessMan;
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
public Date getConstractStartTime() {
return constractStartTime;
}
public void setConstractStartTime(Date constractStartTime) {
this.constractStartTime = constractStartTime;
}
@Override
public String toString() {
return "ADIUser{" +
"id=" + id +
", email='" + email + '\'' +
", password='" + password + '\'' +
", name='" + name + '\'' +
", company='" + company + '\'' +
", phone='" + phone + '\'' +
", qq='" + qq + '\'' +
", wechat='" + wechat + '\'' +
", status=" + status +
", modifyAccount=" + modifyAccount +
", createAccount=" + createAccount +
", modifyTime=" + modifyTime +
", createTime=" + createTime +
", delFlag=" + delFlag +
", regIpAddr='" + regIpAddr + '\'' +
", regIpLocation='" + regIpLocation + '\'' +
", activeTime=" + activeTime +
", whetherCompany=" + whetherCompany +
", onMedia=" + onMedia +
", onTrial=" + onTrial +
", expriedTime=" + expriedTime +
", closeFloat=" + closeFloat +
", packageType='" + packageType + '\'' +
", bussinessMan=" + bussinessMan +
", mediaList=" + mediaList +
'}';
}
}
src/main/java/adi/service/ADIAccountService.java 0 → 100644
package adi.service;
import adi.model.ADIUser;
import common.model.*;
import java.util.List;
import java.util.Map;
/**
* Created by mxq on 2017/12/26.
*/
public interface ADIAccountService {
Map<String, Object> findSale(User user, Long sale);
Map<String, String> findSale(String email);
IOAccount4Web updateSale(String email, String account);
List<ADIUser> findAll(User user);
ADIUser findOne(String email);
List<ReminderLevel> findReminderlevel();
void updateAccount(Contract contract);
//催款提醒关闭
PressMoney forbidenPress(User user, PressMoney resource);
//催款提醒开启
PressMoney enablePress(User user, PressMoney resource);
//回访
BackVisit visit(User user, BackVisit resource);
List<BackVisit> findVisit(Long account, String startDate, String endDate);
List<ContractMoney> findPay(String email, String startDate, String endDate);
List<Contract> findContract(String email);
List<Contract> findContractChange(String email, String startDate, String endDate);
}
src/main/java/common/controller/ContractController.java
......@@ -91,7 +91,7 @@ public class ContractController {
response.setHeader("Content-Type","text/csv");
response.setContentType("APPLICATION/OCTET-STREAM");
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), platform, "导出合同", startDate, endDate, request);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), platform, "导出合同", startDate, endDate, request,platform);
userlog.start();
//返回文件字符串
return new ResponseEntity<byte[]>(content, headers, HttpStatus.CREATED);
......@@ -128,7 +128,7 @@ public class ContractController {
response.setHeader("Content-Type","text/csv");
response.setContentType("APPLICATION/OCTET-STREAM");
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), platform, "导出收款开票", startDate, endDate, request);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), platform, "导出收款开票", startDate, endDate, request, platform);
userlog.start();
//返回文件字符串
return new ResponseEntity<byte[]>(content, headers, HttpStatus.CREATED);
......@@ -193,9 +193,9 @@ public class ContractController {
@RequestMapping(value = "create", method = RequestMethod.POST)
@ResponseBody
public ResultModel create(@CurrentAccount User loginAccount, @RequestBody Contract contract, HttpServletRequest request) {
public ResultModel create(@CurrentAccount User loginAccount, @RequestBody Contract contract, HttpServletRequest request, @PathVariable String platform) {
Contract contract1 = service.create(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "新建合同","",contract1.toString(), request);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "新建合同","",contract1.toString(), request, platform);
userlog.start();
ContractSendEmailThread email = new ContractSendEmailThread(contract);
......@@ -205,27 +205,27 @@ public class ContractController {
@RequestMapping(value = "update", method = RequestMethod.PUT)
@ResponseBody
public ResultModel update(@CurrentAccount User loginAccount, @RequestBody Contract contract, HttpServletRequest request) {
public ResultModel update(@CurrentAccount User loginAccount, @RequestBody Contract contract, HttpServletRequest request, @PathVariable String platform) {
Contract contract1 = service.update(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "修改合同","",contract1.toString(), request);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "修改合同","",contract1.toString(), request, platform);
userlog.start();
return ResultModel.OK(contract1);
}
@RequestMapping(value = "pay", method = RequestMethod.POST)
@ResponseBody
public ResultModel pay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract, HttpServletRequest request) {
public ResultModel pay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract, HttpServletRequest request, @PathVariable String platform) {
ContractMoney contract1 = service.pay(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "收款开票","",contract1.toString(), request);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "收款开票","",contract1.toString(), request, platform);
userlog.start();
return ResultModel.OK(contract1);
}
@RequestMapping(value = "change", method = RequestMethod.POST)
@ResponseBody
public ResultModel change(@CurrentAccount User loginAccount, @RequestBody ContractChange contract, HttpServletRequest request) {
public ResultModel change(@CurrentAccount User loginAccount, @RequestBody ContractChange contract, HttpServletRequest request, @PathVariable String platform) {
Contract contract1 = service.change(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "修改套餐","",contract1.toString(), request);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "修改套餐","",contract1.toString(), request, platform);
userlog.start();
return ResultModel.OK(contract1);
}
......@@ -246,9 +246,9 @@ public class ContractController {
@RequestMapping(value = "update/pay", method = RequestMethod.PUT)
@ResponseBody
public ResultModel updatePay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract, HttpServletRequest request) {
public ResultModel updatePay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract, HttpServletRequest request, @PathVariable String platform) {
Contract contract1 = service.updatePay(loginAccount, contract);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "修改收款开票","", service.updatePay(loginAccount, contract).toString(), request);
NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "修改收款开票","", service.updatePay(loginAccount, contract).toString(), request, platform);
userlog.start();
return ResultModel.OK(contract1);
}
......
src/main/java/common/model/UserLog.java
......@@ -24,6 +24,7 @@ public class UserLog
private String OldObject;
private String newObject;
private Long role;
private String platfrom;
@Id
@GeneratedValue
......@@ -141,6 +142,14 @@ public class UserLog
this.role = role;
}
public String getPlatfrom() {
return platfrom;
}
public void setPlatfrom(String platfrom) {
this.platfrom = platfrom;
}
@Override
public String toString() {
return "UserLog{" +
......
src/main/java/common/service/impl/ContractServiceImpl.java
package common.service.impl;
import adi.dic.PackageEnum;
import adi.model.ADIUser;
import adi.service.ADIAccountService;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.api.ads.adwords.lib.AdWordsProductFrameworkModule;
import common.model.*;
import common.repository.*;
......@@ -9,6 +13,8 @@ import dic.ContractStatusEnum;
import dic.ContractTypeEnum;
import dic.RoleEnum;
import dic.RoleTypeEnum;
import org.json.JSONException;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import tkio.model.Account;
......@@ -21,11 +27,15 @@ import tkio.service.AccountService;
import tkio.service.TkioAccountService;
import userio.service.AccountIOService;
import userio.service.IOAccountService;
import util.DateUtil;
import util.ResultModel;
import util.ResultStatus;
import util.ValidateUtil;
import util.*;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.*;
......@@ -72,23 +82,33 @@ public class ContractServiceImpl implements ContractService{
IncrementFlowRepository incrementFlowRepository;
@Autowired
BPUContractRepository bpuContractRepository;
@Autowired
ADIAccountService adiAccountService;
@Override
public Map<String, Object> checkAccount(String email, String platfrom) {
Map<String, Object> map = new HashMap<>();
Account4Web account4Web = null;
IOAccount4Web ioAccount4Web = null;
ADIUser adiUser =null;
if("tkio".equals(platfrom)){
account4Web = account4WebRepository.findByEmail(email);
}else if("io".equals(platfrom)){
ioAccount4Web = ioAccount4WebRepository.findByEmail(email);
}else if("adi".equals(platfrom)){
adiUser = adiAccountService.findOne(email);
}
if(null == account4Web && null == ioAccount4Web){
if(null == account4Web && null == ioAccount4Web && null ==adiUser){
map.put("result", 0);
}else{
BigInteger integer = contractRepository.countNumByEmail(email,platfrom);
map.put("result", 1);
if(platfrom.equals("adi")){
map.put("company", adiUser.getCompany());
}else{
map.put("company", null == account4Web ? ioAccount4Web.getCompany() : account4Web.getCompany());
}
map.put("num", integer.intValue());
Contract contract = contractRepository.findByPlatformAndEmailLimitVaild(platfrom, email);
if(null == contract){
......@@ -151,6 +171,18 @@ public class ContractServiceImpl implements ContractService{
@Override
public List findSetmeal(String platform) {
List list = new ArrayList();
if("adi".equals(platform)){
for(int i = 1; i < 3; i++) {
Map<String, String> packageMap = new HashMap<>();
packageMap.put("id", i + "");
if(i == 1){
packageMap.put("packageName", PackageEnum.PROBATION.getValue());
}else{
packageMap.put("packageName", PackageEnum.FORMAL.getValue());
}
list.add(packageMap);
}
}else {
if("tkio".equals(platform) || "io".equals(platform)){
List<PackageType> packageTypeList = packageTypeRepository.findAll();
for(PackageType p : packageTypeList){
......@@ -162,6 +194,7 @@ public class ContractServiceImpl implements ContractService{
}else if("userdesk".equals(platform) || "dmp".equals(platform) || "fake".equals(platform)) {
list = bpuContractRepository.findByProduct(platform);
}
}
return list;
}
......@@ -242,7 +275,13 @@ public class ContractServiceImpl implements ContractService{
resource.setDs(DateUtil.getBeforeDays(0));
resource.setStatus("wait");
}
Double rebat = getRebat(resource.getProduct(), resource.getPriceLevel().intValue(), resource.getMoney());
Double rebat = null;
if(null != resource.getPriceLevel()){
rebat = getRebat(resource.getProduct(), resource.getPriceLevel().intValue(), resource.getMoney());
}else{
rebat = getRebat(resource.getProduct(), 0, resource.getMoney());
}
BigDecimal bg = new BigDecimal(rebat);
double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
resource.setRebate(f1);
......@@ -259,6 +298,9 @@ public class ContractServiceImpl implements ContractService{
if(resource.getPlatform().equals("io") && resource.getType().equals("main")){
accountIOService.update(resource);
}
if(resource.getPlatform().equals("adi")){
adiAccountService.updateAccount(resource);
}
if(resource.getType().equals(ContractTypeEnum.MAIN.getKey())
|| (resource.getType().equals(ContractTypeEnum.INCREMENT.getKey()) && resource.getPriceLevel().equals(1L))){
......@@ -315,7 +357,7 @@ public class ContractServiceImpl implements ContractService{
}
boolean newRebat = false;
if(contract.getType().equals(ContractTypeEnum.MAIN.getKey())){
if(contract.getType().equals(ContractTypeEnum.MAIN.getKey()) && null != resource.getPriceLevel()){
if(!resource.getPriceLevel().equals(contract.getPriceLevel())){
cc.setContent(cc.getContent() + " 套餐变更：" + packageMap.get(contract.getPriceLevel()) + "-->" + packageMap.get(resource.getPriceLevel()));
newRebat = true;
......@@ -350,6 +392,9 @@ public class ContractServiceImpl implements ContractService{
if(contract.getPlatform().equals("io") && resource.getType().equals("main")){
accountIOService.update(contract);
}
if(contract.getPlatform().equals("adi")){
adiAccountService.updateAccount(contract);
}
if(contract.getPlatform().equals("tkio")){
if(contract.getPlatform().equals("tkio")) {
......@@ -688,4 +733,32 @@ public class ContractServiceImpl implements ContractService{
}
return saleMap;
}
public static Map<String,String> convertBean(Object bean) throws IntrospectionException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
Class type = bean.getClass();
Map<String,String> returnMap = new HashMap<String,String>();
BeanInfo beanInfo = Introspector.getBeanInfo(type);
PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
for (int i = 0; i< propertyDescriptors.length; i++) {
PropertyDescriptor descriptor = propertyDescriptors[i];
String propertyName = descriptor.getName();
if (!propertyName.equals("class")) {
Method readMethod = descriptor.getReadMethod();
Object invoke = readMethod.invoke(bean, new Object[0]);
String result = (null == invoke ? null : invoke.toString());
if (result != null) {
returnMap.put(propertyName, result);
} else {
returnMap.put(propertyName, null);
}
}
}
return returnMap;
}
}
src/main/java/office/model/ADISaleMap.java 0 → 100644
package office.model;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import java.util.Date;
/**
* Created by nolan on 06/06/2017.
* description:
*/
@Entity
public class ADISaleMap {
private Long id;
private Long account;
private String accountEmail;
private Long sale;
private String saleEmail;
private String saleName;
private Date createTime;
private Date modifeTime;
@Id
@GeneratedValue(strategy= GenerationType.AUTO)
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getAccount() {
return account;
}
public void setAccount(Long account) {
this.account = account;
}
public String getAccountEmail() {
return accountEmail;
}
public void setAccountEmail(String accountEmail) {
this.accountEmail = accountEmail;
}
public Long getSale() {
return sale;
}
public void setSale(Long sale) {
this.sale = sale;
}
public String getSaleEmail() {
return saleEmail;
}
public void setSaleEmail(String saleEmail) {
this.saleEmail = saleEmail;
}
public String getSaleName() {
return saleName;
}
public void setSaleName(String saleName) {
this.saleName = saleName;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getModifeTime() {
return modifeTime;
}
public void setModifeTime(Date modifeTime) {
this.modifeTime = modifeTime;
}
@Override
public String toString() {
return "ADISaleMap{" +
"id=" + id +
", account=" + account +
", accountEmail='" + accountEmail + '\'' +
", sale=" + sale +
", saleEmail='" + saleEmail + '\'' +
", saleName='" + saleName + '\'' +
", createTime=" + createTime +
", modifeTime=" + modifeTime +
'}';
}
}
src/main/java/office/repository/ADISaleMapRepository.java 0 → 100644
package office.repository;
import office.model.ADISaleMap;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
/**
* Created by nolan on 06/06/2017.
* description:
*/
public interface ADISaleMapRepository
extends JpaRepository<ADISaleMap, Long>
{
@Query(value = "select * from adisale_map where account=?1", nativeQuery = true)
ADISaleMap findByAccountId(Long account);
@Query(value = "select * from adisale_map where account_email=?1", nativeQuery = true)
ADISaleMap findByAccountEmail(String email);
}
src/main/java/security/interceptor/AuthorizationInterceptor.java
......@@ -47,13 +47,23 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
//放开登录
if (request.getRequestURL().indexOf("login/login") != -1
|| request.getRequestURL().indexOf("update/pwd") != -1
|| request.getRequestURL().indexOf("user/forget") != -1
|| request.getRequestURL().indexOf("user/code") != -1
|| request.getRequestURL().indexOf("contract/build") != -1){
String requestURL = request.getRequestURL().toString();
if(requestURL.contains("findSaleInfo")){
System.out.println("-----"+requestURL.contains("findSaleInfo"));
return true;
}
System.out.println("============="+requestURL);
System.out.println(requestURL.indexOf("accountmng/findSaleInfo"));
if (requestURL.indexOf("login/login") != -1
|| requestURL.indexOf("update/pwd") != -1
|| requestURL.indexOf("user/forget") != -1
|| requestURL.indexOf("user/code") != -1
|| requestURL.indexOf("contract/build") != -1
|| requestURL.indexOf("accountmng/findSaleInfo") != -1){
return true;
}
//从header中得到token
String token = request.getHeader(httpHeaderName);
//token = StringUtil.isEmpty(token) ? getCookieToken(request.getCookies(), "TOKEN") : token;
......
src/main/java/util/HttpClientUtil.java
......@@ -9,9 +9,7 @@ import org.apache.commons.httpclient.params.HttpMethodParams;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -289,13 +287,56 @@ public class HttpClientUtil {
return result;
}
public static String doHttpPostRequest(String url, String ip, Map<String, String> params, String cookie) {
long start = System.currentTimeMillis();
// public static String doHttpPostRequest(String url, String ip, Map<String, String> params, String cookie) {
// long start = System.currentTimeMillis();
// HttpClient httpClient = new HttpClient(httpConnectionManager);
// httpClient.getHttpConnectionManager().getParams()
// .setConnectionTimeout(300000);
// httpClient.getHttpConnectionManager().getParams().setSoTimeout(300000);
// resetRequestHeader(httpClient, ip, cookie);
// PostMethod method = new PostMethod(url);
// List<NameValuePair> list = new ArrayList<NameValuePair>();
//
// for (String key : params.keySet()) {
// NameValuePair pair = new NameValuePair(key, params.get(key));
// list.add(pair);
// }
// method.setRequestBody(list.toArray(new NameValuePair[list.size()]));
// String response = null;
// try {
// int status = httpClient.executeMethod(method);
// response = method.getResponseBodyAsString();
// } catch (IOException e) {
// log.error("执行HTTP Post请求" + url + "时，发生异常！", e);
// } finally {
// method.releaseConnection();
// }
// long end = System.currentTimeMillis();
// log.debug("---------------http's time to get data from report-------------------");
// log.debug(start-end + "ms");
// log.debug("---------------------------------------------------------------------");
// return response;
// }
public static String doHttpPostRequest(String url, String ip, Map<String, String> params, String code)
{
return doHttpPostRequest(url, ip, params, "ISO-8859-1", code);
}
/**
* Http post请求，获取结果.
*
* @param url
* @param ip
* @return
*/
public static String doHttpPostRequest(String url, String ip, Map<String, String> params, String readCharsetName, String writeCharsetName)
{
HttpClient httpClient = new HttpClient(httpConnectionManager);
httpClient.getHttpConnectionManager().getParams()
.setConnectionTimeout(300000);
httpClient.getHttpConnectionManager().getParams().setSoTimeout(300000);
resetRequestHeader(httpClient, ip, cookie);
resetRequestHeader(httpClient, ip);
PostMethod method = new PostMethod(url);
List<NameValuePair> list = new ArrayList<NameValuePair>();
......@@ -303,20 +344,48 @@ public class HttpClientUtil {
NameValuePair pair = new NameValuePair(key, params.get(key));
list.add(pair);
}
method.setRequestBody(list.toArray(new NameValuePair[list.size()]));
NameValuePair[] body = new NameValuePair[list.size()];
body = list.toArray(body);
method.setRequestBody(body);
return executeMethod(httpClient, method, readCharsetName, writeCharsetName);
}
private static String executeMethod(HttpClient httpClient, HttpMethod method, String readCharsetName, String writeCharsetName)
{
String response = null;
try {
int status = httpClient.executeMethod(method);
response = method.getResponseBodyAsString();
} catch (IOException e) {
log.error("执行HTTP Post请求" + url + "时，发生异常！", e);
} finally {
httpClient.executeMethod(method);
}
catch (IOException e) {
// try {
// logger.error("执行HTTP请求" + method.getURI().toString() + "时，发生异常！", e);
// }
// catch (URIException e1) {
// logger.error("URIException", e1);
// }
}
finally {
if (method.getStatusCode() == HttpStatus.SC_OK) {
StringBuffer stringBuffer = new StringBuffer();
try {
BufferedReader reader = new BufferedReader(new InputStreamReader(method.getResponseBodyAsStream(), readCharsetName));
String str = "";
while ((str = reader.readLine()) != null) {
stringBuffer.append(new String(str.getBytes(readCharsetName), writeCharsetName));
}
}
catch (IOException e) {
// try {
// //logger.error("执行HTTP响应结果" + method.getURI().toString() + "时，发生异常！", e);
// }
// catch (URIException e1) {
// //logger.error("URIException", e1);
// }
}
response = stringBuffer.toString();
}
method.releaseConnection();
}
long end = System.currentTimeMillis();
log.debug("---------------http's time to get data from report-------------------");
log.debug(start-end + "ms");
log.debug("---------------------------------------------------------------------");
return response;
}
}
src/main/java/util/NewUserLogThread.java
......@@ -38,13 +38,14 @@ public class NewUserLogThread
private String newObject;
//为了获取ip及解析地点
private HttpServletRequest request;
private String platform;
/**
* 传入内容为对象
* UserLogThread userlog = new UserLogThread("zxy@reyun.com", "zxy", OperateObjectTypeEnum.CUSTOMER.getKey(), "app", "查看app", request);
* userlog.start();
*/
public NewUserLogThread(String operaAccount, String accountName, String operateObjectType, String operateObject, String operateType, String oldObject, String newObject, HttpServletRequest request) {
public NewUserLogThread(String operaAccount, String accountName, String operateObjectType, String operateObject, String operateType, String oldObject, String newObject, HttpServletRequest request, String platform) {
this.operaAccount = operaAccount;
this.accountName = accountName;
this.operateObjectType = operateObjectType;
......@@ -70,6 +71,7 @@ public class NewUserLogThread
audit.setOperateType(this.operateType);
audit.setOldObject(this.oldObject);
audit.setNewObject(this.newObject);
audit.setPlatfrom(this.platform);
User user = userRepository.findByEmail(this.operaAccount);
audit.setRole(user.getRole());
......
src/main/java/util/UserLogThread.java
......@@ -34,6 +34,8 @@ public class UserLogThread
private Long role;
private String platfrom;
/**
* 传入内容为对象
* UserLogThread userlog = new UserLogThread("zxy@reyun.com", "zxy", OperateObjectTypeEnum.CUSTOMER.getKey(), "app", "查看app", request);
......
src/main/resources/rest-servlet.xml
......@@ -11,6 +11,7 @@
<context:component-scan base-package="track.controller" />
<context:component-scan base-package="tkio.controller" />
<context:component-scan base-package="userio.controller" />
<context:component-scan base-package="adi.controller" />
<mvc:annotation-driven>
<mvc:argument-resolvers>
......
src/main/resources/spring/applicationContext.xml
......@@ -23,6 +23,7 @@
<context:component-scan base-package="office" />
<context:component-scan base-package="dmp" />
<context:component-scan base-package="security" />
<context:component-scan base-package="adi" />
<context:property-placeholder location="classpath:persistence.properties,classpath:redis.properties"/>
......
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