zhijiezhao 3 năm trước cách đây
mục cha
commit
b2daba62d9

+ 9 - 9
src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -106,7 +106,7 @@ public class PageServiceImpl implements PageService {
      */
     @Override
     @Cacheable(value = "insCommodityData", key = "#pageId+'-'+#userId+'-'+#source", unless = "#result == null")
-    public ResponseJson<Map<String, Object>> getClassifyData(Integer pageId, Integer userId, Integer source,Integer flag) {
+    public ResponseJson<Map<String, Object>> getClassifyData(Integer pageId, Integer userId, Integer source, Integer flag) {
         source = source == null ? 1 : source;
         Map<String, Object> map = new HashMap<>(3);
         Integer typeSort = pageMapper.getPageTypeSort(pageId);
@@ -117,7 +117,7 @@ public class PageServiceImpl implements PageService {
             setFloorLinkType(floorContent);
             floor.setFloorContent(floorContent);
             List<FloorImageVo> floorImageList = pageMapper.getFloorImageByCentreId(floor.getId(), source);
-            setFloorImageProduct(userId, floorImageList, source,flag);
+            setFloorImageProduct(userId, floorImageList, source, flag);
             floor.setFloorImageList(floorImageList);
         }
         map.put("typeSort", typeSort);
@@ -134,7 +134,7 @@ public class PageServiceImpl implements PageService {
      */
     @Cacheable(value = "getHomeCommodityData", key = "#userId +'-'+ #source", unless = "#result == null")
     @Override
-    public ResponseJson<Map<String, Object>> getHomeData(Integer userId, Integer source,Integer flag) {
+    public ResponseJson<Map<String, Object>> getHomeData(Integer userId, Integer source, Integer flag) {
         Map<String, Object> map = new HashMap<>(2);
         //楼层管理
         source = source == null ? 1 : source;
@@ -150,7 +150,7 @@ public class PageServiceImpl implements PageService {
                 floorIterator.remove();
                 continue;
             }
-            setFloorImageProduct(userId, floorImageList, source,flag);
+            setFloorImageProduct(userId, floorImageList, source, flag);
             floor.setFloorImageList(floorImageList);
         }
         map.put("homePageFloor", homePageFloor);
@@ -352,7 +352,7 @@ public class PageServiceImpl implements PageService {
      */
     @Cacheable(value = "getPageBeautyData", key = "#userId +'-'+ #pageId +'-'+ #source", unless = "#result == null")
     @Override
-    public ResponseJson<Map<String, Object>> getPageBeautyData(Integer pageId, Integer userId, Integer source,Integer flag) {
+    public ResponseJson<Map<String, Object>> getPageBeautyData(Integer pageId, Integer userId, Integer source, Integer flag) {
         if (pageId == null) {
             return ResponseJson.error("参数异常: 页面id不能为空!", null);
         }
@@ -375,7 +375,7 @@ public class PageServiceImpl implements PageService {
             } else {
                 setFloorLinkType(floorContent);
                 List<FloorImageVo> floorImageList = pageMapper.getFloorImageByCentreId(floor.getId(), source);
-                setFloorImageProduct(userId, floorImageList, source,flag);
+                setFloorImageProduct(userId, floorImageList, source, flag);
                 floor.setFloorImageList(floorImageList);
                 String templateTypeStr = floorContent.getTemplateType();
                 if (StringUtils.isNotEmpty(templateTypeStr)) {
@@ -634,7 +634,7 @@ public class PageServiceImpl implements PageService {
             double price = product.getPrice() != null ? product.getPrice() : 0d;
             double costPrice = product.getCostPrice() != null ? product.getCostPrice() : 0d;
             double discountPrice = product.getDiscountPrice() != null ? product.getDiscountPrice() : 0d;
-            Integer costFlag = product.getCostCheckFlag();
+            Integer costFlag = product.getCostCheckFlag() != null ? product.getCostCheckFlag() : 1;
             // 成本大于等于复购价 或 复购价大于机构价
             boolean state = (costFlag == 1 && MathUtil.compare(costPrice, discountPrice) >= 0) || MathUtil.compare(discountPrice, price) > 0;
             product.setRepurchasePriceState(state);
@@ -1145,13 +1145,13 @@ public class PageServiceImpl implements PageService {
     }
 
     @Override
-    public ResponseJson<Map<String, Object>> getSvipProductPage(Integer userId, Integer source, Integer pageNum, Integer pageSize,Integer flag) {
+    public ResponseJson<Map<String, Object>> getSvipProductPage(Integer userId, Integer source, Integer pageNum, Integer pageSize, Integer flag) {
         Map<String, Object> svipProductPageData = new HashMap<>(2);
         String adsImage = pageMapper.getSvipProductAdsImage(userId, source);
         PageHelper.startPage(pageNum, pageSize);
         List<ProductItemVo> svipProductList = pageMapper.getSvipProductList();
         svipProductList.forEach(svipProduct -> {
-            priceUtilService.setProductDetails(userId, svipProduct,flag);
+            priceUtilService.setProductDetails(userId, svipProduct, flag);
             svipProduct.setImage(ImageUtils.getImageURL("product", svipProduct.getImage(), 0, domain));
         });
         PaginationVo<ProductItemVo> svipProductPage = new PaginationVo<>(svipProductList);

+ 3 - 3
src/main/java/com/caimei365/commodity/service/impl/SellerServiceImpl.java

@@ -119,9 +119,9 @@ public class SellerServiceImpl implements SellerService {
             productList.add(0, productItemVo);
             Integer userIdentity = shopMapper.getUserIdentityById(userId);
             // 如果非会员身份剔除会员可见商品
-            if(userIdentity!=null){
-                if (userIdentity == 0 || userIdentity == 1 || userIdentity == 5 || userIdentity == 6) {
-                    productList.removeIf(c->"1".equals(c.getVisibility()));
+            if (userIdentity != null) {
+                if (userIdentity == 0 || userIdentity == 4 || userIdentity == 6) {
+                    productList.removeIf(c -> "1".equals(c.getVisibility()));
                 }
             }
             productList.forEach(product -> {

+ 1 - 1
src/main/resources/mapper/PageMapper.xml

@@ -194,7 +194,7 @@
             p.price1TextFlag as priceFlag,
             p.price1 as price,
             p.costPrice,
-            p.costCheckFlag,
+            ifnull(p.costCheckFlag,1) as costCheckFlag,
             p.shopID as shopId,
             p.searchKey as keyword,
             p.price8Text as beautyActFlag,