Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentRouteOrderDao.java

@@ -71,4 +71,11 @@ public interface StudentPaymentRouteOrderDao extends BaseDAO<Long, StudentPaymen
      * @return
      */
     List<String> countByTransNo(@Param("transNos") List<Object> transNos);
+
+    /**
+     * 获取审核通过的学校缴费金额
+     * @param calenderId
+     * @return
+     */
+    BigDecimal sumAmountByCalenderId(Long calenderId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentRouteOrderServiceImpl.java

@@ -65,7 +65,9 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
     @Autowired
     private TeacherDao teacherDao;
     @Autowired
-	private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
+    private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
+    @Autowired
+    private MusicGroupPaymentCalenderDetailDao musicGroupPaymentCalenderDetailDao;
 
     @Override
     public BaseDAO<Long, StudentPaymentRouteOrder> getDAO() {
@@ -73,26 +75,26 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
     }
 
     @Override
-	public PageInfo<StudentPaymentRouteOrder> queryAuditList(QueryInfo queryInfo) {
-    	PageInfo<StudentPaymentRouteOrder> pageInfo = new PageInfo<StudentPaymentRouteOrder>(queryInfo.getPage(), queryInfo.getRows());
-		Map<String, Object> params = new HashMap<String, Object>();
-		MapUtil.populateMap(params, queryInfo);
-		
-		List<StudentPaymentRouteOrder> dataList = null;
-		int count = studentPaymentRouteOrderDao.queryAuditCount(params);
-		if (count > 0) {
-			pageInfo.setTotal(count);
-			params.put("offset", pageInfo.getOffset());
-			dataList = studentPaymentRouteOrderDao.queryAuditPage(params);
-		}
-		if (count == 0) {
-			dataList = new ArrayList<StudentPaymentRouteOrder>();
-		}
-		pageInfo.setRows(dataList);
-		return pageInfo;
-	}
-
-	@Override
+    public PageInfo<StudentPaymentRouteOrder> queryAuditList(QueryInfo queryInfo) {
+        PageInfo<StudentPaymentRouteOrder> pageInfo = new PageInfo<StudentPaymentRouteOrder>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<StudentPaymentRouteOrder> dataList = null;
+        int count = studentPaymentRouteOrderDao.queryAuditCount(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = studentPaymentRouteOrderDao.queryAuditPage(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<StudentPaymentRouteOrder>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
+
+    @Override
     public PageInfoOrder<StudentPaymentRouteOrderDto> OrderQueryPage(StudentPaymentOrderQueryInfo queryInfo) {
         PageInfoOrder<StudentPaymentRouteOrderDto> pageInfo = new PageInfoOrder<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<String, Object>();
@@ -137,152 +139,173 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
         studentPaymentRouteOrder.setRouteAmount(studentPaymentRouteOrder.getSaleAmount().add(studentPaymentRouteOrder.getServiceAmount()));
         studentPaymentRouteOrder.setRouteBalanceAmount(BigDecimal.ZERO);
         studentPaymentRouteOrder.setFeeFlag("N");
-        
+
         studentPaymentRouteOrderDao.insert(studentPaymentRouteOrder);
-        
+
         return studentPaymentRouteOrder;
     }
 
     @Override
-	public StudentPaymentRouteOrder updateOutOrder(StudentPaymentRouteOrder studentPaymentRouteOrder) {
-    	Date nowDate = new Date();
-    	studentPaymentRouteOrder.setAuditStatus(AuditStatusEnum.ING);
+    public StudentPaymentRouteOrder updateOutOrder(StudentPaymentRouteOrder studentPaymentRouteOrder) {
+        Date nowDate = new Date();
+        studentPaymentRouteOrder.setAuditStatus(AuditStatusEnum.ING);
         studentPaymentRouteOrder.setUpdateTime(nowDate);
         studentPaymentRouteOrder.setRouteAmount(studentPaymentRouteOrder.getSaleAmount().add(studentPaymentRouteOrder.getServiceAmount()));
         studentPaymentRouteOrder.setRouteBalanceAmount(BigDecimal.ZERO);
         studentPaymentRouteOrder.setFeeFlag("N");
-        
+
         studentPaymentRouteOrderDao.update(studentPaymentRouteOrder);
-        
-		return studentPaymentRouteOrder;
-	}
 
-	@Override
+        return studentPaymentRouteOrder;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-	public boolean auditOutOrder(Long studentPaymentRouteOrderId, AuditStatusEnum auditStatus, String memo, Integer operatorId) {
-		StudentPaymentRouteOrder studentPaymentRouteOrder = studentPaymentRouteOrderDao.get(studentPaymentRouteOrderId);
-		if(studentPaymentRouteOrder == null){
-			throw new BizException("查询订单信息失败");
-		}
-		
-		if(studentPaymentRouteOrder.getAuditStatus() != AuditStatusEnum.ING){
-			throw new BizException("只有“审核中”的订单才能审核");
-		}
-		
-		Date nowDate = new Date();
-		
-		studentPaymentRouteOrder.setUpdateBy(operatorId);
-		studentPaymentRouteOrder.setUpdateTime(nowDate);
-		studentPaymentRouteOrder.setAuditComment(memo);
-		studentPaymentRouteOrder.setAuditStatus(auditStatus);
-		
-		studentPaymentRouteOrderDao.update(studentPaymentRouteOrder);
-		
-		if(auditStatus == AuditStatusEnum.PASS){
-			StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
-			studentPaymentOrder.setActualAmount(studentPaymentRouteOrder.getRouteAmount());
-			studentPaymentOrder.setMusicGroupId(studentPaymentRouteOrder.getSchoolId()+ "");
-			studentPaymentOrder.setType(OrderTypeEnum.OUTORDER);
-			studentPaymentOrder.setMerNos(studentPaymentRouteOrder.getMerNo());
-			studentPaymentOrder.setOrderNo(studentPaymentRouteOrder.getOrderNo());
-			studentPaymentOrder.setGroupType(GroupType.OUTORDER);
-			studentPaymentOrder.setOrganId(studentPaymentRouteOrder.getRouteOrganId());
-			studentPaymentOrder.setExpectAmount(studentPaymentRouteOrder.getRouteAmount());
-			studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
-			studentPaymentOrder.setCreateTime(studentPaymentRouteOrder.getPayTime());
-			studentPaymentOrder.setUpdateTime(nowDate);
-			studentPaymentOrder.setMemo(studentPaymentRouteOrder.getMemo());
-			studentPaymentOrder.setUserId(studentPaymentRouteOrder.getUserId());
-			studentPaymentOrder.setPayTime(studentPaymentRouteOrder.getPayTime());
-			studentPaymentOrder.setTransNo(studentPaymentRouteOrder.getTransNo());
-			
-	        studentPaymentRouteOrderDao.insertOrder(studentPaymentOrder);
-	        
-	        if (StringUtils.isNoneBlank(studentPaymentRouteOrder.getGoodsJson())) {
-	            BigDecimal hasRouteAmount = BigDecimal.ZERO;
-	            BigDecimal goodsTotalPrice = BigDecimal.ZERO;
-
-	            List<Integer> goodsIdList = new ArrayList<>();
-	            JSONObject jsonObj = JSON.parseObject(studentPaymentRouteOrder.getGoodsJson());
-	            for (Entry<String, Object> goodsMap : jsonObj.entrySet()) {
-	            	Integer goodsId = Integer.parseInt(goodsMap.getKey());
-	            	Integer nums = Integer.parseInt(goodsMap.getValue().toString());
-	                Goods goods = goodsDao.get(goodsId);
-	                goodsTotalPrice = goodsTotalPrice.add(goods.getGroupPurchasePrice().multiply(new BigDecimal(nums)));
-	                for (int i = 0; i < nums; i++) {
-	                    goodsIdList.add(goodsId);
-	                }
-	            }
-	            List<SellOrder> sellOrderList = goodsService.subtractStock(goodsIdList, AccountType.INTERNAL);
-
-	            int i = 1;
-	            for (Entry<String, Object> goodsMap : jsonObj.entrySet()) {
-	            	Integer goodsId = Integer.parseInt(goodsMap.getKey());
-	            	Integer nums = Integer.parseInt(goodsMap.getValue().toString());
-	                Goods goods = goodsDao.get(goodsId);
-
-	                BigDecimal actualAmount = BigDecimal.ZERO;
-	                if (goodsTotalPrice.compareTo(BigDecimal.ZERO) != 0) {
-	                    actualAmount = studentPaymentRouteOrder.getSaleAmount().multiply(goods.getGroupPurchasePrice().multiply(new BigDecimal(nums))).divide(goodsTotalPrice, 2, BigDecimal.ROUND_HALF_UP);
-	                }
-	                if (i == jsonObj.entrySet().size()) {
-	                    actualAmount = studentPaymentRouteOrder.getSaleAmount().subtract(hasRouteAmount);
-	                }
-	                hasRouteAmount = hasRouteAmount.add(actualAmount);
-	                i++;
-
-	                int complementNum = goods.getComplementGoodsIdList() == null ? 1 : goods.getComplementGoodsIdList().split(",").length;
-	                int goodsNum = nums * complementNum;
-	                BigDecimal complementPrice = goods.getGroupPurchasePrice().multiply(new BigDecimal(nums));
-	                Map<Integer, BigDecimal> complementGoodsPrice = new HashMap<>();
-	                complementGoodsPrice.put(goods.getId(), goods.getGroupPurchasePrice());
-	                if (goods.getComplementGoodsIdList() != null) {
-	                    List<Goods> complementGoodies = goodsDao.findGoodsByIds(goods.getComplementGoodsIdList());
-	                    complementGoodsPrice = complementGoodies.stream().collect(Collectors.toMap(Goods::getId, Goods::getGroupPurchasePrice));
-	                    complementPrice = complementGoodies.stream().map(Goods::getGroupPurchasePrice).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(new BigDecimal(nums));
-	                }
-
-	                BigDecimal hasRouteSellOrderActualAmount = BigDecimal.ZERO;
-	                for (SellOrder sellOrder : sellOrderList) {
-	                    if (!goodsMap.getKey().equals(sellOrder.getParentGoodsId()) && !goodsMap.getKey().equals(sellOrder.getGoodsId().toString())) {
-	                        continue;
-	                    }
-	                    BigDecimal sellOrderActualAmount = BigDecimal.ZERO;
-	                    if (complementPrice.compareTo(BigDecimal.ZERO) > 0) {
-	                        sellOrderActualAmount = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(actualAmount).divide(complementPrice, 2, BigDecimal.ROUND_HALF_UP);
-	                    }
-	                    goodsNum = goodsNum - sellOrder.getNum();
-	                    if (goodsNum <= 0) {
-	                        sellOrderActualAmount = actualAmount.subtract(hasRouteSellOrderActualAmount);
-	                    }
-	                    hasRouteSellOrderActualAmount = hasRouteSellOrderActualAmount.add(sellOrderActualAmount);
-
-	                    sellOrder.setSellTime(studentPaymentRouteOrder.getPayTime());
-	                    sellOrder.setOrganId(studentPaymentRouteOrder.getRouteOrganId());
-	                    sellOrder.setCooperationOrganId(studentPaymentRouteOrder.getSchoolId());
-	                    sellOrder.setTransNo(studentPaymentRouteOrder.getTransNo());
-	                    sellOrder.setOrderId(studentPaymentOrder.getId());
-	                    sellOrder.setOrderNo(studentPaymentRouteOrder.getOrderNo());
-	                    sellOrder.setActualAmount(sellOrderActualAmount);
-	                    sellOrder.setBalanceAmount(BigDecimal.ZERO);
-	                    sellOrder.setExpectAmount(sellOrderActualAmount);
-	                    sellOrder.setUserId(studentPaymentRouteOrder.getUserId());
-	                    sellOrder.setPaymentChannel(studentPaymentOrder.getPaymentChannel());
-	                    sellOrder.setMerNo(studentPaymentRouteOrder.getMerNo());
-	                    sellOrder.setSellTime(studentPaymentRouteOrder.getCreateTime());
-	                    sellOrder.setCreateIme(nowDate);
-	                    sellOrder.setUpdateTime(nowDate);
-	                    sellOrder.setType(SellTypeEnum.SCHOOL_BUY);
-	                }
-	            }
-	            sellOrderDao.batchInsert(sellOrderList);
-	        }
-
-		}
-		return true;
-	}
-
-	@Override
+    public boolean auditOutOrder(Long studentPaymentRouteOrderId, AuditStatusEnum auditStatus, String memo, Integer operatorId) {
+        StudentPaymentRouteOrder studentPaymentRouteOrder = studentPaymentRouteOrderDao.get(studentPaymentRouteOrderId);
+        if (studentPaymentRouteOrder == null) {
+            throw new BizException("查询订单信息失败");
+        }
+
+        if (studentPaymentRouteOrder.getAuditStatus() != AuditStatusEnum.ING) {
+            throw new BizException("只有“审核中”的订单才能审核");
+        }
+
+        Date nowDate = new Date();
+
+        studentPaymentRouteOrder.setUpdateBy(operatorId);
+        studentPaymentRouteOrder.setUpdateTime(nowDate);
+        studentPaymentRouteOrder.setAuditComment(memo);
+        studentPaymentRouteOrder.setAuditStatus(auditStatus);
+
+        studentPaymentRouteOrderDao.update(studentPaymentRouteOrder);
+
+        if (auditStatus == AuditStatusEnum.PASS) {
+            StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
+            studentPaymentOrder.setActualAmount(studentPaymentRouteOrder.getRouteAmount());
+            studentPaymentOrder.setMusicGroupId(studentPaymentRouteOrder.getSchoolId() + "");
+            studentPaymentOrder.setType(OrderTypeEnum.OUTORDER);
+            studentPaymentOrder.setMerNos(studentPaymentRouteOrder.getMerNo());
+            studentPaymentOrder.setOrderNo(studentPaymentRouteOrder.getOrderNo());
+            studentPaymentOrder.setGroupType(GroupType.OUTORDER);
+            studentPaymentOrder.setOrganId(studentPaymentRouteOrder.getRouteOrganId());
+            studentPaymentOrder.setExpectAmount(studentPaymentRouteOrder.getRouteAmount());
+            studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
+            studentPaymentOrder.setCreateTime(studentPaymentRouteOrder.getPayTime());
+            studentPaymentOrder.setUpdateTime(nowDate);
+            studentPaymentOrder.setMemo(studentPaymentRouteOrder.getMemo());
+            studentPaymentOrder.setUserId(studentPaymentRouteOrder.getUserId());
+            studentPaymentOrder.setPayTime(studentPaymentRouteOrder.getPayTime());
+            studentPaymentOrder.setTransNo(studentPaymentRouteOrder.getTransNo());
+
+            studentPaymentRouteOrderDao.insertOrder(studentPaymentOrder);
+
+            if (StringUtils.isNoneBlank(studentPaymentRouteOrder.getGoodsJson())) {
+                BigDecimal hasRouteAmount = BigDecimal.ZERO;
+                BigDecimal goodsTotalPrice = BigDecimal.ZERO;
+
+                List<Integer> goodsIdList = new ArrayList<>();
+                JSONObject jsonObj = JSON.parseObject(studentPaymentRouteOrder.getGoodsJson());
+                for (Entry<String, Object> goodsMap : jsonObj.entrySet()) {
+                    Integer goodsId = Integer.parseInt(goodsMap.getKey());
+                    Integer nums = Integer.parseInt(goodsMap.getValue().toString());
+                    Goods goods = goodsDao.get(goodsId);
+                    goodsTotalPrice = goodsTotalPrice.add(goods.getGroupPurchasePrice().multiply(new BigDecimal(nums)));
+                    for (int i = 0; i < nums; i++) {
+                        goodsIdList.add(goodsId);
+                    }
+                }
+                List<SellOrder> sellOrderList = goodsService.subtractStock(goodsIdList, AccountType.INTERNAL);
+
+                int i = 1;
+                for (Entry<String, Object> goodsMap : jsonObj.entrySet()) {
+                    Integer goodsId = Integer.parseInt(goodsMap.getKey());
+                    Integer nums = Integer.parseInt(goodsMap.getValue().toString());
+                    Goods goods = goodsDao.get(goodsId);
+
+                    BigDecimal actualAmount = BigDecimal.ZERO;
+                    if (goodsTotalPrice.compareTo(BigDecimal.ZERO) != 0) {
+                        actualAmount = studentPaymentRouteOrder.getSaleAmount().multiply(goods.getGroupPurchasePrice().multiply(new BigDecimal(nums))).divide(goodsTotalPrice, 2, BigDecimal.ROUND_HALF_UP);
+                    }
+                    if (i == jsonObj.entrySet().size()) {
+                        actualAmount = studentPaymentRouteOrder.getSaleAmount().subtract(hasRouteAmount);
+                    }
+                    hasRouteAmount = hasRouteAmount.add(actualAmount);
+                    i++;
+
+                    int complementNum = goods.getComplementGoodsIdList() == null ? 1 : goods.getComplementGoodsIdList().split(",").length;
+                    int goodsNum = nums * complementNum;
+                    BigDecimal complementPrice = goods.getGroupPurchasePrice().multiply(new BigDecimal(nums));
+                    Map<Integer, BigDecimal> complementGoodsPrice = new HashMap<>();
+                    complementGoodsPrice.put(goods.getId(), goods.getGroupPurchasePrice());
+                    if (goods.getComplementGoodsIdList() != null) {
+                        List<Goods> complementGoodies = goodsDao.findGoodsByIds(goods.getComplementGoodsIdList());
+                        complementGoodsPrice = complementGoodies.stream().collect(Collectors.toMap(Goods::getId, Goods::getGroupPurchasePrice));
+                        complementPrice = complementGoodies.stream().map(Goods::getGroupPurchasePrice).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(new BigDecimal(nums));
+                    }
+
+                    BigDecimal hasRouteSellOrderActualAmount = BigDecimal.ZERO;
+                    for (SellOrder sellOrder : sellOrderList) {
+                        if (!goodsMap.getKey().equals(sellOrder.getParentGoodsId()) && !goodsMap.getKey().equals(sellOrder.getGoodsId().toString())) {
+                            continue;
+                        }
+                        BigDecimal sellOrderActualAmount = BigDecimal.ZERO;
+                        if (complementPrice.compareTo(BigDecimal.ZERO) > 0) {
+                            sellOrderActualAmount = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(actualAmount).divide(complementPrice, 2, BigDecimal.ROUND_HALF_UP);
+                        }
+                        goodsNum = goodsNum - sellOrder.getNum();
+                        if (goodsNum <= 0) {
+                            sellOrderActualAmount = actualAmount.subtract(hasRouteSellOrderActualAmount);
+                        }
+                        hasRouteSellOrderActualAmount = hasRouteSellOrderActualAmount.add(sellOrderActualAmount);
+
+                        sellOrder.setSellTime(studentPaymentRouteOrder.getPayTime());
+                        sellOrder.setOrganId(studentPaymentRouteOrder.getRouteOrganId());
+                        sellOrder.setCooperationOrganId(studentPaymentRouteOrder.getSchoolId());
+                        sellOrder.setTransNo(studentPaymentRouteOrder.getTransNo());
+                        sellOrder.setOrderId(studentPaymentOrder.getId());
+                        sellOrder.setOrderNo(studentPaymentRouteOrder.getOrderNo());
+                        sellOrder.setActualAmount(sellOrderActualAmount);
+                        sellOrder.setBalanceAmount(BigDecimal.ZERO);
+                        sellOrder.setExpectAmount(sellOrderActualAmount);
+                        sellOrder.setUserId(studentPaymentRouteOrder.getUserId());
+                        sellOrder.setPaymentChannel(studentPaymentOrder.getPaymentChannel());
+                        sellOrder.setMerNo(studentPaymentRouteOrder.getMerNo());
+                        sellOrder.setSellTime(studentPaymentRouteOrder.getCreateTime());
+                        sellOrder.setCreateIme(nowDate);
+                        sellOrder.setUpdateTime(nowDate);
+                        sellOrder.setType(SellTypeEnum.SCHOOL_BUY);
+                    }
+                }
+                sellOrderDao.batchInsert(sellOrderList);
+            }
+
+            //根据学校缴费项id，确定缴费状态
+            BigDecimal amount = studentPaymentRouteOrderDao.sumAmountByCalenderId(studentPaymentRouteOrder.getCalenderId());
+            List<MusicGroupPaymentCalenderDetail> calenderDetails = musicGroupPaymentCalenderDetailDao.getCalenderDetailWithCalender(studentPaymentRouteOrder.getCalenderId());
+            BigDecimal schoolNeedPayAmount = calenderDetails.stream().map(MusicGroupPaymentCalenderDetail::getExpectAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+            MusicGroupPaymentCalender musicGroupPaymentCalender = musicGroupPaymentCalenderDao.get(studentPaymentRouteOrder.getCalenderId());
+
+            if (amount.compareTo(schoolNeedPayAmount) >= 0 &&
+                    !musicGroupPaymentCalender.getStatus().equals(MusicGroupPaymentCalender.PaymentCalenderStatusEnum.PAID)) {
+                musicGroupPaymentCalender.setActualNum(musicGroupPaymentCalender.getExpectNum());
+                musicGroupPaymentCalender.setStatus(MusicGroupPaymentCalender.PaymentCalenderStatusEnum.PAID);
+                musicGroupPaymentCalenderDao.update(musicGroupPaymentCalender);
+
+                for (MusicGroupPaymentCalenderDetail calenderDetail : calenderDetails) {
+                    calenderDetail.setActualAmount(calenderDetail.getExpectAmount());
+                    calenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
+                    calenderDetail.setPayTime(nowDate);
+                    calenderDetail.setUpdateTime(nowDate);
+                }
+                musicGroupPaymentCalenderDetailDao.batchUpdate(calenderDetails);
+            }
+
+        }
+        return true;
+    }
+
+    @Override
     public StudentPaymentRouteOrder addRouteOrder(String orderNo, Integer routeOrganId, BigDecimal routeBalanceAmount) {
         StudentPaymentRouteOrder studentPaymentRouteOrder = new StudentPaymentRouteOrder();
         studentPaymentRouteOrder.setOrderNo(orderNo);
@@ -314,199 +337,200 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
     }
 
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public HttpResponseResult<List<StudentPaymentRouteOrder>> importRouteOrder(MultipartFile file) throws Exception{
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if(sysUser == null || sysUser.getId() == null){
-			throw new BizException("用户信息获取失败");
-		}
-		Map<String, List<Map<String, Object>>> sheetsListMap = POIUtil.importExcel(new ByteArrayInputStream(file.getBytes()), 2, file.getOriginalFilename());
-		InputStream inputStream = new ClassPathResource("columnMapper.ini").getInputStream();
-		Map<String,String> columns = IniFileUtil.readIniFile(inputStream, TemplateTypeEnum.ROUTE_ORDER.getMsg());
-		List<StudentPaymentRouteOrder> studentPaymentRouteOrders = new ArrayList<>();
-		Map<String, Integer> organMap = getMap("organization", "name_", "id_", true, String.class, Integer.class);
-		Map<String, Integer> cooperationOrganMap = getMap("cooperation_organ", "name_", "id_", true, String.class, Integer.class);
-		StringBuffer sb = new StringBuffer();
-		for (String e : sheetsListMap.keySet()) {
-			List<Map<String, Object>> sheet = sheetsListMap.get(e);
-			List<Object> collect = sheet.stream().map(m -> m.get("交易流水号")).collect(Collectors.toList());
-			if(collect == null || collect.size() == 0){
-				continue;
-			}
-			List<String> list = studentPaymentRouteOrderDao.countByTransNo(collect);
-			if(list != null && list.size() > 0){
-				throw new BizException("导入数据错误  重复的交易流水号:{}",list.get(0));
-			}
-
-			List<Long> calenderIds = sheet.stream().map(m -> Long.parseLong(m.get("学校缴费项id").toString())).collect(Collectors.toList());
-			List<MusicGroupPaymentCalender> calenders = musicGroupPaymentCalenderDao.getPaymentCalenderWithCalenderIdsAndPayUserType(calenderIds, MusicGroupPaymentCalender.PayUserType.SCHOOL);
-			Map<String, Long> schoolCalender = calenders.stream().collect(Collectors.toMap(m->m.getId().toString(), MusicGroupPaymentCalender::getId));
-
-			valueIsNull: for (int j = 0; j < sheet.size(); j++) {
-				int rowNum = j + 2;
-				Map<String, Object> row = sheet.get(j);
-				if (row.size() == 0){
-					continue;
-				}
-				JSONObject objectMap = new JSONObject();
-				Iterator<String> iterator = row.keySet().iterator();
-				for (int i = 0; i < row.keySet().size(); i++) {
-					String s = iterator.next();
-					if(!columns.containsKey(s)){
-						continue;
-					}
-					String columnValue = columns.get(s);
-					if (columnValue.equals("incomeType")) {
-						if(StringUtils.isEmpty(row.get(s).toString())){
-							sb.append("第" + rowNum).append("行数据导入失败：收入类型不可为空;");
-							continue valueIsNull;
-						} else {
-							objectMap.put("incomeType", row.get(s));
-						}
-					}
-					if (columnValue.equals("transNo")) {
-						if(StringUtils.isEmpty(row.get(s).toString())){
-							sb.append("第" + rowNum).append("行数据导入失败：交易流水号不可为空;");
-							continue valueIsNull;
-						}
-					}
-					if (columnValue.equals("payTime") && StringUtils.isEmpty(row.get(s).toString())) {
-						if(StringUtils.isEmpty(row.get(s).toString())){
-							sb.append("第" + rowNum).append("行数据导入失败：交易日期不可为空;");
-							continue valueIsNull;
-						}
-					}
-					if (columnValue.equals("merNo")) {
-						if(StringUtils.isEmpty(row.get(s).toString())){
-							sb.append("第" + rowNum).append("行数据导入失败：收款账户不可为空;");
-							continue valueIsNull;
-						}else {
-							objectMap.put("merNo", row.get(s));
-						}
-						continue;
-					}
-					if (columnValue.equals("organName") && StringUtils.isNotEmpty(row.get(s).toString())) {
-						Integer integer = organMap.get(row.get(s));
-						if(integer == null){
-							sb.append("第" + rowNum).append("行数据导入失败：分部名称不存在;");
-							continue valueIsNull;
-						}else {
-							objectMap.put("routeOrganId", integer);
-						}
-						continue;
-					}
-					if (columnValue.equals("cooperationOrganName") && StringUtils.isNotEmpty(row.get(s).toString())) {
-						Integer integer = cooperationOrganMap.get(row.get(s));
-						if(integer != null){
-							objectMap.put("schoolId", integer);
-						}else {
-							sb.append("第" + rowNum).append("行数据导入失败：所属学校名称不存在;");
-							continue valueIsNull;
-						}
-						continue;
-					}
-					if (columnValue.equals("userId") && StringUtils.isNotEmpty(row.get(s).toString())) {
-						Boolean flag = teacherDao.existUser(row.get(s));
-						if(flag){
-							objectMap.put("userId", row.get(s));
-						}else {
-							sb.append("第" + rowNum).append("行数据导入失败：学员编号不存在;");
-							continue valueIsNull;
-						}
-						continue;
-					}
-					if (columnValue.equals("payTime")) {
-						String toString = row.get(s).toString();
-						Date date = DateUtil.stringToDate(toString, DateUtil.DEFAULT_PATTERN);
-						if(date == null){
-							sb.append("第" + rowNum).append("行数据导入失败：交易日期格式错误;");
-							continue valueIsNull;
-						}else {
-							objectMap.put(columnValue, DateUtil.format(date,DateUtil.DEFAULT_PATTERN));
-						}
-						continue;
-					}
-					if (columnValue.equals("calenderId")) {
-						if(StringUtils.isEmpty(row.get(s).toString())){
-							sb.append("第" + rowNum).append("行数据导入失败：学校缴费项id不可为空;");
-							continue valueIsNull;
-						}else if(!schoolCalender.containsKey(row.get(s).toString())) {
-							sb.append("第" + rowNum).append("行数据导入失败：学校缴费项id不存在;");
-						}else {
-							objectMap.put("calenderId", row.get(s));
-						}
-						continue;
-					}
-					objectMap.put(columnValue, row.get(s));
-				}
-				StudentPaymentRouteOrder studentPaymentRouteOrder = JSONObject.parseObject(objectMap.toJSONString(),StudentPaymentRouteOrder.class);
-				//销售收入
-				if("销售收入".equals(studentPaymentRouteOrder.getIncomeType())){
-					if(studentPaymentRouteOrder.getSaleAmount() == null){
-						throw new BizException("导入失败：交易流水号{},收入类型为销售收入时，销售金额不可为空",studentPaymentRouteOrder.getTransNo());
-					}
-					studentPaymentRouteOrder.setServiceAmount(null);
-					String goodsIds = studentPaymentRouteOrder.getGoodsIds();
-					String goodsNums = studentPaymentRouteOrder.getGoodsNums();
-
-					if(StringUtils.isEmpty(goodsNums)){
-						throw new BizException("导入失败：有销售金额时商品数量必填");
-					}
-					if(StringUtils.isEmpty(goodsIds)){
-						throw new BizException("导入失败：有销售金额时商品编号必填");
-					}
-					List<String> goodsIdList = new ArrayList(Arrays.asList(goodsIds.split(",")));
-					List<String> goodsNumList = new ArrayList(Arrays.asList(goodsNums.split(",")));
-					if(goodsIdList.size() != goodsNumList.size()){
-						throw new BizException("导入失败：商品编号和商品数量不一致");
-					}
-					JSONArray goodsJSON = new JSONArray();
-					for (int i = 0; i < goodsIdList.size(); i++) {
-						if(!goodsDao.findByIdAndStatus(goodsIdList.get(i), 1)){
-							throw new BizException("导入失败：商品编号{}不存在",goodsIdList.get(i));
-						}
-						try {
-							int goodsNum = Integer.parseInt(goodsNumList.get(i));
-							JSONObject jsonObject = new JSONObject();
-							jsonObject.put(goodsIdList.get(i),goodsNum);
-							goodsJSON.add(jsonObject);
-						}catch (Exception e1){
-							throw new BizException("导入失败：商品数量{}填写错误",goodsNumList.get(i));
-						}
-					}
-					studentPaymentRouteOrder.setGoodsJson(goodsJSON.toJSONString());
-					//服务收入
-				}else {
-					studentPaymentRouteOrder.setSaleAmount(null);
-					if(studentPaymentRouteOrder.getServiceAmount() == null){
-						throw new BizException("导入失败：交易流水号{},收入类型为服务收入时，服务金额不可为空",studentPaymentRouteOrder.getTransNo());
-					}
-				}
-				studentPaymentRouteOrder.setCreateBy(sysUser.getId());
-				studentPaymentRouteOrder.setUpdateBy(sysUser.getId());
-				studentPaymentRouteOrder.setUserId(sysUser.getId());
-				studentPaymentRouteOrders.add(studentPaymentRouteOrder);
-			}
-		}
-		if(studentPaymentRouteOrders.size() > 0){
-			Map<String, List<StudentPaymentRouteOrder>> stringListMap = studentPaymentRouteOrders.stream().collect(Collectors.groupingBy(StudentPaymentRouteOrder::getTransNo));
-			if(stringListMap.size() != studentPaymentRouteOrders.size()){
-				throw new BizException("导入失败：请勿录入重复的交易流水号");
-			}
-			studentPaymentRouteOrderDao.batchAdd(studentPaymentRouteOrders);
-		}else {
-			throw new BizException("导入失败：没有可以录入的数据");
-		}
-		HttpResponseResult httpResponseResult = new HttpResponseResult();
-		httpResponseResult.setData(studentPaymentRouteOrders);
-		httpResponseResult.setMsg(sb.toString());
-		if(StringUtils.isNotEmpty(sb.toString())){
-			httpResponseResult.setCode(0);
-		}else {
-			httpResponseResult.setCode(200);
-		}
-		return httpResponseResult;
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public HttpResponseResult<List<StudentPaymentRouteOrder>> importRouteOrder(MultipartFile file) throws Exception {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null || sysUser.getId() == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        Map<String, List<Map<String, Object>>> sheetsListMap = POIUtil.importExcel(new ByteArrayInputStream(file.getBytes()), 2, file.getOriginalFilename());
+        InputStream inputStream = new ClassPathResource("columnMapper.ini").getInputStream();
+        Map<String, String> columns = IniFileUtil.readIniFile(inputStream, TemplateTypeEnum.ROUTE_ORDER.getMsg());
+        List<StudentPaymentRouteOrder> studentPaymentRouteOrders = new ArrayList<>();
+        Map<String, Integer> organMap = getMap("organization", "name_", "id_", true, String.class, Integer.class);
+        Map<String, Integer> cooperationOrganMap = getMap("cooperation_organ", "name_", "id_", true, String.class, Integer.class);
+        StringBuffer sb = new StringBuffer();
+        for (String e : sheetsListMap.keySet()) {
+            List<Map<String, Object>> sheet = sheetsListMap.get(e);
+            List<Object> collect = sheet.stream().map(m -> m.get("交易流水号")).collect(Collectors.toList());
+            if (collect == null || collect.size() == 0) {
+                continue;
+            }
+            List<String> list = studentPaymentRouteOrderDao.countByTransNo(collect);
+            if (list != null && list.size() > 0) {
+                throw new BizException("导入数据错误  重复的交易流水号:{}", list.get(0));
+            }
+
+            List<Long> calenderIds = sheet.stream().map(m -> Long.parseLong(m.get("学校缴费项id").toString())).collect(Collectors.toList());
+            List<MusicGroupPaymentCalender> calenders = musicGroupPaymentCalenderDao.getPaymentCalenderWithCalenderIdsAndPayUserType(calenderIds, MusicGroupPaymentCalender.PayUserType.SCHOOL);
+            Map<String, Long> schoolCalender = calenders.stream().collect(Collectors.toMap(m -> m.getId().toString(), MusicGroupPaymentCalender::getId));
+
+            valueIsNull:
+            for (int j = 0; j < sheet.size(); j++) {
+                int rowNum = j + 2;
+                Map<String, Object> row = sheet.get(j);
+                if (row.size() == 0) {
+                    continue;
+                }
+                JSONObject objectMap = new JSONObject();
+                Iterator<String> iterator = row.keySet().iterator();
+                for (int i = 0; i < row.keySet().size(); i++) {
+                    String s = iterator.next();
+                    if (!columns.containsKey(s)) {
+                        continue;
+                    }
+                    String columnValue = columns.get(s);
+                    if (columnValue.equals("incomeType")) {
+                        if (StringUtils.isEmpty(row.get(s).toString())) {
+                            sb.append("第" + rowNum).append("行数据导入失败：收入类型不可为空;");
+                            continue valueIsNull;
+                        } else {
+                            objectMap.put("incomeType", row.get(s));
+                        }
+                    }
+                    if (columnValue.equals("transNo")) {
+                        if (StringUtils.isEmpty(row.get(s).toString())) {
+                            sb.append("第" + rowNum).append("行数据导入失败：交易流水号不可为空;");
+                            continue valueIsNull;
+                        }
+                    }
+                    if (columnValue.equals("payTime") && StringUtils.isEmpty(row.get(s).toString())) {
+                        if (StringUtils.isEmpty(row.get(s).toString())) {
+                            sb.append("第" + rowNum).append("行数据导入失败：交易日期不可为空;");
+                            continue valueIsNull;
+                        }
+                    }
+                    if (columnValue.equals("merNo")) {
+                        if (StringUtils.isEmpty(row.get(s).toString())) {
+                            sb.append("第" + rowNum).append("行数据导入失败：收款账户不可为空;");
+                            continue valueIsNull;
+                        } else {
+                            objectMap.put("merNo", row.get(s));
+                        }
+                        continue;
+                    }
+                    if (columnValue.equals("organName") && StringUtils.isNotEmpty(row.get(s).toString())) {
+                        Integer integer = organMap.get(row.get(s));
+                        if (integer == null) {
+                            sb.append("第" + rowNum).append("行数据导入失败：分部名称不存在;");
+                            continue valueIsNull;
+                        } else {
+                            objectMap.put("routeOrganId", integer);
+                        }
+                        continue;
+                    }
+                    if (columnValue.equals("cooperationOrganName") && StringUtils.isNotEmpty(row.get(s).toString())) {
+                        Integer integer = cooperationOrganMap.get(row.get(s));
+                        if (integer != null) {
+                            objectMap.put("schoolId", integer);
+                        } else {
+                            sb.append("第" + rowNum).append("行数据导入失败：所属学校名称不存在;");
+                            continue valueIsNull;
+                        }
+                        continue;
+                    }
+                    if (columnValue.equals("userId") && StringUtils.isNotEmpty(row.get(s).toString())) {
+                        Boolean flag = teacherDao.existUser(row.get(s));
+                        if (flag) {
+                            objectMap.put("userId", row.get(s));
+                        } else {
+                            sb.append("第" + rowNum).append("行数据导入失败：学员编号不存在;");
+                            continue valueIsNull;
+                        }
+                        continue;
+                    }
+                    if (columnValue.equals("payTime")) {
+                        String toString = row.get(s).toString();
+                        Date date = DateUtil.stringToDate(toString, DateUtil.DEFAULT_PATTERN);
+                        if (date == null) {
+                            sb.append("第" + rowNum).append("行数据导入失败：交易日期格式错误;");
+                            continue valueIsNull;
+                        } else {
+                            objectMap.put(columnValue, DateUtil.format(date, DateUtil.DEFAULT_PATTERN));
+                        }
+                        continue;
+                    }
+                    if (columnValue.equals("calenderId")) {
+                        if (StringUtils.isEmpty(row.get(s).toString())) {
+                            sb.append("第" + rowNum).append("行数据导入失败：学校缴费项id不可为空;");
+                            continue valueIsNull;
+                        } else if (!schoolCalender.containsKey(row.get(s).toString())) {
+                            sb.append("第" + rowNum).append("行数据导入失败：学校缴费项id不存在;");
+                        } else {
+                            objectMap.put("calenderId", row.get(s));
+                        }
+                        continue;
+                    }
+                    objectMap.put(columnValue, row.get(s));
+                }
+                StudentPaymentRouteOrder studentPaymentRouteOrder = JSONObject.parseObject(objectMap.toJSONString(), StudentPaymentRouteOrder.class);
+                //销售收入
+                if ("销售收入".equals(studentPaymentRouteOrder.getIncomeType())) {
+                    if (studentPaymentRouteOrder.getSaleAmount() == null) {
+                        throw new BizException("导入失败：交易流水号{},收入类型为销售收入时，销售金额不可为空", studentPaymentRouteOrder.getTransNo());
+                    }
+                    studentPaymentRouteOrder.setServiceAmount(null);
+                    String goodsIds = studentPaymentRouteOrder.getGoodsIds();
+                    String goodsNums = studentPaymentRouteOrder.getGoodsNums();
+
+                    if (StringUtils.isEmpty(goodsNums)) {
+                        throw new BizException("导入失败：有销售金额时商品数量必填");
+                    }
+                    if (StringUtils.isEmpty(goodsIds)) {
+                        throw new BizException("导入失败：有销售金额时商品编号必填");
+                    }
+                    List<String> goodsIdList = new ArrayList(Arrays.asList(goodsIds.split(",")));
+                    List<String> goodsNumList = new ArrayList(Arrays.asList(goodsNums.split(",")));
+                    if (goodsIdList.size() != goodsNumList.size()) {
+                        throw new BizException("导入失败：商品编号和商品数量不一致");
+                    }
+                    JSONArray goodsJSON = new JSONArray();
+                    for (int i = 0; i < goodsIdList.size(); i++) {
+                        if (!goodsDao.findByIdAndStatus(goodsIdList.get(i), 1)) {
+                            throw new BizException("导入失败：商品编号{}不存在", goodsIdList.get(i));
+                        }
+                        try {
+                            int goodsNum = Integer.parseInt(goodsNumList.get(i));
+                            JSONObject jsonObject = new JSONObject();
+                            jsonObject.put(goodsIdList.get(i), goodsNum);
+                            goodsJSON.add(jsonObject);
+                        } catch (Exception e1) {
+                            throw new BizException("导入失败：商品数量{}填写错误", goodsNumList.get(i));
+                        }
+                    }
+                    studentPaymentRouteOrder.setGoodsJson(goodsJSON.toJSONString());
+                    //服务收入
+                } else {
+                    studentPaymentRouteOrder.setSaleAmount(null);
+                    if (studentPaymentRouteOrder.getServiceAmount() == null) {
+                        throw new BizException("导入失败：交易流水号{},收入类型为服务收入时，服务金额不可为空", studentPaymentRouteOrder.getTransNo());
+                    }
+                }
+                studentPaymentRouteOrder.setCreateBy(sysUser.getId());
+                studentPaymentRouteOrder.setUpdateBy(sysUser.getId());
+                studentPaymentRouteOrder.setUserId(sysUser.getId());
+                studentPaymentRouteOrders.add(studentPaymentRouteOrder);
+            }
+        }
+        if (studentPaymentRouteOrders.size() > 0) {
+            Map<String, List<StudentPaymentRouteOrder>> stringListMap = studentPaymentRouteOrders.stream().collect(Collectors.groupingBy(StudentPaymentRouteOrder::getTransNo));
+            if (stringListMap.size() != studentPaymentRouteOrders.size()) {
+                throw new BizException("导入失败：请勿录入重复的交易流水号");
+            }
+            studentPaymentRouteOrderDao.batchAdd(studentPaymentRouteOrders);
+        } else {
+            throw new BizException("导入失败：没有可以录入的数据");
+        }
+        HttpResponseResult httpResponseResult = new HttpResponseResult();
+        httpResponseResult.setData(studentPaymentRouteOrders);
+        httpResponseResult.setMsg(sb.toString());
+        if (StringUtils.isNotEmpty(sb.toString())) {
+            httpResponseResult.setCode(0);
+        } else {
+            httpResponseResult.setCode(200);
+        }
+        return httpResponseResult;
+    }
 
 }

mec-biz/src/main/resources/config/mybatis/StudentPaymentRouteOrderMapper.xml

@@ -377,5 +377,8 @@
 		order by spro.id_ desc
 		<include refid="global.limit" />
 	</select>
+    <select id="sumAmountByCalenderId" resultType="java.math.BigDecimal">
+        SELECT IF(SUM(route_amount_) IS NULL,0, SUM(route_amount_))FROM student_payment_route_order WHERE calender_id_ = #{calenderId}
+    </select>
 
 </mapper>

mec-web/src/main/resources/columnMapper.ini

@@ -50,4 +50,4 @@
 商品编号 = goodsIds
 商品数量 = goodsNums
 备注 = memo
-缴费项id = calenderId
+学校缴费项id = calenderId