|
|
@ -252,9 +252,10 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods |
|
|
|
s.setGoodsNumber(DoubleUtils.removeZeros(String.valueOf((int)i))); |
|
|
|
s.setWeight(DoubleUtils.removeZeros(s.getWeight())); |
|
|
|
s.setIconUrl(fileUploadComponent.getUrlPrefix()+s.getIconUrl()); |
|
|
|
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
if(s.getPeriodValidity()!=null){ |
|
|
|
//1>2 1 、1<2 -1 、1=2 0
|
|
|
|
int k= s.getPeriodValidity().compareTo(new Date()); |
|
|
|
int k= DateUtil.parse(sdf.format(s.getPeriodValidity())) .compareTo(DateUtil.parse(sdf.format(new Date()))); |
|
|
|
if(k==-1){ |
|
|
|
s.setState("1"); |
|
|
|
} |
|
|
|