|
@@ -470,7 +470,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
|
|
|
if (studentPaymentRouteOrder.getSaleAmount() == null) {
|
|
|
throw new BizException("导入失败:交易流水号{},收入类型为销售收入时,销售金额不可为空", studentPaymentRouteOrder.getTransNo());
|
|
|
}
|
|
|
- studentPaymentRouteOrder.setServiceAmount(null);
|
|
|
+ studentPaymentRouteOrder.setServiceAmount(BigDecimal.ZERO);
|
|
|
String goodsIds = studentPaymentRouteOrder.getGoodsIds();
|
|
|
String goodsNums = studentPaymentRouteOrder.getGoodsNums();
|
|
|
|
|
@@ -502,11 +502,13 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
|
|
|
studentPaymentRouteOrder.setGoodsJson(goodsJSON.toJSONString());
|
|
|
//服务收入
|
|
|
} else {
|
|
|
- studentPaymentRouteOrder.setSaleAmount(null);
|
|
|
+ studentPaymentRouteOrder.setSaleAmount(BigDecimal.ZERO);
|
|
|
if (studentPaymentRouteOrder.getServiceAmount() == null) {
|
|
|
throw new BizException("导入失败:交易流水号{},收入类型为服务收入时,服务金额不可为空", studentPaymentRouteOrder.getTransNo());
|
|
|
}
|
|
|
}
|
|
|
+ studentPaymentRouteOrder.setRouteBalanceAmount(BigDecimal.ZERO);
|
|
|
+ studentPaymentRouteOrder.setRouteAmount(studentPaymentRouteOrder.getSaleAmount().add(studentPaymentRouteOrder.getServiceAmount()));
|
|
|
studentPaymentRouteOrder.setCreateBy(sysUser.getId());
|
|
|
studentPaymentRouteOrder.setUpdateBy(sysUser.getId());
|
|
|
studentPaymentRouteOrder.setUserId(sysUser.getId());
|