|
@@ -16,6 +16,7 @@ import com.ym.mec.common.page.PageInfo;
|
|
|
import com.ym.mec.common.service.impl.BaseServiceImpl;
|
|
|
import com.ym.mec.util.collection.MapUtil;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -147,7 +148,11 @@ public class MusicGroupCalenderRefundPeriodServiceImpl extends BaseServiceImpl<I
|
|
|
MusicGroupCalenderRefundPeriod refundPeriod = refundPeriods.get(i);
|
|
|
if(i == refundPeriods.size() - 1 && refundPeriod.getRefundFlag()){
|
|
|
refundPeriod.setIncome(refundPeriod.getIncome().add(subAmount));
|
|
|
- refundPeriod.setOrderNos(orderNo);
|
|
|
+ if(StringUtils.isEmpty(refundPeriod.getOrderNos())){
|
|
|
+ refundPeriod.setOrderNos(orderNo);
|
|
|
+ }else {
|
|
|
+ refundPeriod.setOrderNos(refundPeriod.getOrderNos() + "," + orderNo);
|
|
|
+ }
|
|
|
refundPeriod.setUpdateTime(date);
|
|
|
break;
|
|
|
}
|
|
@@ -169,7 +174,11 @@ public class MusicGroupCalenderRefundPeriodServiceImpl extends BaseServiceImpl<I
|
|
|
refundPeriod.setSubRefundAmount(refundPeriod.getSubRefundAmount().subtract(subAmount));
|
|
|
subAmount = BigDecimal.ZERO;
|
|
|
}
|
|
|
- refundPeriod.setOrderNos(orderNo);
|
|
|
+ if(StringUtils.isEmpty(refundPeriod.getOrderNos())){
|
|
|
+ refundPeriod.setOrderNos(orderNo);
|
|
|
+ }else {
|
|
|
+ refundPeriod.setOrderNos(refundPeriod.getOrderNos() + "," + orderNo);
|
|
|
+ }
|
|
|
refundPeriod.setUpdateTime(date);
|
|
|
}
|
|
|
musicGroupCalenderRefundPeriodDao.batchUpdate(refundPeriods);
|