modify

Helius

2020-12-21 dbf5bb967a22cb5e8da9ab5a3483f742a95747d5

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java

@@ -99,7 +99,7 @@
            shoppingGoods.setReferencePice(0D);
        }
        // 验证套餐卡卡必须填写最大使用次数
        if (Dictionary.FLAG_YES_Y.equals(shoppingGoods.getIsCourse())) {
        if (Dictionary.FLAG_YES_Y.equals(shoppingGoods.getIsCourse()) && Dictionary.FLAG_NO_N.equals(shoppingGoods.getIsInfinite())) {
            if (shoppingGoods.getCarUseCount() == null) {
                shoppingGoods.setCarUseCount(0);
            }
@@ -434,7 +434,7 @@
    @Override
    public Date calInvalidTime(ShoppingGoods shoppingGoods, @NotNull Integer type, Date buyDate) {
        if (StringUtils.isBlank(shoppingGoods.getBuyValid()) && StringUtils.isBlank(shoppingGoods.getUseValid()) && shoppingGoods.getInvalidTime() == null) {
            return null;
            return DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD);
        }

        if (type == 2 && buyDate == null) {