fix 当天升级套餐包

netflix-dao/src/main/java/com/cyksj/model/views/UpgradePackageView.java

@@ -13,7 +13,8 @@ import java.math.BigDecimal;
  */
 @Data
 @SearchBean(tables = "upgrade_package up left join goods_don g on up.goods_id = g.id "
-        , where = "up.deleted = true :sku:")
+        , where = "up.deleted = true :sku:",
+        orderBy = "up.num asc")
 public class UpgradePackageView {
     @DbField("up.id")
     private Long id;

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

@@ -3283,7 +3283,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 
 				BigDecimal payUpgradePackagePrice = singlePrice.multiply(BigDecimal.valueOf(remainDay));
 				//车票当日买 当天升级 用套餐包原价
-				if (totalDays == remainDay) {
+				if (DateUtil.isSameDay(now, groupsRelation.getStartTime())) {
 					payUpgradePackagePrice = differPrice;
 				}
 				if (payRequest.getDonMoney().compareTo(payUpgradePackagePrice) < 0) {