Merge remote-tracking branch 'origin/master'

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwRefundRequestRecordServiceImpl.java

@@ -208,17 +208,17 @@ public class SwRefundRequestRecordServiceImpl extends ServiceImpl<SwRefundReques
         swBillingRecordUpdateDo.setRefundamount(refundRequestRecordDO.getRefundamount());
 
 
-        //全额退款 系统需要同时缴费记录的缴费 状态 更新为 “全部退款” 状态，【本次实缴-整数】更新为 0，【缴费后余额】更新为 0
+        //全额退款 系统需要同时缴费记录的缴费 状态 更新为 “全部退款” 状态， 金额不做更新
         if (refundRequestRecordDO.getRefundtype().equals(REFUNDMETHODALL)){
             swBillingRecordUpdateDo.setPayfeesstatus(FULLREFUNDSTATUS);
 //            swBillingRecordUpdateDo.setPaidin(BigDecimal.ZERO);
-            swBillingRecordUpdateDo.setAfterpaymentbalance(BigDecimal.ZERO);
+//            swBillingRecordUpdateDo.setAfterpaymentbalance(BigDecimal.ZERO);
         } else if (refundRequestRecordDO.getRefundtype().equals(REFUNDMETHODBALANCE)) {
-            //差额退款 ，同时缴费记录的缴费 状态 更新为 “部分退款” 状态，【缴费金额-整数】更新为【原缴费金额-整数】-【退款金额】【缴费后余额】更新为【原实缴后余额】-【退款金额】 ，
+            //差额退款 ，同时缴费记录的缴费 状态 更新为 “部分退款” 状态，  金额不做更新
             swBillingRecordUpdateDo.setPayfeesstatus(PARTIALREFUNDSTATUS);
-            SwBillingRecordDo recordDO = swBillingRecordService.getById(refundRequestRecordDO.getPaymentrecordid());
-//            swBillingRecordUpdateDo.setPaidin(recordDO.getPaidin().subtract(refundRequestRecordDO.getRefundableamount()));
-            swBillingRecordUpdateDo.setAfterpaymentbalance(recordDO.getAfterpaymentbalance().subtract(refundRequestRecordDO.getRefundableamount()));
+//            SwBillingRecordDo recordDO = swBillingRecordService.getById(refundRequestRecordDO.getPaymentrecordid());
+////            swBillingRecordUpdateDo.setPaidin(recordDO.getPaidin().subtract(refundRequestRecordDO.getRefundableamount()));
+//            swBillingRecordUpdateDo.setAfterpaymentbalance(recordDO.getAfterpaymentbalance().subtract(refundRequestRecordDO.getRefundableamount()));
         }
         swBillingRecordService.updateById(swBillingRecordUpdateDo);
     }