退费不进余额

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

@@ -2423,8 +2423,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
             if (amount.doubleValue() > 0) {
                 // 增加交易流水
-                sysUserCashAccountDetailService.addCashAccountDetail(userId, amount, SysUserCashAccountDetailService.MUSIC_GROUP + musicGroupId, "",
-                        PlatformCashAccountDetailTypeEnum.REFUNDS, null, SUCCESS, "退出乐团", null);
+//                sysUserCashAccountDetailService.addCashAccountDetail(userId, amount, SysUserCashAccountDetailService.MUSIC_GROUP + musicGroupId, "",
+//                        PlatformCashAccountDetailTypeEnum.REFUNDS, null, SUCCESS, "退出乐团", null);
             }
         }
         return true;
@@ -2737,8 +2737,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         if (amount.doubleValue() > 0) {
             // 增加交易流水
-            sysUserCashAccountDetailService.addCashAccountDetail(userId, amount, SysUserCashAccountDetailService.MUSIC_GROUP + musicGroupId, "",
-                    PlatformCashAccountDetailTypeEnum.REFUNDS, null, SUCCESS, "退出乐团", null);
+//            sysUserCashAccountDetailService.addCashAccountDetail(userId, amount, SysUserCashAccountDetailService.MUSIC_GROUP + musicGroupId, "",
+//                    PlatformCashAccountDetailTypeEnum.REFUNDS, null, SUCCESS, "退出乐团", null);
         }
 
         return true;

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

@@ -407,9 +407,9 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
             sellOrderDao.update(sellOrder);
 
             //2、金额退到余额
-            if (reBackFee && sellOrder.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
-                sysUserCashAccountService.updateBalance(sellOrder.getUserId(), sellOrder.getExpectAmount().multiply(new BigDecimal(0.995)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP), PlatformCashAccountDetailTypeEnum.REFUNDS, "订单：" + sellOrder.getOrderId() + " 商品id：" + sellOrder.getGoodsId() + "退货");
-            }
+//            if (reBackFee && sellOrder.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
+//                sysUserCashAccountService.updateBalance(sellOrder.getUserId(), sellOrder.getExpectAmount().multiply(new BigDecimal(0.995)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP), PlatformCashAccountDetailTypeEnum.REFUNDS, "订单：" + sellOrder.getOrderId() + " 商品id：" + sellOrder.getGoodsId() + "退货");
+//            }
         }
         //3、退货
         if (sellOrders.get(0).getAccountType() != null) {

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

@@ -3105,16 +3105,16 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			return BaseController.succeed();
         }
 
-		sysUserCashAccountService.updateBalance(studentId, amount);
-		SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(studentId);
-		SysUserCashAccountDetail sysUserCashAccountDetail = new SysUserCashAccountDetail();
-		sysUserCashAccountDetail.setUserId(studentId);
-		sysUserCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.REFUNDS);
-		sysUserCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
-		sysUserCashAccountDetail.setAmount(amount);
-		sysUserCashAccountDetail.setBalance(sysUserCashAccount.getBalance());
-		sysUserCashAccountDetail.setAttribute(studentId.toString());
-		sysUserCashAccountDetailDao.insert(sysUserCashAccountDetail);
+//		sysUserCashAccountService.updateBalance(studentId, amount);
+//		SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(studentId);
+//		SysUserCashAccountDetail sysUserCashAccountDetail = new SysUserCashAccountDetail();
+//		sysUserCashAccountDetail.setUserId(studentId);
+//		sysUserCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.REFUNDS);
+//		sysUserCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
+//		sysUserCashAccountDetail.setAmount(amount);
+//		sysUserCashAccountDetail.setBalance(sysUserCashAccount.getBalance());
+//		sysUserCashAccountDetail.setAttribute(studentId.toString());
+//		sysUserCashAccountDetailDao.insert(sysUserCashAccountDetail);
 
 		classStudentMapperByUserIdAndClassGroupId.setStatus(ClassGroupStudentStatusEnum.QUIT);
 		classGroupStudentMapperDao.update(classStudentMapperByUserIdAndClassGroupId);
@@ -3513,11 +3513,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 allPrice = allPrice.add(userCourseInfo.getExpectPrice());
                 if(now.after(userCourseInfo.getStartClassTime())){
 					overNum++;
-					if(VIP == userCourseInfo.getGroupType()){
-						historyPrice = historyPrice.add(userCourseInfo.getTeachMode().equals(TeachModeEnum.ONLINE)?vipGroup.getOnlineClassesUnitPrice():vipGroup.getOfflineClassesUnitPrice());
-					}else {
-						historyPrice = historyPrice.add(userCourseInfo.getOriginalPrice());
-					}
+					historyPrice = historyPrice.add(userCourseInfo.getOriginalPrice());
                 }
             }
             bigDecimal = allPrice.subtract(historyPrice);