学校缴费原价计算错误

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
@@ -306,8 +307,13 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             }
         }
 
+        BigDecimal studentNum = BigDecimal.ONE;
         if(musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL){
             actualTotalAmount = musicGroupPaymentBaseCalender.getCurrentTotalAmount();
+            if(StringUtils.equals(musicGroupPaymentBaseCalender.getCalenderFeeType(),"STUDENT")){
+                String studentNumber = JSONObject.parseObject(musicGroupPaymentBaseCalender.getCalenderFeeJson()).getString("studentNumber");
+                studentNum = new BigDecimal(studentNumber);
+            }
         }
 
         PaymentCalenderStatusEnum status;
@@ -343,7 +349,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         musicGroupPaymentCalender.setCreateTime(date);
         musicGroupPaymentCalender.setUpdateTime(date);
         musicGroupPaymentCalender.setCurrentTotalAmount(actualTotalAmount);
-        musicGroupPaymentCalender.setOriginalTotalAmount(originalTotalAmount);
+        musicGroupPaymentCalender.setOriginalTotalAmount(originalTotalAmount.multiply(studentNum));
         musicGroupPaymentCalender.setStatus(status);
         musicGroupPaymentCalender.setOrganId(musicGroup.getOrganId());