Merge branch 'score_shop'

Helius

2022-10-19 39a5520c112081aff9f55ad13c1b4b53e4136a87

Merge branch 'score_shop'

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

@@ -456,12 +456,12 @@
            return DateUtil.stringToDate("2099-12-31", DateUtil.DATE_FORMAT_DD);
        }

        if (type == 2 && buyDate == null) {
            throw new GlobleException("购买日期不能为空");
        }
//        if (type == 2 && buyDate == null) {
//            throw new GlobleException("购买日期不能为空");
//        }

        Date target = null;
        Date buyValidDate = null;
        Date buyValidDate = DateUtil.stringToDate("2099-12-31", DateUtil.DATE_FORMAT_DD);;
        if (type == 1) {
            if (shoppingGoods.getBuyDateNum() != null && StrUtil.isNotBlank(shoppingGoods.getBuyDateUnit())) {
                buyValidDate = DateUtil.calDate(shoppingGoods.getBuyDateNum(), shoppingGoods.getBuyDateUnit());