Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysMenuServiceImpl.java

@@ -43,8 +43,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 	public List<SysMenu> findByUser(MenuQueryInfo menuQueryInfo) {
 		SysUser sysUser = sysUserDao.get(menuQueryInfo.getUserId());
 		List<SysMenu> sysMenus = null;
-//		if(sysUser.getUserType() == SysUserType.ADMIN){
-		if(sysUser.getId() == 1){
+		if(sysUser.getIsSuperAdmin()){
 			menuQueryInfo.setUserId(null);
 			sysMenus = sysMenuDao.findList(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getHid());
 		}else {

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.springframework.data.annotation.Version;
 
 import java.math.BigDecimal;
 
@@ -15,7 +16,10 @@ public class MusicGroupSubjectPlan {
 
 	/**  */
 	private Integer id;
-	
+
+	@Version
+	private Integer version;
+
 	/** 乐团编号 */
 	@ApiModelProperty(value = "乐团编号",required = false)
 	private String musicGroupId;
@@ -61,8 +65,6 @@ public class MusicGroupSubjectPlan {
 	/**  */
 	private java.util.Date updateTime;
 
-	private Integer version;
-
 	public String getSubName() {
 		return subName;
 	}

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

@@ -1,11 +1,18 @@
 package com.ym.mec.biz.dal.entity;
 
+import org.springframework.data.annotation.Version;
+
 import java.math.BigDecimal;
 
 public class SysAccount {
     private Integer id;
 
     /**
+     * 版本号
+     */
+    @Version
+    private Integer version;
+    /**
     * 收款商户号
     */
     private String merNo;
@@ -30,10 +37,6 @@ public class SysAccount {
     */
     private String channelType;
 
-    /**
-    * 版本号
-    */
-    private Integer version;
 
     public Integer getId() {
         return id;

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

@@ -563,10 +563,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (imGroupModels != null && imGroupModels.size() > 0) {
             Set<String> classGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
             //获取班级老师总数map
-            List<Map<Integer, Integer>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ","));
-            Map<Integer, Integer> numsMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(nums)), HashMap.class);
+            Map<Integer, Integer> numsMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ",")))),HashMap.class);
             imGroupModels.forEach(e -> {
-                Integer num = numsMap.get(e.getId());
+                Integer num = numsMap.get(Integer.parseInt(e.getId()));
                 e.setCount((num == null ? 0 : num) + e.getCount());
             });
         }

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

@@ -74,6 +74,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     private SysConfigDao sysConfigDao;
     @Autowired
     private MusicGroupDao musicGroupDao;
+    @Autowired
+    private SysUserCashAccountDetailService sysUserCashAccountDetailService;
+    @Autowired
+    private SysUserCashAccountService sysUserCashAccountService;
 
     @Override
     public BaseDAO<Long, StudentRegistration> getDAO() {
@@ -538,6 +542,37 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             musicGroupStudentFee.setSubjectId(studentRegistration.getActualSubjectId());
             musicGroupStudentFee.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
             musicGroupStudentFeeDao.insert(musicGroupStudentFee);
+
+            //插入交易明细
+            SysUserCashAccount cashAccount = sysUserCashAccountService.get(studentRegistration.getUserId());
+            BigDecimal amount = studentPaymentOrder.getActualAmount();
+            //充值
+            SysUserCashAccountDetail rechargeDetail = new SysUserCashAccountDetail();
+            rechargeDetail.setAmount(amount);
+            rechargeDetail.setBalance(cashAccount.getBalance().add(amount));
+            rechargeDetail.setComment("缴费前充值");
+            rechargeDetail.setCreateTime(nowDate);
+            rechargeDetail.setStatus(DealStatusEnum.SUCCESS);
+            rechargeDetail.setTransNo(studentPaymentOrder.getTransNo());
+            rechargeDetail.setType(PlatformCashAccountDetailTypeEnum.RECHARGE);
+            rechargeDetail.setUpdateTime(nowDate);
+            rechargeDetail.setUserId(studentRegistration.getUserId());
+            rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
+            sysUserCashAccountDetailService.insert(rechargeDetail);
+
+            //缴费
+            SysUserCashAccountDetail paymentDetail = new SysUserCashAccountDetail();
+            paymentDetail.setAmount(amount);
+            paymentDetail.setBalance(cashAccount.getBalance());
+            paymentDetail.setComment("报名缴费");
+            paymentDetail.setCreateTime(nowDate);
+            paymentDetail.setStatus(DealStatusEnum.SUCCESS);
+            paymentDetail.setTransNo(studentPaymentOrder.getTransNo());
+            paymentDetail.setType(PlatformCashAccountDetailTypeEnum.PAY_FEE);
+            paymentDetail.setUpdateTime(nowDate);
+            paymentDetail.setUserId(studentRegistration.getUserId());
+            sysUserCashAccountDetailService.insert(paymentDetail);
+
             //发送缴费成功通知（短信 + push）
             Map<Integer,String> map = new HashMap<>(1);
             map.put(studentPaymentOrder.getUserId(),studentRegistration.getParentsPhone());