|
@@ -9,6 +9,7 @@ import com.izouma.nineth.repo.PriceListRepo;
|
|
|
import com.izouma.nineth.utils.ObjUtils;
|
|
import com.izouma.nineth.utils.ObjUtils;
|
|
|
import com.izouma.nineth.utils.excel.ExcelUtils;
|
|
import com.izouma.nineth.utils.excel.ExcelUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
|
import org.springframework.data.domain.Page;
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
@@ -77,6 +78,11 @@ public class PriceListController extends BaseController {
|
|
|
map.put("name", priceList.getName());
|
|
map.put("name", priceList.getName());
|
|
|
map.put("img", priceList.getPic());
|
|
map.put("img", priceList.getPic());
|
|
|
map.put("price", priceList.getPrice());
|
|
map.put("price", priceList.getPrice());
|
|
|
|
|
+ if (StringUtils.isNotEmpty(priceList.getCPrice())) {
|
|
|
|
|
+ if (Double.parseDouble(priceList.getCPrice()) != 0) {
|
|
|
|
|
+ map.put("price", priceList.getCPrice());
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
return map;
|
|
return map;
|
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
}
|
|
}
|