Merge branch 'score_shop'

wzy

2022-10-12 4615437af0749766f519c10734e19360b0877ece

Merge branch 'score_shop'

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

@@ -1,6 +1,7 @@
package com.matrix.system.hive.service.imp;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
@@ -461,25 +462,31 @@

        Date target = null;
        Date buyValidDate = null;
        if (type == 1) {
            buyValidDate = DateUtil.calDate(shoppingGoods.getBuyDateNum(), shoppingGoods.getBuyDateUnit());
        if (type == 1 && StrUtil.isNotBlank(shoppingGoods.getBuyValid())) {
            buyValidDate = DateUtil.stringToDate(shoppingGoods.getBuyValid(), "yyyy-MM-dd");
        } else {
            buyValidDate = buyDate;
        }

        Date useValidDate = DateUtil.stringToDate("2099-12-31", DateUtil.DATE_FORMAT_DD);
        if (type == 2) {
            useValidDate = DateUtil.calDate(shoppingGoods.getUseDateNum(), shoppingGoods.getUseDateUnit());
        if (type == 2 && StrUtil.isNotBlank(shoppingGoods.getUseValid())) {
            useValidDate = DateUtil.stringToDate(shoppingGoods.getUseValid(), "yyyy-MM-dd");
        }

        if (buyValidDate.after(useValidDate)) {
            target = useValidDate;
        } else {
            target = buyValidDate;
        if (buyValidDate != null) {
            if (buyValidDate.after(useValidDate)) {
                target = useValidDate;
            } else {
                target = buyValidDate;
            }
        }

        if (shoppingGoods.getInvalidTime() != null) {
            if (target.after(shoppingGoods.getInvalidTime())) {
            if (target != null) {
                if (target.after(shoppingGoods.getInvalidTime())) {
                    target = shoppingGoods.getInvalidTime();
                }
            } else {
                target = shoppingGoods.getInvalidTime();
            }
        }