Showing
4 changed files
with
6 additions
and
3 deletions
@@ -402,8 +402,6 @@ public class ProductController { | @@ -402,8 +402,6 @@ public class ProductController { | ||
402 | 402 | ||
403 | 403 | ||
404 | @ApiOperation(name = "ufo.product.saleCategory", desc="商品销售类目") | 404 | @ApiOperation(name = "ufo.product.saleCategory", desc="商品销售类目") |
405 | - @IgnoreSignature | ||
406 | - @IgnoreSession | ||
407 | @RequestMapping(params = "method=ufo.product.saleCategory") | 405 | @RequestMapping(params = "method=ufo.product.saleCategory") |
408 | @Cachable(expire = 180) | 406 | @Cachable(expire = 180) |
409 | public ApiResponse querySaleCategory() { | 407 | public ApiResponse querySaleCategory() { |
@@ -650,6 +650,9 @@ public class ProductServiceImpl implements ProductService{ | @@ -650,6 +650,9 @@ public class ProductServiceImpl implements ProductService{ | ||
650 | } | 650 | } |
651 | 651 | ||
652 | private String buildSaleCategoryFullUrl(String url) { | 652 | private String buildSaleCategoryFullUrl(String url) { |
653 | + if(StringUtils.isBlank(url)) { | ||
654 | + return ""; | ||
655 | + } | ||
653 | if (!StringUtils.startsWith(url, "http")){ | 656 | if (!StringUtils.startsWith(url, "http")){ |
654 | return ImagesHelper.template2(url, "salecategoryimg").replaceAll("extent\\/\\{width}x\\{height}\\/",""); | 657 | return ImagesHelper.template2(url, "salecategoryimg").replaceAll("extent\\/\\{width}x\\{height}\\/",""); |
655 | }else{ | 658 | }else{ |
@@ -740,6 +743,6 @@ public class ProductServiceImpl implements ProductService{ | @@ -740,6 +743,6 @@ public class ProductServiceImpl implements ProductService{ | ||
740 | sc.setLink(data.getLinkDetail()); | 743 | sc.setLink(data.getLinkDetail()); |
741 | sc.setImage(buildSaleCategoryFullUrl(data.getImageUrl())); | 744 | sc.setImage(buildSaleCategoryFullUrl(data.getImageUrl())); |
742 | sc.setSub(new ArrayList<>()); | 745 | sc.setSub(new ArrayList<>()); |
743 | - return null; | 746 | + return sc; |
744 | } | 747 | } |
745 | } | 748 | } |
@@ -27,6 +27,7 @@ datasources: | @@ -27,6 +27,7 @@ datasources: | ||
27 | - com.yohoufo.dal.product.BrandSeriesMapper | 27 | - com.yohoufo.dal.product.BrandSeriesMapper |
28 | - com.yohoufo.dal.product.ProductSortMapper | 28 | - com.yohoufo.dal.product.ProductSortMapper |
29 | - com.yohoufo.dal.product.SearchWordMapper | 29 | - com.yohoufo.dal.product.SearchWordMapper |
30 | + - com.yohoufo.dal.product.SaleCategoryMapper | ||
30 | 31 | ||
31 | ufo_order: | 32 | ufo_order: |
32 | servers: | 33 | servers: |
@@ -27,6 +27,7 @@ datasources: | @@ -27,6 +27,7 @@ datasources: | ||
27 | - com.yohoufo.dal.product.BrandSeriesMapper | 27 | - com.yohoufo.dal.product.BrandSeriesMapper |
28 | - com.yohoufo.dal.product.ProductSortMapper | 28 | - com.yohoufo.dal.product.ProductSortMapper |
29 | - com.yohoufo.dal.product.SearchWordMapper | 29 | - com.yohoufo.dal.product.SearchWordMapper |
30 | + - com.yohoufo.dal.product.SaleCategoryMapper | ||
30 | 31 | ||
31 | ufo_order: | 32 | ufo_order: |
32 | servers: | 33 | servers: |
-
Please register or login to post a comment