Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRegistration.java

@@ -110,6 +110,8 @@ public class StudentRegistration {
 
     //乐团
     private OwnershipType ownershipType;
+    
+    private Integer chargeTypeId;
 
     public BigDecimal getBalance() {
         return balance;
@@ -381,4 +383,12 @@ public class StudentRegistration {
     public void setOwnershipType(OwnershipType ownershipType) {
         this.ownershipType = ownershipType;
     }
+
+	public Integer getChargeTypeId() {
+		return chargeTypeId;
+	}
+
+	public void setChargeTypeId(Integer chargeTypeId) {
+		this.chargeTypeId = chargeTypeId;
+	}
 }

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

@@ -117,6 +117,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
 						Integer integer = organMap.get(row.get(s));
 						if(integer == null){
 							LOGGER.error("支出记录导入异常：分部校验失败 param:{}",objectMap);
+							continue valueIsNull;
 						}else {
 							objectMap.put("organId", integer);
 						}

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

@@ -208,7 +208,9 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                 sellOrders.add(sellOrder);
             }
         }
-        sellOrderDao.batchInsert(sellOrders);
+        if (sellOrders.size() > 0) {
+            sellOrderDao.batchInsert(sellOrders);
+        }
         return sellOrders;
     }
 

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

@@ -169,7 +169,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         if (goodsSellDto.getIsUseBalancePayment() && amount.compareTo(BigDecimal.ZERO) > 0) {
             SysUserCashAccount userCashAccount = sysUserCashAccountService.getLocked(studentId);
             if (userCashAccount == null) {
-                throw new BizException("用户账户找不到");
+                throw new BizException("用户账户不存在");
             }
             if (userCashAccount.getBalance() != null && userCashAccount.getBalance().compareTo(BigDecimal.ZERO) > 0) {
                 balance = amount.compareTo(userCashAccount.getBalance()) >= 0 ? userCashAccount.getBalance() : amount;

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -137,6 +137,7 @@ public class MusicGroupController extends BaseController {
             return failed("乐团在"+musicGroup.getStatus().getMsg()+",不能缴费");
         }
         studentRegistration.setOwnershipType(musicGroup.getOwnershipType());
+        studentRegistration.setChargeTypeId(musicGroup.getChargeTypeId());
 
         return succeed(studentRegistration);
     }

mec-web/src/main/java/com/ym/mec/web/controller/education/EduRepairController.java

@@ -5,7 +5,6 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
-import com.ym.mec.biz.dal.dto.GoodsSellDto;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.StudentRepair;
 import com.ym.mec.biz.dal.page.GoodsCategoryQueryInfo;