富文本框输入版本变化

KKSU

2023-12-19 1f64959be8cf631a2c5b005f19fd78bc930248cf

富文本框输入版本变化

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java

@@ -68,15 +68,16 @@
        List<ApiMallProductNftVo> list = this.baseMapper.selectByState(ProductEnum.PRODUCT_NFT_OPEN.getValue());
        if(CollUtil.isNotEmpty(list)){
            for(ApiMallProductNftVo apiMallProductNftVo : list){
                if(nowTime.compareTo(startTime) < 0){
                    apiMallProductNftVo.setYuYueState(1);
                }
                if(nowTime.compareTo(startTime) >= 0 && nowTime.compareTo(endTime) <= 0){
                    apiMallProductNftVo.setYuYueState(2);
                }
                if(nowTime.compareTo(endTime) > 0){
                    apiMallProductNftVo.setYuYueState(3);
                }
                apiMallProductNftVo.setYuYueState(2);
//                if(nowTime.compareTo(startTime) < 0){
//                    apiMallProductNftVo.setYuYueState(1);
//                }
//                if(nowTime.compareTo(startTime) >= 0 && nowTime.compareTo(endTime) <= 0){
//                    apiMallProductNftVo.setYuYueState(2);
//                }
//                if(nowTime.compareTo(endTime) > 0){
//                    apiMallProductNftVo.setYuYueState(3);
//                }
            }
        }
        return list;
@@ -98,20 +99,20 @@
            throw new FebsException("用户已冻结");
        }

        DateTime nowTime = DateUtil.parseTime(DateUtil.formatTime(DateUtil.date()));
        DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.YU_YUE_START_TIME.getType(),
                DataDictionaryEnum.YU_YUE_START_TIME.getCode()
        );
        DateTime startTime = DateUtil.parseTime(startTimeDic.getValue());
        DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.YU_YUE_END_TIME.getType(),
                DataDictionaryEnum.YU_YUE_END_TIME.getCode()
        );
        DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
        if(!(nowTime.compareTo(startTime) >= 0 && nowTime.compareTo(endTime) <= 0)){
            throw new FebsException("预约未开始");
        }
//        DateTime nowTime = DateUtil.parseTime(DateUtil.formatTime(DateUtil.date()));
//        DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
//                DataDictionaryEnum.YU_YUE_START_TIME.getType(),
//                DataDictionaryEnum.YU_YUE_START_TIME.getCode()
//        );
//        DateTime startTime = DateUtil.parseTime(startTimeDic.getValue());
//        DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
//                DataDictionaryEnum.YU_YUE_END_TIME.getType(),
//                DataDictionaryEnum.YU_YUE_END_TIME.getCode()
//        );
//        DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
//        if(!(nowTime.compareTo(startTime) >= 0 && nowTime.compareTo(endTime) <= 0)){
//            throw new FebsException("预约未开始");
//        }
        if(!tradePassword.equals(mallMember.getTradePassword())){
            throw new FebsException("请输入正确的交易密码");
        }