Skip to content

G
gdtel-gztel-school-center
Commit 4c818f64 by 陈浩建
Options

Merge remote-tracking branch 'origin/master'

parents 1ef30ac4 c2427f20
Showing with 72 additions and 58 deletions
service-manager/src/main/java/com/winsun/controller/SalesListController.java
...@@ -8,10 +8,12 @@ import com.winsun.auth.core.base.controller.BaseController; ...@@ -8,10 +8,12 @@ import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.shiro.ShiroUser; import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.auth.core.util.IOUtils; import com.winsun.auth.core.util.IOUtils;
import com.winsun.bean.NetworkInfo;
import com.winsun.bean.SalesList; import com.winsun.bean.SalesList;
import com.winsun.bean.School; import com.winsun.bean.School;
import com.winsun.bean.SysUser; import com.winsun.bean.SysUser;
import com.winsun.constant.OrderType; import com.winsun.constant.OrderType;
import com.winsun.mapper.NetworkInfoMapper;
import com.winsun.mapper.SalesListMapper; import com.winsun.mapper.SalesListMapper;
import com.winsun.mapper.SchoolMapper; import com.winsun.mapper.SchoolMapper;
import com.winsun.mapper.SysUserMapper; import com.winsun.mapper.SysUserMapper;
...@@ -104,10 +106,12 @@ public class SalesListController extends BaseController{ ...@@ -104,10 +106,12 @@ public class SalesListController extends BaseController{
private static SysUserMapper sysUserMapper; private static SysUserMapper sysUserMapper;
private static SchoolMapper schoolMapper; private static SchoolMapper schoolMapper;
private static NetworkInfoMapper networkInfoMapper;
private static ThreadLocal<List<Map<String, Object>>> exportList = new ThreadLocal<>(); private static ThreadLocal<List<Map<String, Object>>> exportList = new ThreadLocal<>();
@Autowired @Autowired
public SalesListController(SalesListMapper salesListMapper,SysUserMapper sysUserMapper,SchoolMapper schoolMapper) { public SalesListController(SalesListMapper salesListMapper,SysUserMapper sysUserMapper,SchoolMapper schoolMapper, NetworkInfoMapper networkInfoMapper) {
SalesListController.salesListMapper = salesListMapper; SalesListController.salesListMapper = salesListMapper;
SalesListController.sysUserMapper = sysUserMapper; SalesListController.sysUserMapper = sysUserMapper;
SalesListController.schoolMapper = schoolMapper; SalesListController.schoolMapper = schoolMapper;
...@@ -597,11 +601,12 @@ public class SalesListController extends BaseController{ ...@@ -597,11 +601,12 @@ public class SalesListController extends BaseController{
Date nowDate = new Date(); Date nowDate = new Date();
// 获取学校清单比较网点 // 获取学校清单比较网点
Wrapper<School> wrapperSchool = new EntityWrapper<School>(); Wrapper<NetworkInfo> wrapperSchool = new EntityWrapper<NetworkInfo>();
wrapperSchool.setSqlSelect(" school_name as schoolName,network_name as networkName,network_code as networkCode," + wrapperSchool.setSqlSelect(" school_name as schoolName,network_name as networkName,network_code as networkCode," +
"start_date as startDate, end_date as endDate, greater_fifty as greaterFifty, greater_hundred as greaterHundred"); "spring_start_time as startDate, spring_end_time as endDate, greater_fifty as greaterFifty, greater_hundred as greaterHundred");
List<Map<String, Object>> schoolList = schoolMapper.selectMaps(wrapperSchool); List<Map<String, Object>> networks = networkInfoMapper.selectMaps(wrapperSchool);
Map<String, Map<String,Object>> schoolMaps = MapUtil.listToMap(schoolList, "schoolName");
Map<String, Map<String,Object>> schoolMaps = MapUtil.listToMap(networks, "networkCode");
List<Map<String, Object>> updateList = new ArrayList<>(); List<Map<String, Object>> updateList = new ArrayList<>();
...@@ -628,64 +633,73 @@ public class SalesListController extends BaseController{ ...@@ -628,64 +633,73 @@ public class SalesListController extends BaseController{
isSkip = true; isSkip = true;
} }
Map<String, Object> schoolMap = (Map<String, Object>)schoolMaps.get(orderMap.get("salesSchool"));
if(null != schoolMap.get("networkCode") && !"".equals(schoolMap.get("networkCode"))) {
if(networkCode.equals(schoolMap.get("networkCode"))) {
double bonus = 0;
double allBonus = 0;
double nonSendBonus = 0;
double defaultGreaterFifty = 20;
double defaultGreaterHundred = 40;
// 获取数据
Date startDate = schoolMap.get("startDate") == null ? null : (Date)schoolMap.get("startDate");
Date endDate = schoolMap.get("endDate") == null ? null : (Date)schoolMap.get("endDate");
Double greaterFifty = schoolMap.get("greaterFifty") == null ? null : (Double)schoolMap.get("greaterFifty");
Double greaterHundred = schoolMap.get("greaterHundred") == null ? null : (Double)schoolMap.get("greaterHundred");
if (startDate != null && endDate != null &&
startDate.getTime() <= nowDate.getTime() && endDate.getTime() >= nowDate.getTime()) {
isNormalSchoolOpens = true;
}
// 根据网点配置的时段进行判定
if (isNormalSchoolOpens) { Map<String, Object> schoolMap = (Map<String, Object>)schoolMaps.get(networkCode);
if (greaterFifty != null) {
defaultGreaterFifty = greaterFifty; if (schoolMap == null) {
remark = "销售卡网点不在系统网点中";
}else{
// 判断是否有学校名称，没有则网点信息错误
if(null != schoolMap.get("schoolName") && !"".equals(schoolMap.get("schoolName"))) {
// 判断网点学校是否跟销售学校、县分一致，一致则通过审核
if(orderMap.get("salesSchool").toString().indexOf(schoolMap.get("schoolName").toString()) > -1
&& orderMap.get("salesSubst").equals(schoolMap.get("areaName"))) {
double bonus = 0;
double allBonus = 0;
double nonSendBonus = 0;
double defaultGreaterFifty = 20;
double defaultGreaterHundred = 40;
// 获取数据
Date startDate = schoolMap.get("startDate") == null ? null : (Date)schoolMap.get("startDate");
Date endDate = schoolMap.get("endDate") == null ? null : (Date)schoolMap.get("endDate");
Double greaterFifty = schoolMap.get("greaterFifty") == null ? null : (Double)schoolMap.get("greaterFifty");
Double greaterHundred = schoolMap.get("greaterHundred") == null ? null : (Double)schoolMap.get("greaterHundred");
if (startDate != null && endDate != null &&
startDate.getTime() <= nowDate.getTime() && endDate.getTime() >= nowDate.getTime()) {
isNormalSchoolOpens = true;
} }
if (greaterHundred != null) {
defaultGreaterHundred = greaterHundred; // 根据网点配置的时段进行判定
if (isNormalSchoolOpens) {
if (greaterFifty != null) {
defaultGreaterFifty = greaterFifty;
}
if (greaterHundred != null) {
defaultGreaterHundred = greaterHundred;
}
} }
}
if(amount >= 50 && amount < 100) { if(amount >= 50 && amount < 100) {
bonus = defaultGreaterFifty; bonus = defaultGreaterFifty;
}else if(amount >= 100) { }else if(amount >= 100) {
bonus = defaultGreaterHundred; bonus = defaultGreaterHundred;
} }
if("广州美术学院（大学城）".equals(orderMap.get("sales_school")) && bonus >= 20){ if("广州美术学院（大学城）".equals(orderMap.get("sales_school")) && bonus >= 20){
bonus = 10; bonus = 10;
} }
allBonus = bonus; allBonus = bonus;
nonSendBonus = bonus; nonSendBonus = bonus;
if(bonus == 0) { if(bonus == 0) {
status = "4"; status = "4";
remark = "充值金额小于50元"; remark = "充值金额小于50元";
}else { }else {
status = "3"; status = "3";
remark = ""; remark = "";
}
orderMap.put("nonSendBonus", nonSendBonus);
orderMap.put("allBonus", allBonus);
orderMap.put("recentlyAmount", amount);
orderMap.put("recentlyBonus", bonus);
} }
orderMap.put("nonSendBonus", nonSendBonus); }else {
orderMap.put("allBonus", allBonus); remark = "该学校的网点信息未添加";
orderMap.put("recentlyAmount", amount); }
orderMap.put("recentlyBonus", bonus); }
}
}else {
remark = "该学校的网点信息未添加";
}
// 不达标，充值激励，未发送激励，应发总激励为0 // 不达标，充值激励，未发送激励，应发总激励为0
if (!"3".equals(status)) { if (!"3".equals(status)) {
......
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