zoujiajian 1 рік тому
батько
коміт
31abc07f89

+ 11 - 1
netflix-service/src/main/java/com/cyksj/service/order/impl/OrderCommonServiceImpl.java

@@ -84,7 +84,17 @@ public class OrderCommonServiceImpl implements OrderCommonService {
 				if (otherOrder != null) {
 					Long otherSkuId = otherOrder.getSkuId();
 					GoodsDonSku otherGoodsSku = goodsDonSkuMapper.selectById(otherSkuId);
-					DateTime endTime = DateUtil.offsetMonth(otherOrder.getCreatedTime(), otherGoodsSku.getMonths() * num);
+					DateTime endTime;
+					Date otherOrderCreatedTime = otherOrder.getCreatedTime();
+					if (otherGoodsSku.getDays() != null && otherGoodsSku.getDays() > 0) {
+						endTime = DateUtil.offsetDay(otherOrderCreatedTime, otherGoodsSku.getDays() * num);
+					} else {
+						if (otherGoodsSku.getGoodsId() == 1 && otherGoodsSku.getMonths() == 1) {
+							endTime = DateUtil.offsetDay(otherOrderCreatedTime, 30);
+						} else{
+							endTime = DateUtil.offsetMonth(otherOrderCreatedTime, otherGoodsSku.getMonths() * num);
+						}
+					}
 					if (now.isBefore(endTime)) {
 						isFlag = false;
 					}