Merge branch 'abroad_073' into abroad_pre

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

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