Merge remote-tracking branch 'origin/master'

service-manager/src/main/java/com/winsun/controller/SalesListController.java

@@ -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.shiro.ShiroUser;
 import com.winsun.auth.core.util.IOUtils;
+import com.winsun.bean.NetworkInfo;
 import com.winsun.bean.SalesList;
 import com.winsun.bean.School;
 import com.winsun.bean.SysUser;
 import com.winsun.constant.OrderType;
+import com.winsun.mapper.NetworkInfoMapper;
 import com.winsun.mapper.SalesListMapper;
 import com.winsun.mapper.SchoolMapper;
 import com.winsun.mapper.SysUserMapper;
@@ -104,10 +106,12 @@ public class SalesListController extends BaseController{
 	private static SysUserMapper sysUserMapper;
 	private static SchoolMapper schoolMapper;
 
+	private static NetworkInfoMapper networkInfoMapper;
+
 	private static ThreadLocal<List<Map<String, Object>>> exportList = new ThreadLocal<>();
 
 	@Autowired
-	public SalesListController(SalesListMapper salesListMapper,SysUserMapper sysUserMapper,SchoolMapper schoolMapper) {
+	public SalesListController(SalesListMapper salesListMapper,SysUserMapper sysUserMapper,SchoolMapper schoolMapper, NetworkInfoMapper networkInfoMapper) {
 		SalesListController.salesListMapper = salesListMapper;
 		SalesListController.sysUserMapper = sysUserMapper;
 		SalesListController.schoolMapper = schoolMapper;
@@ -597,11 +601,12 @@ public class SalesListController extends BaseController{
     	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," +
-				"start_date as startDate, end_date as endDate, greater_fifty as greaterFifty, greater_hundred as greaterHundred");
-    	List<Map<String, Object>> schoolList = schoolMapper.selectMaps(wrapperSchool);
-    	Map<String, Map<String,Object>> schoolMaps = MapUtil.listToMap(schoolList, "schoolName");
+				"spring_start_time as startDate, spring_end_time as endDate, greater_fifty as greaterFifty, greater_hundred as greaterHundred");
+		List<Map<String, Object>> networks = networkInfoMapper.selectMaps(wrapperSchool);
+
+    	Map<String, Map<String,Object>> schoolMaps = MapUtil.listToMap(networks, "networkCode");
     	
     	List<Map<String, Object>> updateList = new ArrayList<>();
     	
@@ -628,10 +633,18 @@ public class SalesListController extends BaseController{
     				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"))) {
+
+    			Map<String, Object> schoolMap = (Map<String, Object>)schoolMaps.get(networkCode);
+
+    			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;
@@ -686,6 +699,7 @@ public class SalesListController extends BaseController{
 					}else {
 						remark = "该学校的网点信息未添加";
 					}
+				}
 
 				// 不达标，充值激励，未发送激励，应发总激励为0
 				if (!"3".equals(status)) {