zouxuan 2 роки тому
батько
коміт
fd85dd709c

+ 1 - 5
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupCalenderRefundPeriod.java

@@ -52,11 +52,7 @@ public class MusicGroupCalenderRefundPeriod {
 	}
 
 	public void setOrderNos(String orderNos) {
-		if(StringUtils.isEmpty(orderNos)){
-			this.orderNos = orderNos;
-		}else {
-			this.orderNos = this.orderNos + "," + orderNos;
-		}
+		this.orderNos = orderNos;
 	}
 
 	public BigDecimal getIncome() {

+ 11 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupCalenderRefundPeriodServiceImpl.java

@@ -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);