blame | history | patch | commit | commitdiff | ignore whitespace
935090232@qq.com
2021-05-08 6924e965ea3da70823f50f7285b50efab7205415 
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java


@@ -438,6 +438,10 @@


            return DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD);


        }




        if (type == 2 && shoppingGoods.getUseDateNum() == null && StringUtils.isNotBlank(shoppingGoods.getBuyDateUnit())) {


            return DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD);


        }




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


            throw new GlobleException("购买日期不能为空");


        }


@@ -518,11 +522,12 @@


        ShoppingGoodsDetailVo goodsDetailVo = new ShoppingGoodsDetailVo();


        goodsDetailVo.setImg(shoppingGoods.getImg());


        goodsDetailVo.setGoodsName(shoppingGoods.getName());


        goodsDetailVo.setGoodsNo(shoppingGoods.getGoodsNo());


        goodsDetailVo.setGoodsNo(shoppingGoods.getCode());


        goodsDetailVo.setGoodsType(shoppingGoods.getGoodType());


        goodsDetailVo.setDesc(shoppingGoods.getDescription());


        goodsDetailVo.setMaxSaleCnt(shoppingGoods.getCarMaxSaleCount());


        goodsDetailVo.setLimitBuyCnt(shoppingGoods.getCarUseCount().toString());


        goodsDetailVo.setLimitBuyCnt("否".equals(shoppingGoods.getIsOnce()) ? null : shoppingGoods.getIsOnce());


        goodsDetailVo.setMaxUseCnt(shoppingGoods.getCarUseCount());


        goodsDetailVo.setMeasure(shoppingGoods.getMeasure());


        goodsDetailVo.setVolume(shoppingGoods.getVolume());


        goodsDetailVo.setSalePrice(BigDecimal.valueOf(shoppingGoods.getSealPice()));