zoujiajian 2 tahun lalu
induk
melakukan
e58c0f2718

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

@@ -95,7 +95,12 @@ public class OrderCommonServiceImpl implements OrderCommonService {
 						if (sku.getDays() != null && sku.getDays() > 0) {
 							refundExpiryTime = DateUtil.offsetDay(expiryTime, -sku.getDays() * num);
 						} else {
-							refundExpiryTime = DateUtil.offsetMonth(expiryTime, -sku.getMonths() * num);
+							//奈飞月付按30天计算
+							if (sku.getGoodsId() == 1 && sku.getMonths() == 1) {
+								refundExpiryTime = DateUtil.offsetMonth(expiryTime, -30);
+							} else {
+								refundExpiryTime = DateUtil.offsetMonth(expiryTime, -sku.getMonths() * num);
+							}
 						}
 						if (now.isBefore(refundExpiryTime)) {
 							isFlag = false;

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

@@ -738,7 +738,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 						newDate = DateUtil.offsetDay(expiryTime, donSku.getDays() * order.getNum());
 					} else {
 						//奈飞月付 按30天计算
-						if (sku.getId() == 4) {
+						if (sku.getGoodsId() == 1 && sku.getMonths() == 1) {
 							newDate = DateUtil.offsetDay(expiryTime, 30 * order.getNum());
 						} else {
 							newDate = DateUtil.offset(expiryTime, DateField.MONTH, donSku.getMonths() * order.getNum());