Merge remote-tracking branch 'origin/master'

pom.xml

@@ -37,10 +37,11 @@
         <spring-boot.version>2.1.9.RELEASE</spring-boot.version>
         <security.oauth.auto.version>2.1.9.RELEASE</security.oauth.auto.version>
         <java.version>1.8</java.version>
+        <log4j.version>2.17.2</log4j.version>
         <guava.version>28.2-jre</guava.version>
         <hutool.version>4.6.4</hutool.version>
         <jsoup.version>1.12.1</jsoup.version>
-        <poi.version>3.17</poi.version>
+        <poi.version>5.2.3</poi.version>
         <qiniu.version>7.2.18</qiniu.version>
         <weixin.version>3.9.0</weixin.version>
         <orika.version>1.5.4</orika.version>
@@ -157,6 +158,11 @@
                 <artifactId>poi</artifactId>
                 <version>${poi.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
 
             <!-- 排除 Tomcat 改用 Undertow -->
             <dependency>
@@ -184,11 +190,35 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
         <!-- 推荐版本 -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
             <version>3.3.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi-ooxml</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Apache Commons Lang -->
         <dependency>

yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderController.java

@@ -84,13 +84,13 @@ public class OrderController {
             });
         }else {
             Sku byId = skuService.getById(orderParam.getOrderItem().getSkuId());
-            boolean skuStock = qnhService.getSkuStock(byId.getSkuCode(), byId.getProdId());
-            Product byId1 = productService.getById(byId.getProdId());
+            boolean skuStock = qnhService.getSkuStock(byId.getSkuCode(), byId.getProdId(),orderParam.getPlatform());
+            Product byId1 = productService.getById(byId.getProdId(),orderParam.getPlatform());
             byId1.setTotalStocks(byId.getStocks());
             productService.updateById(byId1);
-            if (skuStock && byId1.getTotalStocks() < orderParam.getOrderItem().getProdCount()) {
-                throw new GlobalException("当前选择的规格库存不足！");
-            }
+//            if (skuStock && byId1.getTotalStocks() < orderParam.getOrderItem().getProdCount()) {
+//                throw new GlobalException("当前选择的规格库存不足！");
+//            }
         }
         String userId = SecurityUtils.getUser().getUserId();
         orderParam.setDvyType(1);

yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java

@@ -27,6 +27,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import ma.glasnost.orika.MapperFacade;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -59,19 +60,22 @@ public class ProdController {
     @ApiImplicitParam(name = "prodId", value = "商品ID", required = true, dataType = "Long")
     public ResponseEntity<ProductDto> prodInfo(Long prodId, Integer platform, Long shopId) {
 
-        Product product = prodService.getProductByProdId(prodId);
+        Product product = prodService.getProductByProdId(prodId, platform);
         if (product == null || product.getStatus() != 1) {
             throw new GlobalException("商品已下线");
         }
 
         List<Sku> skuList = skuService.listByProdId(prodId, platform, shopId);
-        // 启用的sku列表
-        List<Sku> useSkuList = skuList.stream().sorted(Comparator.comparing(
-                Sku::getPrice,
-                Comparator.nullsFirst(Comparator.naturalOrder())
-        )).peek((sku) -> product.setTotalStocks(product.getTotalStocks() + sku.getActualStocks())).collect(Collectors.toList());
-        product.setPrice(useSkuList.get(0).getPrice());
-        product.setSkuList(useSkuList);
+        if (ObjectUtils.isNotEmpty(skuList)) {
+            // 启用的sku列表
+            List<Sku> useSkuList = skuList.stream().sorted(Comparator.comparing(
+                    Sku::getPrice,
+                    Comparator.nullsFirst(Comparator.naturalOrder())
+            )).peek((sku) -> product.setTotalStocks(product.getTotalStocks() + sku.getActualStocks())).collect(Collectors.toList());
+            product.setPrice(useSkuList.get(0).getPrice());
+            product.setSkuList(useSkuList);
+        }
+
 //        ProductDto productDto = mapperFacade.map(product, ProductDto.class);
         ProductDto productDto = new ProductDto();
         BeanUtils.copyProperties(product, productDto);

yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java

@@ -51,6 +51,9 @@ public class OrderParam {
 	@ApiModelProperty(value = "用户是否自己选择使用多少积分，为空则为默认全部使用")
 	private Integer userUseScore;
 
+	@ApiModelProperty(value = "渠道标识")
+	private Integer platform;
+
 //	@ApiModelProperty(value = "每次订单提交时的uuid")
 //	private String uuid;
 //	@ApiModelProperty(value = "订单入口 SHOP_CART购物车，BUY_NOW立即购买")

yami-shop-bean/src/main/java/com/yami/shop/bean/dto/SearchProdDto.java

@@ -57,6 +57,25 @@ public class SearchProdDto {
 
     @ApiModelProperty("店铺id")
     private Long shopId;
+
+    @ApiModelProperty("自营id")
+    private Long selfLabelId;
+
+    @ApiModelProperty("回头客id")
+    private Long returnLabelId;
+
+    @ApiModelProperty("热卖榜id")
+    private Long hotLabelId;
+
+    @ApiModelProperty("自营标签")
+    private String selfLabel;
+
+    @ApiModelProperty("回头客标签")
+    private String returnLabel;
+
+    @ApiModelProperty("热卖榜标签")
+    private String hotLabel;
+
     @ApiModelProperty(value = "sku列表")
     private List<SkuDto> skuList;
 
@@ -64,5 +83,4 @@ public class SearchProdDto {
     private List<String> banners;
 
 
-
 }

yami-shop-bean/src/main/java/com/yami/shop/bean/model/Category.java

@@ -125,4 +125,6 @@ public class Category implements Serializable {
 
     @TableField(exist=false)
     private String shopName;
+
+    private String label;
 }

yami-shop-bean/src/main/java/com/yami/shop/bean/model/Product.java

@@ -150,6 +150,7 @@ public class Product implements Serializable {
     /**
      * 详细描述
      */
+    @TableField("`content`")
     private String content;
 
     /**

yami-shop-common/pom.xml

@@ -93,11 +93,11 @@
             <groupId>com.github.binarywang</groupId>
             <artifactId>weixin-java-mp</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <scope>compile</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.apache.poi</groupId>-->
+<!--            <artifactId>poi</artifactId>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.huaweicloud</groupId>
             <artifactId>esdk-obs-java</artifactId>

yami-shop-common/src/main/java/com/yami/shop/common/util/PoiExcelUtil.java

@@ -1,177 +0,0 @@
-package com.yami.shop.common.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-/**
- * 功能: poi导出excel工具类
- *
- * @author lhd
- */
-public class PoiExcelUtil {
-
-    /**
-     * 获取单元格的值
-     *
-     * @param fCell
-     * @return
-     */
-    public static String getCellValue(Cell fCell) {
-        if (fCell == null){
-            return null;
-        }
-        if (fCell.getCellType() == Cell.CELL_TYPE_STRING) {
-            return fCell.getStringCellValue();
-        } else if (fCell.getCellType() == Cell.CELL_TYPE_BOOLEAN) {
-            return String.valueOf(fCell.getBooleanCellValue());
-        } else if (fCell.getCellType() == Cell.CELL_TYPE_FORMULA) {
-            return fCell.getCellFormula();
-        } else if (fCell.getCellType() == Cell.CELL_TYPE_NUMERIC) {
-            return String.valueOf(fCell.getNumericCellValue());
-        }
-        return null;
-    }
-
-    /**
-     * 合并单元格处理,获取合并行
-     *
-     * @param sheet
-     * @return List<CellRangeAddress>
-     */
-    public static List<CellRangeAddress> getCombineCell(Sheet sheet) {
-        List<CellRangeAddress> list = new ArrayList<CellRangeAddress>();
-        // 获得一个 sheet 中合并单元格的数量
-        int sheetmergerCount = sheet.getNumMergedRegions();
-        // 遍历所有的合并单元格
-        for (int i = 0; i < sheetmergerCount; i++) {
-            // 获得合并单元格保存进list中
-            CellRangeAddress ca = sheet.getMergedRegion(i);
-            list.add(ca);
-        }
-        return list;
-    }
-
-    public static int getRowNum(List<CellRangeAddress> listCombineCell, Cell cell, Sheet sheet) {
-        int xr = 0;
-        int firstC = 0;
-        int lastC = 0;
-        int firstR = 0;
-        int lastR = 0;
-        for (CellRangeAddress ca : listCombineCell) {
-            // 获得合并单元格的起始行, 结束行, 起始列, 结束列
-            firstC = ca.getFirstColumn();
-            lastC = ca.getLastColumn();
-            firstR = ca.getFirstRow();
-            lastR = ca.getLastRow();
-            if (cell.getRowIndex() >= firstR && cell.getRowIndex() <= lastR) {
-                if (cell.getColumnIndex() >= firstC && cell.getColumnIndex() <= lastC) {
-                    xr = lastR;
-                }
-            }
-
-        }
-        return xr;
-
-    }
-
-    /**
-     * 判断单元格是否为合并单元格，是的话则将单元格的值返回
-     *
-     * @param listCombineCell
-     *            存放合并单元格的list
-     * @param cell
-     *            需要判断的单元格
-     * @param sheet
-     *            sheet
-     * @return
-     */
-    public static String isCombineCell(List<CellRangeAddress> listCombineCell, Cell cell, Sheet sheet) throws Exception {
-        int firstC = 0;
-        int lastC = 0;
-        int firstR = 0;
-        int lastR = 0;
-        String cellValue = null;
-        for (CellRangeAddress ca : listCombineCell) {
-            // 获得合并单元格的起始行, 结束行, 起始列, 结束列
-            firstC = ca.getFirstColumn();
-            lastC = ca.getLastColumn();
-            firstR = ca.getFirstRow();
-            lastR = ca.getLastRow();
-            if (cell.getRowIndex() >= firstR && cell.getRowIndex() <= lastR) {
-                if (cell.getColumnIndex() >= firstC && cell.getColumnIndex() <= lastC) {
-                    Row fRow = sheet.getRow(firstR);
-                    Cell fCell = fRow.getCell(firstC);
-                    cellValue = getCellValue(fCell);
-                    break;
-                }
-            } else {
-                cellValue = "";
-            }
-        }
-        return cellValue;
-    }
-
-    /**
-     * 获取合并单元格的值
-     *
-     * @param sheet
-     * @param row
-     * @param column
-     * @return
-     */
-    public static String getMergedRegionValue(Sheet sheet, int row, int column) {
-        int sheetMergeCount = sheet.getNumMergedRegions();
-
-        for (int i = 0; i < sheetMergeCount; i++) {
-            CellRangeAddress ca = sheet.getMergedRegion(i);
-            int firstColumn = ca.getFirstColumn();
-            int lastColumn = ca.getLastColumn();
-            int firstRow = ca.getFirstRow();
-            int lastRow = ca.getLastRow();
-
-            if (row >= firstRow && row <= lastRow) {
-                if (column >= firstColumn && column <= lastColumn) {
-                    Row fRow = sheet.getRow(firstRow);
-                    Cell fCell = fRow.getCell(firstColumn);
-                    return getCellValue(fCell);
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * 判断指定的单元格是否是合并单元格
-     *
-     * @param sheet
-     * @param row
-     *            行下标
-     * @param column
-     *            列下标
-     * @return
-     */
-    public static boolean isMergedRegion(Sheet sheet, int row, int column) {
-        int sheetMergeCount = sheet.getNumMergedRegions();
-        for (int i = 0; i < sheetMergeCount; i++) {
-            CellRangeAddress range = sheet.getMergedRegion(i);
-            int firstColumn = range.getFirstColumn();
-            int lastColumn = range.getLastColumn();
-            int firstRow = range.getFirstRow();
-            int lastRow = range.getLastRow();
-            if (row >= firstRow && row <= lastRow) {
-                if (column >= firstColumn && column <= lastColumn) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-
-}

yami-shop-delivery/yami-shop-delivery-comment/src/main/java/com/yami/shop/delivery/comment/api/paotui/PaoTuiApi.java

@@ -6,25 +6,22 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.config.ShopConfig;
 import com.yami.shop.delivery.comment.api.paotui.model.Base;
 import com.yami.shop.delivery.comment.api.paotui.model.request.*;
 import com.yami.shop.delivery.comment.api.paotui.model.response.*;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Type;
-import java.math.BigDecimal;
 import java.time.Instant;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
 @Component
-@Log4j2
+@Slf4j
 public class PaoTuiApi {
 
     private static String host = "http://open.maiyatian.com/";

yami-shop-delivery/yami-shop-delivery-comment/src/main/java/com/yami/shop/delivery/comment/service/impl/DeliveryOrderServiceImpl.java

@@ -33,6 +33,7 @@ import com.yami.shop.service.UserAddrOrderService;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j;
 import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import ma.glasnost.orika.MapperFacade;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -50,7 +51,7 @@ import java.util.Objects;
  */
 @Service
 @AllArgsConstructor
-@Log4j2
+@Slf4j
 public class DeliveryOrderServiceImpl extends ServiceImpl<DeliveryOrderMapper, DeliveryOrder> implements DeliveryOrderService {
 
     private final DeliveryOrderMapper deliveryOrderMapper;

yami-shop-delivery/yami-shop-delivery-multishop/src/main/java/com/yami/shop/delivery/multishop/controller/FetchController.java

@@ -14,6 +14,7 @@ import com.yami.shop.bean.enums.OfflineHandleEventType;
 import com.yami.shop.bean.model.OfflineHandleEvent;
 import com.yami.shop.bean.param.OfflineHandleEventAuditParam;
 import com.yami.shop.common.annotation.SysLog;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.delivery.comment.model.Fetch;

yami-shop-discount/yami-shop-discount-multishop/src/main/java/com/yami/shop/discount/platform/controller/DiscountController.java

@@ -17,6 +17,7 @@ import com.yami.shop.bean.enums.OfflineHandleEventType;
 import com.yami.shop.bean.model.OfflineHandleEvent;
 import com.yami.shop.bean.model.Product;
 import com.yami.shop.bean.param.OfflineHandleEventAuditParam;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.discount.comment.model.Discount;

yami-shop-distribution/yami-shop-distribution-multishop/src/main/java/com/yami/shop/distribution/multishop/controller/DistributionProdController.java

@@ -19,6 +19,7 @@ import com.yami.shop.bean.model.IndexImg;
 import com.yami.shop.bean.model.OfflineHandleEvent;
 import com.yami.shop.bean.model.Product;
 import com.yami.shop.bean.param.OfflineHandleEventAuditParam;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.distribution.comment.model.DistributionProd;

yami-shop-groupbuy/yami-shop-groupbuy-multishop/src/main/java/com/yami/shop/groupbuy/multishop/controller/GroupActivityController.java

@@ -16,6 +16,7 @@ import com.yami.shop.bean.model.OfflineHandleEvent;
 import com.yami.shop.bean.model.Product;
 import com.yami.shop.bean.param.OfflineHandleEventAuditParam;
 import com.yami.shop.common.annotation.SysLog;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.groupbuy.comment.dto.GroupActivityDto;

yami-shop-groupbuy/yami-shop-groupbuy-multishop/src/main/java/com/yami/shop/groupbuy/multishop/controller/GroupProdController.java

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.enums.ProdType;
 import com.yami.shop.bean.model.Product;
 import com.yami.shop.common.annotation.SysLog;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.groupbuy.comment.api.dto.ApiGroupActivityDto;

yami-shop-platform/pom.xml

@@ -26,11 +26,11 @@
             <artifactId>yami-shop-sys</artifactId>
             <version>${yami.shop.version}</version>
         </dependency>
-       <dependency>
-	       <groupId>org.apache.poi</groupId>
-	       <artifactId>poi-ooxml</artifactId>
-	       <version>${poi.version}</version>
-       </dependency>
+<!--       <dependency>-->
+<!--	       <groupId>org.apache.poi</groupId>-->
+<!--	       <artifactId>poi-ooxml</artifactId>-->
+<!--	       <version>${poi.version}</version>-->
+<!--       </dependency>-->
         <dependency>
             <groupId>com.yami.shop</groupId>
             <artifactId>yami-shop-quartz</artifactId>

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/ShopDetailController.java

@@ -71,10 +71,8 @@ public class ShopDetailController {
     public R<IPage<ShopDetail>> page(@ModelAttribute PageParam pageParam,
                                       @ModelAttribute ShopDetail shopDetail ) {
         IPage<ShopDetail> page = shopDetailService.page(pageParam,new LambdaQueryWrapper<ShopDetail>()
-                .eq(ObjectUtils.isNotEmpty(shopDetail.getShopName()),ShopDetail::getShopName, shopDetail.getShopName())
-                .eq(ObjectUtils.isNotEmpty(shopDetail.getHbStationNo()),ShopDetail::getHbStationNo, shopDetail.getHbStationNo()));
-
-
+                .like(ObjectUtils.isNotEmpty(shopDetail.getShopName()),ShopDetail::getShopName, shopDetail.getShopName())
+                .like(ObjectUtils.isNotEmpty(shopDetail.getHbStationNo()),ShopDetail::getHbStationNo, shopDetail.getHbStationNo()));
         return R.SUCCESS(page);
     }
 

yami-shop-seckill/yami-shop-seckill-multishop/src/main/java/com/yami/shop/seckill/multishop/controller/SeckillController.java

@@ -15,6 +15,7 @@ import com.yami.shop.bean.model.Product;
 import com.yami.shop.bean.param.OfflineHandleEventAuditParam;
 import com.yami.shop.bean.param.ProductParam;
 import com.yami.shop.common.enums.YamiHttpStatus;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.seckill.multishop.dto.SeckillProdDto;
 import com.yami.shop.seckill.multishop.param.SeckillParam;
@@ -184,7 +185,7 @@ public class SeckillController {
     public ResponseEntity<Void> invalidById(@PathVariable Long seckillId) {
         Seckill seckill = seckillService.getSeckillById(seckillId);
         if (!SecurityUtils.getShopUser().getShopId().equals(seckill.getShopId())) {
-            throw new GlobalException(YamiHttpStatus.UNAUTHORIZED);
+            throw new GlobalException("");
         }
         seckillService.invalidById(seckill);
 

yami-shop-service/src/main/java/com/yami/shop/dao/ProductMapper.java

@@ -39,13 +39,14 @@ public interface ProductMapper extends BaseMapper<Product> {
 
     Product getProductByProdNameAndShopId(@Param("prodName") String prodName, @Param("shopId") Long shopId);
 
+    Product doGetById(@Param("prodId") Long prodId, @Param("platform") Integer platform);
 
     void returnStock(@Param("prodCollect") Map<Long, Integer> prodCollect);
 
     IPage<ProductDto> pageByPutawayTime(IPage<ProductDto> page);
 
     IPage<ProductDto> pageByPutawayTimeNew(IPage<ProductDto> page,
-                                        @Param("list") List<Long> list);
+                                           @Param("list") List<Long> list);
 
     IPage<ProductDto> pageByScore(IPage<ProductDto> page);
 
@@ -154,19 +155,21 @@ public interface ProductMapper extends BaseMapper<Product> {
     Integer getSalesVolume(Long prodId);
 
     IPage<SearchProdDto> getSearchProdDtoPageByProdName2(@Param("page") Page page, @Param("searchParam") SearchParam searchParam);
+
     /**
      * 根据分类ID、商户ID查询归属的所有商品
-     * */
-    IPage<Product> listProdByCategoryIdAndShopId(@Param("page") Page page, @Param("prodByCategoryIdAndShopIdDTO")ProdByCategoryIdAndShopIdDTO prodByCategoryIdAndShopIdDTO);
+     */
+    IPage<Product> listProdByCategoryIdAndShopId(@Param("page") Page page, @Param("prodByCategoryIdAndShopIdDTO") ProdByCategoryIdAndShopIdDTO prodByCategoryIdAndShopIdDTO);
 
     /**
      * 根据分类ID、商户ID查询归属的所有商品
-     * */
-    IPage<Product> listProdByCategoryIdAndShopId2(@Param("page") Page page, @Param("prodByCategoryIdAndShopIdDTO")ProdByCategoryIdAndShopIdDTO prodByCategoryIdAndShopIdDTO);
+     */
+    IPage<Product> listProdByCategoryIdAndShopId2(@Param("page") Page page, @Param("prodByCategoryIdAndShopIdDTO") ProdByCategoryIdAndShopIdDTO prodByCategoryIdAndShopIdDTO);
 
 
     /**
      * 通过海博编码获取商品信息
+     *
      * @param hbSpuId 海博商品编码
      * @return 商品信息
      */

yami-shop-service/src/main/java/com/yami/shop/service/IQnhService.java

@@ -38,6 +38,7 @@ public interface IQnhService {
     void synchronizedInfo();
 
     boolean getSkuStock(String skuCode,Long prodId);
+    boolean getSkuStock(String skuCode,Long prodId,Integer platform);
 
     void noticeProductInfo(Object object);
 }

yami-shop-service/src/main/java/com/yami/shop/service/ProductService.java

@@ -32,6 +32,8 @@ import java.util.List;
  */
 public interface ProductService extends IService<Product> {
 
+    Product getById(Long prodId, Integer platform);
+
     /**
      * 保存商品
      *
@@ -53,6 +55,7 @@ public interface ProductService extends IService<Product> {
      * @return
      */
     Product getProductByProdId(Long prodId);
+    Product getProductByProdId(Long prodId,Integer platform);
 
 
     void removeProductByProdId(Long prodId);
@@ -119,24 +122,26 @@ public interface ProductService extends IService<Product> {
 
     /**
      * 根据分类ID查询关联商品
-     * */
+     */
     IPage<Product> listRelatedProducts(ListRelatedProductsDto listRelatedProductsDto);
 
     /**
      * 取消关联商品
-     * */
+     */
     boolean cancelRelatedProducts(long shopId, long productId);
+
     /**
      * 关联商品
-     * */
+     */
     boolean relatedProducts(long shopId, List<Long> productId, long shopCategoryId);
+
     /**
      * 根据商户ID查询未关联商品
-     * */
+     */
     IPage<Product> listUnRelatedProducts(ListUnRelatedProductsDTO listUnRelatedProductsDTO);
 
     /**
      * 根据分类ID、商户ID查询归属的所有商品
-     * */
+     */
     IPage<Product> listProdByCategoryIdAndShopId(ProdByCategoryIdAndShopIdDTO prodByCategoryIdAndShopIdDTO);
 }

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/StoreManagementService.java

@@ -124,11 +124,7 @@ public class StoreManagementService implements IStoreManagementService {
             String outStationNo = bodyJson.getString("outStationNo");
 
             String hb = doGetStation(outStationNo);
-            ShopDetail shopDetail = shopDetailMapper.selectByOutStationNo(outStationNo);
-            if (shopDetail != null) {
-                log.info("门店已存在{}", outStationNo);
-                return HBR.success();
-            }
+
             JSONObject goodsInfoJson = JSON.parseObject(hb);
             // 2. 逐层解析获取result
             JSONObject result = goodsInfoJson.getJSONObject("result");
@@ -145,31 +141,52 @@ public class StoreManagementService implements IStoreManagementService {
             shopDetailInfo.setShopLng(resultData.getString("latitude"));
             shopDetailInfo.setThirdPartyCode(resultData.getString("stationId"));
             shopDetailInfo.setNotice(resultData.getString("notice"));
+            shopDetailInfo.setTel(resultData.getString("phone"));
             //海博门店ID
             shopDetailInfo.setHbStationId(resultData.getString("stationId"));
             //商家门店编码
             shopDetailInfo.setOutStationNo(resultData.getString("outStationNo"));
+            //海博门店编码
+            shopDetailInfo.setHbStationNo(resultData.getString("outStationNo"));
             //经营状态
             shopDetailInfo.setRunStatus(resultData.getInteger("runStatus"));
             //营业状态
             shopDetailInfo.setShopStatus(resultData.getInteger("businessStatus"));
-            //营业时间
-            shopDetailInfo.setBusinessTime(resultData.getString("businessTime"));
-            shopDetailMapper.insert(shopDetailInfo);
-            //添加默认配送模板
 
-            Transport2 transport2 = new Transport2();
-            //所有数据设置默认值
+            shopDetailInfo.setBusinessTime(resultData.getString("businessTime"));
             //配送范围经纬度
             JSONArray coordinates = resultData.getJSONArray("coordinates");
-            transport2.setTransName("默认配送模板");
-            transport2.setDistance(100.0);
-            transport2.setAmount(1.0);
-            transport2.setPiece(5.0);
-            transport2.setCreateTime(new Date());
-            transport2.setShopId(shopDetailInfo.getShopId());
-            transport2Mapper.insert(transport2);
+            //营业时间
+            JSONArray businessTimes = resultData.getJSONArray("businessTime");
+            String businessTime = "";
+            for (Object businessTimeInfo : businessTimes) {
+                JSONObject coordinateJson = JSON.parseObject(businessTimeInfo.toString());
+                String end = coordinateJson.getString("end");
+                String start = coordinateJson.getString("start");
+                businessTime = ("".equals(businessTime) ? "" : (businessTime + ";")) + start + "-" + end;
+            }
+            shopDetailInfo.setBusinessTime(businessTime);
 
+            ShopDetail shopDetail = shopDetailMapper.selectByHbStationId(resultData.getString("stationId"));
+            if (shopDetail != null) {
+                log.info("存在门店不需要新增直接修改{}", outStationNo);
+                shopDetailInfo.setShopId(shopDetail.getShopId());
+                shopDetailMapper.updateById(shopDetailInfo);
+            }else {
+                shopDetailMapper.insert(shopDetailInfo);
+                log.info("门店变更成功{}", shopDetailInfo);
+
+                //添加默认配送模板
+                Transport2 transport2 = new Transport2();
+                //所有数据设置默认值
+                transport2.setTransName("默认配送模板");
+                transport2.setDistance(100.0);
+                transport2.setAmount(1.0);
+                transport2.setPiece(5.0);
+                transport2.setCreateTime(new Date());
+                transport2.setShopId(shopDetailInfo.getShopId());
+                transport2Mapper.insert(transport2);
+            }
             return HBR.success();
         } catch (Exception e) {
             log.error("门店变更失败：{}", e.getMessage(), e);

yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java

@@ -330,47 +330,48 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
 
 	// 校验与解析分离
 	private List<List<String>> validateAndParseExcel(MultipartFile excelFile) throws Exception {
-		Workbook workBook = WorkbookFactory.create(excelFile.getInputStream());
-		Sheet sheet = workBook.getSheetAt(0);
-
-		// 校验标题行
-		Row headerRow = sheet.getRow(0);
-		List<String> headers = new ArrayList<>();
-		if (headerRow != null) {
-			for (int i = 0; i < headerRow.getLastCellNum(); i++) {
-				Cell cell = headerRow.getCell(i, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
-				cell.setCellType(CellType.STRING);
-				String value = cell.getStringCellValue().trim();
-				if (value.isEmpty()) throw new GlobalException("第" + (i+1) + "列标题为空");
-				headers.add(value);
-			}
-		}
-
-		// 校验列数与列名
-		if (headers.size() != 3) throw new GlobalException("模板列数必须为3列");
-		String[] expected = {"一级分类名称", "二级分类名称", "三级分类名称"};
-		for (int i = 0; i < expected.length; i++) {
-			if (!headers.get(i).equals(expected[i])) {
-				throw new GlobalException("第" + (i+1) + "列名称应为【" + expected[i] + "】");
-			}
-		}
-
-		// 提取数据行
-		List<List<String>> result = new ArrayList<>();
-		for (int rowNum = 1; rowNum <= sheet.getLastRowNum(); rowNum++) {
-			Row dataRow = sheet.getRow(rowNum);
-			List<String> rowData = new ArrayList<>(3);
-			for (int i = 0; i < 3; i++) {
-				Cell cell = dataRow.getCell(i, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
-				cell.setCellType(CellType.STRING);
-				rowData.add(cell.getStringCellValue().trim());
-			}
-			if (rowData.get(0).isEmpty() || rowData.get(1).isEmpty()) {
-				throw new GlobalException("一级和二级分类名称不能为空");
-			}
-			result.add(rowData);
-		}
-		return result;
+//		Workbook workBook = WorkbookFactory.create(excelFile.getInputStream());
+//
+//		Sheet sheet = workBook.getSheetAt(0);
+//
+//		// 校验标题行
+//		Row headerRow = sheet.getRow(0);
+//		List<String> headers = new ArrayList<>();
+//		if (headerRow != null) {
+//			for (int i = 0; i < headerRow.getLastCellNum(); i++) {
+//				Cell cell = headerRow.getCell(i, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+//				cell.setCellType(CellType.STRING);
+//				String value = cell.getStringCellValue().trim();
+//				if (value.isEmpty()) throw new GlobalException("第" + (i+1) + "列标题为空");
+//				headers.add(value);
+//			}
+//		}
+//
+//		// 校验列数与列名
+//		if (headers.size() != 3) throw new GlobalException("模板列数必须为3列");
+//		String[] expected = {"一级分类名称", "二级分类名称", "三级分类名称"};
+//		for (int i = 0; i < expected.length; i++) {
+//			if (!headers.get(i).equals(expected[i])) {
+//				throw new GlobalException("第" + (i+1) + "列名称应为【" + expected[i] + "】");
+//			}
+//		}
+//
+//		// 提取数据行
+//		List<List<String>> result = new ArrayList<>();
+//		for (int rowNum = 1; rowNum <= sheet.getLastRowNum(); rowNum++) {
+//			Row dataRow = sheet.getRow(rowNum);
+//			List<String> rowData = new ArrayList<>(3);
+//			for (int i = 0; i < 3; i++) {
+//				Cell cell = dataRow.getCell(i, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+//				cell.setCellType(CellType.STRING);
+//				rowData.add(cell.getStringCellValue().trim());
+//			}
+//			if (rowData.get(0).isEmpty() || rowData.get(1).isEmpty()) {
+//				throw new GlobalException("一级和二级分类名称不能为空");
+//			}
+//			result.add(rowData);
+//		}
+		return new ArrayList<>( );
 	}
 	// 分类保存逻辑（若允许放宽主键依赖，可开启批量插入）
 	private void saveCategoryHierarchy(List<List<String>> dataRows, Long shopId) {

yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsRechargeServiceImpl.java

@@ -9,8 +9,9 @@ import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.dao.*;
 import com.yami.shop.service.PointsFailureRecordService;
 import com.yami.shop.service.PointsRechargeService;
+import com.yami.shop.service.impl.PointsRechargeTemplateDTO;
 import lombok.AllArgsConstructor;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.log4j.Log4j;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -29,7 +30,7 @@ import java.util.List;
  */
 @Service
 @AllArgsConstructor
-@Log4j2
+//@Log4j
 public class PointsRechargeServiceImpl extends ServiceImpl<PointsRechargeMapper, PointsRecharge> implements PointsRechargeService {
 
     private final PointsRechargeMapper pointsRechargeMapper;
@@ -46,7 +47,7 @@ public class PointsRechargeServiceImpl extends ServiceImpl<PointsRechargeMapper,
         response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
 
         // 创建示例数据
-        List<com.yami.shop.service.impl.PointsRechargeTemplateDTO> templateData = new ArrayList<>();
+        List<PointsRechargeTemplateDTO> templateData = new ArrayList<>();
         // 使用EasyExcel导出模板
         EasyExcel.write(response.getOutputStream(), com.yami.shop.service.impl.PointsRechargeTemplateDTO.class)
                 .sheet("积分充值导入模板")
@@ -57,10 +58,10 @@ public class PointsRechargeServiceImpl extends ServiceImpl<PointsRechargeMapper,
     @Override
     public String importPointsRecharge(MultipartFile file) {
         // 读取Excel数据
-        List<com.yami.shop.service.impl.PointsRechargeTemplateDTO> importData = null;
+        List<PointsRechargeTemplateDTO> importData = null;
         try {
             importData = EasyExcel.read(file.getInputStream())
-                    .head(com.yami.shop.service.impl.PointsRechargeTemplateDTO.class)
+                    .head(PointsRechargeTemplateDTO.class)
                     .sheet()
                     .doReadSync();
         } catch (IOException e) {
@@ -71,7 +72,7 @@ public class PointsRechargeServiceImpl extends ServiceImpl<PointsRechargeMapper,
         int failCount = 0;
 
         for (int i = 0; i < importData.size(); i++) {
-            com.yami.shop.service.impl.PointsRechargeTemplateDTO templateDTO = importData.get(i);
+            PointsRechargeTemplateDTO templateDTO = importData.get(i);
             try {
 
                 // 数据校验
@@ -146,8 +147,7 @@ public class PointsRechargeServiceImpl extends ServiceImpl<PointsRechargeMapper,
 
                 // 保存失败记录
                 pointsFailureRecordService.save(failureRecord);
-
-                log.error("导入第{}行数据失败！", i + 1, e);
+//                log.error("导入第{}行数据失败！", i + 1, e);
                 failCount++;
             }
         }

yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java

@@ -38,7 +38,7 @@ import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.common.util.Arith;
 import com.yami.shop.common.util.Json;
 import com.yami.shop.common.util.PageParam;
-import com.yami.shop.common.util.PoiExcelUtil;
+//import com.yami.shop.common.util.PoiExcelUtil;
 import com.yami.shop.dao.*;
 import com.yami.shop.service.*;
 import lombok.AllArgsConstructor;
@@ -66,6 +66,7 @@ import java.util.stream.Collectors;
 public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> implements ProductService {
 
     private final ProductMapper productMapper;
+    private final LabelMapper labelMapper;
     private final BrandService brandService;
     private final CategoryService categoryService;
     private final ApplicationContext applicationContext;
@@ -73,6 +74,11 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     private final OfflineHandleEventService offlineHandleEventService;
 
 
+    @Override
+    public Product getById(Long prodId, Integer platform) {
+        return productMapper.doGetById(prodId, platform);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveProduct(Product product) {
@@ -137,11 +143,15 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
      * @return
      */
     @Override
-    @Cacheable(cacheNames = "product", key = "#prodId")
     public Product getProductByProdId(Long prodId) {
         return productMapper.selectById(prodId);
     }
 
+    @Override
+    public Product getProductByProdId(Long prodId, Integer platform) {
+        return productMapper.doGetById(prodId, platform);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Caching(evict = {
@@ -193,7 +203,6 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     }
 
 
-
     @Override
     public IPage<ProductDto> pageByTagId(Page<ProductDto> page, Long tagId) {
         return productMapper.pageByTagId(page, tagId);
@@ -219,6 +228,21 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
             }
             IPage<SearchProdDto> searchProdDtoPage = productMapper.getSearchProdDtoPageByProdNameNew(page, searchParam, shopIds);
             for (SearchProdDto searchProdDto : searchProdDtoPage.getRecords()) {
+                Long hotLabelId = searchProdDto.getHotLabelId();
+                Long selfLabelId = searchProdDto.getSelfLabelId();
+                Long returnLabelId = searchProdDto.getReturnLabelId();
+                if (null != hotLabelId) {
+                    Label label = labelMapper.selectById(hotLabelId);
+                    searchProdDto.setHotLabel(label.getName());
+                }
+                if (null != selfLabelId) {
+                    Label label = labelMapper.selectById(selfLabelId);
+                    searchProdDto.setSelfLabel(label.getName());
+                }
+                if (null != returnLabelId) {
+                    Label label = labelMapper.selectById(returnLabelId);
+                    searchProdDto.setReturnLabel(label.getName());
+                }
                 List<SkuDto> skuList = skuMapper.listByProdId(searchProdDto.getProdId()).stream().map((sku) -> SkuDto.builder()
                         .skuName(sku.getSkuName()).pic(sku.getPic()).skuScore(sku.getSkuScore()).price(sku.getPrice())
                         .stocks(sku.getStocks()).properties(sku.getProperties()).skuId(sku.getSkuId())
@@ -341,24 +365,24 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
 
     @Override
     public IPage<Product> getPageAngShopName(PageParam<Product> page, ProductParam product) {
-        return productMapper.getPageAndShopName(page,product);
+        return productMapper.getPageAndShopName(page, product);
     }
 
 
     @Override
     public void exportProd(ProductExportParam productParam, HttpServletResponse response, Long shopId) {
         List<ProductExportParam> products = productMapper.listProdsByProdParam(productParam);
-        createExcel(products,response,shopId);
+        createExcel(products, response, shopId);
     }
 
-    private void createExcel(List<ProductExportParam> products, HttpServletResponse response,Long shopId) {
+    private void createExcel(List<ProductExportParam> products, HttpServletResponse response, Long shopId) {
 
         //通过工具类创建writer
         ExcelWriter writer = ExcelUtil.getBigWriter();
         // 待发货
-        String[] hearder = { "产品名称", "平台分类", "店铺分类", "所属品牌", "产品卖点", "配送方式","运费设置","产品状态",
-                            "规格名称","商品名称", "销售属性组合字符串 格式是p1:v1;p2:v2", "原价", "价格", "积分价格",
-                            "库存","商家编码","商品条形码" ,"商品重量", "商品体积"};
+        String[] hearder = {"产品名称", "平台分类", "店铺分类", "所属品牌", "产品卖点", "配送方式", "运费设置", "产品状态",
+                "规格名称", "商品名称", "销售属性组合字符串 格式是p1:v1;p2:v2", "原价", "价格", "积分价格",
+                "库存", "商家编码", "商品条形码", "商品重量", "商品体积"};
         Sheet sheet = writer.getSheet();
         sheet.setColumnWidth(0, 60 * 256);
         sheet.setColumnWidth(1, 20 * 256);
@@ -371,8 +395,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         writer.writeRow(Arrays.asList(hearder));
         // 限制商家分类和平台分类
         List<Category> categories = categoryService.list(new LambdaQueryWrapper<Category>()
-                .eq(Category::getShopId,0L).eq(Category::getGrade,2));
-        if(CollectionUtils.isNotEmpty(categories)) {
+                .eq(Category::getShopId, 0L).eq(Category::getGrade, 2));
+        if (CollectionUtils.isNotEmpty(categories)) {
             String[] categoryName = new String[categories.size()];
             for (int i = 0; i < categories.size(); i++) {
                 categoryName[i] = categories.get(i).getCategoryName();
@@ -380,7 +404,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
             createDropDownList(sheet, categoryName, 2, 50000, 1, 1);
         }
         List<Category> shopCategories = categoryService.listByShopId(shopId);
-        if(CollectionUtils.isNotEmpty(shopCategories)) {
+        if (CollectionUtils.isNotEmpty(shopCategories)) {
             String[] categoryName = new String[shopCategories.size()];
             for (int i = 0; i < shopCategories.size(); i++) {
                 categoryName[i] = shopCategories.get(i).getCategoryName();
@@ -388,11 +412,11 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
             createDropDownList(sheet, categoryName, 2, 50000, 2, 2);
         }
         // 限制物流方式
-        String[] dvyTypes = {"商家邮寄","用户自提","同城配送","商家邮寄,用户自提","商家邮寄,同城配送","同城配送,用户自提","商家邮寄,用户自提,同城配送"};
+        String[] dvyTypes = {"商家邮寄", "用户自提", "同城配送", "商家邮寄,用户自提", "商家邮寄,同城配送", "同城配送,用户自提", "商家邮寄,用户自提,同城配送"};
         createDropDownList(sheet, dvyTypes, 2, 50000, 5, 5);
         // 限制品牌选择
         List<Brand> brands = brandService.list(new LambdaQueryWrapper<Brand>().eq(Brand::getStatus, 1));
-        if(CollectionUtils.isNotEmpty(brands)) {
+        if (CollectionUtils.isNotEmpty(brands)) {
             String[] categoryName = new String[brands.size()];
             for (int i = 0; i < brands.size(); i++) {
                 categoryName[i] = brands.get(i).getBrandName();
@@ -400,17 +424,17 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
             createDropDownList(sheet, categoryName, 2, 50000, 3, 3);
         }
         List<TransportParam> transportParams = new ArrayList<>();
-        applicationContext.publishEvent(new GetTransportNamesEvent(transportParams,shopId));
-        if(CollectionUtils.isNotEmpty(transportParams)) {
+        applicationContext.publishEvent(new GetTransportNamesEvent(transportParams, shopId));
+        if (CollectionUtils.isNotEmpty(transportParams)) {
             List<String> transportNameList = new ArrayList<>();
             transportParams.forEach(transportParam -> transportNameList.add(transportParam.getTransName()));
             String[] transportNames = transportNameList.toArray(new String[transportNameList.size()]);
-            createDropDownList(sheet,transportNames,2,50000,6,6);
+            createDropDownList(sheet, transportNames, 2, 50000, 6, 6);
         }
-        String[] statusStr = {"下架","上架"};
-        createDropDownList(sheet,statusStr,2,50000,7,7);
+        String[] statusStr = {"下架", "上架"};
+        createDropDownList(sheet, statusStr, 2, 50000, 7, 7);
         int row = 1;
-        if(CollectionUtils.isNotEmpty(products)) {
+        if (CollectionUtils.isNotEmpty(products)) {
             for (ProductExportParam prod : products) {
                 List<Sku> skuList = prod.getSkuList();
                 int firstRow = row + 1;
@@ -429,7 +453,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                 mergeIfNeed(writer, firstRow, lastRow, ++col, col, prod.getBrief());
                 Product.DeliveryModeVO deliveryModeVO = Json.parseObject(prod.getDeliveryMode(), Product.DeliveryModeVO.class);
                 StringBuilder deliveryMode = new StringBuilder();
-                if(deliveryModeVO != null) {
+                if (deliveryModeVO != null) {
                     if (deliveryModeVO.getHasCityDelivery() != null && deliveryModeVO.getHasCityDelivery()) {
                         deliveryMode.append("同城配送，");
                     }
@@ -482,193 +506,197 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
 
     @Override
     public void downloadModel(HttpServletResponse response, Long shopId) {
-        createExcel(null,response,shopId);
+        createExcel(null, response, shopId);
     }
 
     @Override
     public Object parseFile(MultipartFile file, Long shopId) throws Exception {
-        //读取工作簿
-        Workbook workBook = WorkbookFactory.create(file.getInputStream());
-        //读取工作表
-        Sheet sheet = workBook.getSheetAt(0);
-        int rowNumber = sheet.getPhysicalNumberOfRows();
-
-        //校验是否填写内容
-        if (rowNumber <= 2) {
-            throw new GlobalException("文件无内容！");
-        }
-        // * 2.1不是Excel文件，直接返回提示信息
-        if (!(file.getOriginalFilename().contains("xls") || file.getOriginalFilename().contains("xlsx"))) {
-            // 格式错误
-            throw  new YamiShopBindException("文件格式错误");
-        }
-
-        //TODO 如果三级分类需要获取最底层的分类
-        // 获取平台分类map
-        List<Category> categories = categoryService.list(new LambdaQueryWrapper<Category>()
-                .eq(Category::getShopId,0).eq(Category::getGrade,2));
-        // 如果重复的key取最后一个的值
-        Map<String, Long> categoryMap = categories.stream().collect(Collectors.toMap(Category::getCategoryName, Category::getCategoryId,(key1 , key2)-> key2));
-
-        // 获取店铺分类map
-        List<Category> shopCategories = categoryService.listByShopId(shopId);
-        // 如果重复的key取最后一个的值
-        Map<String, Long> shopCategoryMap = shopCategories.stream().collect(Collectors.toMap(Category::getCategoryName, Category::getCategoryId,(key1 , key2)-> key2));
-
-        // 获取品牌map
-        List<Brand> brands = brandService.list(new LambdaQueryWrapper<Brand>().eq(Brand::getStatus, 1));
-        Map<String, Long> brandMap = brands.stream().collect(Collectors.toMap(Brand::getBrandName, Brand::getBrandId,(key1 , key2)-> key2));
-
-        // 获取运费模板map
-        List<TransportParam> transportParams = new ArrayList<>();
-        applicationContext.publishEvent(new GetTransportNamesEvent(transportParams,shopId));
-        Map<String, Long> transportMap = transportParams.stream().collect(Collectors.toMap(TransportParam::getTransName, TransportParam::getTransportId,(key1 , key2)-> key2));
-
-        List<Product> products = new ArrayList<>();
-        List<Sku> skuList = new ArrayList<>();
-        Date date = new Date();
-        Integer totalStocks = 0;
-        double price = 0.0;
-        double oriPrice = 0.0;
-        Integer scorePrice = 0;
-        int insertRows = 0;
-        Product product = new Product();
-        //循环读取每一行数据并校验
-        for (int i = 2; i < rowNumber; i++) {
-            try {
-                //读取行
-                Row row = sheet.getRow(i);
-//                String[] hearder = { "产品名称", "平台分类", "店铺分类", "所属品牌", "产品卖点", "配送方式","运费设置",
+        return null;
+    }
+//    @Override
+//    public Object parseFile(MultipartFile file, Long shopId) throws Exception {
+//        //读取工作簿
+//        Workbook workBook = WorkbookFactory.create(file.getInputStream());
+//        //读取工作表
+//        Sheet sheet = workBook.getSheetAt(0);
+//        int rowNumber = sheet.getPhysicalNumberOfRows();
+//
+//        //校验是否填写内容
+//        if (rowNumber <= 2) {
+//            throw new GlobalException("文件无内容！");
+//        }
+//        // * 2.1不是Excel文件，直接返回提示信息
+//        if (!(file.getOriginalFilename().contains("xls") || file.getOriginalFilename().contains("xlsx"))) {
+//            // 格式错误
+//            throw  new YamiShopBindException("文件格式错误");
+//        }
+//
+//        //TODO 如果三级分类需要获取最底层的分类
+//        // 获取平台分类map
+//        List<Category> categories = categoryService.list(new LambdaQueryWrapper<Category>()
+//                .eq(Category::getShopId,0).eq(Category::getGrade,2));
+//        // 如果重复的key取最后一个的值
+//        Map<String, Long> categoryMap = categories.stream().collect(Collectors.toMap(Category::getCategoryName, Category::getCategoryId,(key1 , key2)-> key2));
+//
+//        // 获取店铺分类map
+//        List<Category> shopCategories = categoryService.listByShopId(shopId);
+//        // 如果重复的key取最后一个的值
+//        Map<String, Long> shopCategoryMap = shopCategories.stream().collect(Collectors.toMap(Category::getCategoryName, Category::getCategoryId,(key1 , key2)-> key2));
+//
+//        // 获取品牌map
+//        List<Brand> brands = brandService.list(new LambdaQueryWrapper<Brand>().eq(Brand::getStatus, 1));
+//        Map<String, Long> brandMap = brands.stream().collect(Collectors.toMap(Brand::getBrandName, Brand::getBrandId,(key1 , key2)-> key2));
+//
+//        // 获取运费模板map
+//        List<TransportParam> transportParams = new ArrayList<>();
+//        applicationContext.publishEvent(new GetTransportNamesEvent(transportParams,shopId));
+//        Map<String, Long> transportMap = transportParams.stream().collect(Collectors.toMap(TransportParam::getTransName, TransportParam::getTransportId,(key1 , key2)-> key2));
+//
+//        List<Product> products = new ArrayList<>();
+//        List<Sku> skuList = new ArrayList<>();
+//        Date date = new Date();
+//        Integer totalStocks = 0;
+//        double price = 0.0;
+//        double oriPrice = 0.0;
+//        Integer scorePrice = 0;
+//        int insertRows = 0;
+//        Product product = new Product();
+//        //循环读取每一行数据并校验
+//        for (int i = 2; i < rowNumber; i++) {
+//            try {
+//                //读取行
+//                Row row = sheet.getRow(i);
+////                String[] hearder = { "产品名称", "平台分类", "店铺分类", "所属品牌", "产品卖点", "配送方式","运费设置",
+////                        "规格名称","商品名称", "销售属性组合字符串 格式是p1:v1;p2:v2", "原价", "价格", "积分价格",
+////                        "库存","商家编码","商品条形码" ,"商品重量", "商品体积","产品状态"};
+//                String prodName = Objects.isNull(row.getCell(0))? "":row.getCell(0).getStringCellValue();
+//                String category = Objects.isNull(row.getCell(1))? "":row.getCell(1).getStringCellValue();
+//                String  shopCategory = Objects.isNull(row.getCell(2))? "":row.getCell(2).getStringCellValue();
+//                String brandName = Objects.isNull(row.getCell(3))? "":row.getCell(3).getStringCellValue();
+//                String brif = Objects.isNull(row.getCell(4))? "":row.getCell(4).getStringCellValue();
+//                String dvyType = Objects.isNull(row.getCell(5))? "":row.getCell(5).getStringCellValue();
+//                String transportName = Objects.isNull(row.getCell(6))? "":row.getCell(6).getStringCellValue();
+//                String statusStr = Objects.isNull(row.getCell(7))? "":row.getCell(7).getStringCellValue();
+//                if(StrUtil.isNotBlank(prodName) || !PoiExcelUtil.isMergedRegion(sheet,i,0)) {
+//                    skuList = new ArrayList<>();
+//                    product = new Product();
+//                    totalStocks = 0;
+//                    oriPrice = 0.0;
+//                    scorePrice = 0;
+//                    price = 0.0;
+//                    insertRows++;
+//                    product.setShopId(shopId);
+//                    product.setProdName(prodName);
+//                    product.setCategoryId(categoryMap.get(category));
+//                    product.setShopCategoryId(shopCategoryMap.get(shopCategory));
+//                    product.setBrandId(brandMap.get(brandName));
+//                    product.setBrief(brif);
+//                    product.setDeliveryMode(getDvyType(dvyType));
+//                    product.setDeliveryTemplateId(transportMap.get(transportName));
+//                    //TODO 差商品的图片
+//                    product.setStatus(Objects.equals(statusStr, "上架") ? ProdStatusEnums.NORMAL.getValue() : ProdStatusEnums.SHOP_OFFLINE.getValue());
+//                    product.setPutawayTime(Objects.equals(statusStr, "上架") ? date : null);
+//                    product.setCreateTime(date);
+//                    product.setUpdateTime(date);
+//                    product.setVersion(0);
+//                    // 商品销量设置为0
+//                    product.setSoldNum(0);
+//                    product.setProdType(ProdType.PROD_TYPE_NORMAL.value());
+//                    product.setActivityId(0L);
+//                    product.setPic("2020/07/f29c335ff19746cda1025f363dcc00cf.png");
+//                    product.setImgs("2020/07/f29c335ff19746cda1025f363dcc00cf.png");
+//
+//                    products.add(product);
+//                }
+//                String[] hearder = { "产品名称", "平台分类", "店铺分类", "所属品牌", "产品卖点", "配送方式","运费设置","产品状态",
 //                        "规格名称","商品名称", "销售属性组合字符串 格式是p1:v1;p2:v2", "原价", "价格", "积分价格",
-//                        "库存","商家编码","商品条形码" ,"商品重量", "商品体积","产品状态"};
-                String prodName = Objects.isNull(row.getCell(0))? "":row.getCell(0).getStringCellValue();
-                String category = Objects.isNull(row.getCell(1))? "":row.getCell(1).getStringCellValue();
-                String  shopCategory = Objects.isNull(row.getCell(2))? "":row.getCell(2).getStringCellValue();
-                String brandName = Objects.isNull(row.getCell(3))? "":row.getCell(3).getStringCellValue();
-                String brif = Objects.isNull(row.getCell(4))? "":row.getCell(4).getStringCellValue();
-                String dvyType = Objects.isNull(row.getCell(5))? "":row.getCell(5).getStringCellValue();
-                String transportName = Objects.isNull(row.getCell(6))? "":row.getCell(6).getStringCellValue();
-                String statusStr = Objects.isNull(row.getCell(7))? "":row.getCell(7).getStringCellValue();
-                if(StrUtil.isNotBlank(prodName) || !PoiExcelUtil.isMergedRegion(sheet,i,0)) {
-                    skuList = new ArrayList<>();
-                    product = new Product();
-                    totalStocks = 0;
-                    oriPrice = 0.0;
-                    scorePrice = 0;
-                    price = 0.0;
-                    insertRows++;
-                    product.setShopId(shopId);
-                    product.setProdName(prodName);
-                    product.setCategoryId(categoryMap.get(category));
-                    product.setShopCategoryId(shopCategoryMap.get(shopCategory));
-                    product.setBrandId(brandMap.get(brandName));
-                    product.setBrief(brif);
-                    product.setDeliveryMode(getDvyType(dvyType));
-                    product.setDeliveryTemplateId(transportMap.get(transportName));
-                    //TODO 差商品的图片
-                    product.setStatus(Objects.equals(statusStr, "上架") ? ProdStatusEnums.NORMAL.getValue() : ProdStatusEnums.SHOP_OFFLINE.getValue());
-                    product.setPutawayTime(Objects.equals(statusStr, "上架") ? date : null);
-                    product.setCreateTime(date);
-                    product.setUpdateTime(date);
-                    product.setVersion(0);
-                    // 商品销量设置为0
-                    product.setSoldNum(0);
-                    product.setProdType(ProdType.PROD_TYPE_NORMAL.value());
-                    product.setActivityId(0L);
-                    product.setPic("2020/07/f29c335ff19746cda1025f363dcc00cf.png");
-                    product.setImgs("2020/07/f29c335ff19746cda1025f363dcc00cf.png");
-
-                    products.add(product);
-                }
-                String[] hearder = { "产品名称", "平台分类", "店铺分类", "所属品牌", "产品卖点", "配送方式","运费设置","产品状态",
-                        "规格名称","商品名称", "销售属性组合字符串 格式是p1:v1;p2:v2", "原价", "价格", "积分价格",
-                        "库存","商家编码","商品条形码" ,"商品重量", "商品体积"};
-                String  skuName = Objects.isNull(row.getCell(8))? "":row.getCell(8).getStringCellValue();
-                String skuProdName = Objects.isNull(row.getCell(9))? "":row.getCell(9).getStringCellValue();
-                String  properties = Objects.isNull(row.getCell(10))? "":row.getCell(10).getStringCellValue();
-                double skuOriPrice = Objects.isNull(row.getCell(11))? 0.0:row.getCell(11).getNumericCellValue();
-                double skuPrice = Objects.isNull(row.getCell(12))? 0.0:row.getCell(12).getNumericCellValue();
-                Integer skuScorePrice = Integer.valueOf(StrUtil.isBlank(row.getCell(13).getStringCellValue())? "0":row.getCell(13).getStringCellValue());
-                Integer stocks = Objects.isNull(row.getCell(14))? 0:(int)(row.getCell(14).getNumericCellValue());
-                String partyCode = "";
-                if(Objects.nonNull(row.getCell(15))) {
-                    row.getCell(15).setCellType(CellType.STRING);
-                    partyCode  = row.getCell(15).getStringCellValue();
-                }
-                String modelId = "";
-                if(Objects.nonNull(row.getCell(15))) {
-                    row.getCell(16).setCellType(CellType.STRING);
-                    modelId  = row.getCell(15).getStringCellValue();
-                }
-                double weight = Objects.isNull(row.getCell(17))? 0.0:row.getCell(17).getNumericCellValue();
-                double volume = Objects.isNull(row.getCell(18))? 0.0:row.getCell(18).getNumericCellValue();
-                oriPrice = Objects.equals(oriPrice ,0.0) ? skuOriPrice:oriPrice;
-                price = Objects.equals(price ,0.0) ? skuPrice:price;
-
-                Sku sku = new Sku();
-                sku.setSkuName(skuName);
-                sku.setProdName(skuProdName);
-                sku.setProperties(properties);
-                sku.setOriPrice(skuOriPrice);
-                sku.setPrice(skuPrice);
-                sku.setStocks(stocks);
-                sku.setSkuScore(skuScorePrice);
-                sku.setModelId(modelId);
-                sku.setPartyCode(partyCode);
-                sku.setVolume(volume);
-                sku.setUpdateTime(date);
-                sku.setWeight(weight);
-                sku.setVersion(1);
-                sku.setIsDelete(0);
-                sku.setStatus(1);
-                skuList.add(sku);
-                // 如果prodName为空并且为合并行则为一个prod
-                totalStocks += stocks;
-                if(price > skuPrice) {
-                    oriPrice = skuOriPrice;
-                    price = skuPrice;
-                    scorePrice = skuScorePrice;
-                }
-                product.setOriPrice(oriPrice);
-                product.setScorePrice(scorePrice);
-                product.setPrice(price);
-                product.setTotalStocks(totalStocks);
-                product.setSkuList(skuList);
-            } catch (Exception e) {
-                //错误信息提示
-                System.out.println("第" + (i + 1) + "行数据有错误," + e.getMessage());
-            }
-        }
-        workBook.close();
-        //不为空批量导入
-        if(CollectionUtils.isNotEmpty(products)){
-            saveBatch(products);
-//            List<Sku> skuDb = new ArrayList<>();
-            for (Product productDb : products) {
-                List<Sku> skus = productDb.getSkuList();
-                skuMapper.insertBatch(productDb.getProdId(),skus);
-//                skus.forEach(sku -> sku.setProdId(product.getProdId()));
-//                skuDb.addAll(skus);
-            }
-//            skuMapper.save(skuDb);
-                return "检查到" + insertRows + "条商品，成功导入" + products.size() + "条卡密！";
-            }
-        return "数据错误!导入0条";
-    }
+//                        "库存","商家编码","商品条形码" ,"商品重量", "商品体积"};
+//                String  skuName = Objects.isNull(row.getCell(8))? "":row.getCell(8).getStringCellValue();
+//                String skuProdName = Objects.isNull(row.getCell(9))? "":row.getCell(9).getStringCellValue();
+//                String  properties = Objects.isNull(row.getCell(10))? "":row.getCell(10).getStringCellValue();
+//                double skuOriPrice = Objects.isNull(row.getCell(11))? 0.0:row.getCell(11).getNumericCellValue();
+//                double skuPrice = Objects.isNull(row.getCell(12))? 0.0:row.getCell(12).getNumericCellValue();
+//                Integer skuScorePrice = Integer.valueOf(StrUtil.isBlank(row.getCell(13).getStringCellValue())? "0":row.getCell(13).getStringCellValue());
+//                Integer stocks = Objects.isNull(row.getCell(14))? 0:(int)(row.getCell(14).getNumericCellValue());
+//                String partyCode = "";
+//                if(Objects.nonNull(row.getCell(15))) {
+//                    row.getCell(15).setCellType(CellType.STRING);
+//                    partyCode  = row.getCell(15).getStringCellValue();
+//                }
+//                String modelId = "";
+//                if(Objects.nonNull(row.getCell(15))) {
+//                    row.getCell(16).setCellType(CellType.STRING);
+//                    modelId  = row.getCell(15).getStringCellValue();
+//                }
+//                double weight = Objects.isNull(row.getCell(17))? 0.0:row.getCell(17).getNumericCellValue();
+//                double volume = Objects.isNull(row.getCell(18))? 0.0:row.getCell(18).getNumericCellValue();
+//                oriPrice = Objects.equals(oriPrice ,0.0) ? skuOriPrice:oriPrice;
+//                price = Objects.equals(price ,0.0) ? skuPrice:price;
+//
+//                Sku sku = new Sku();
+//                sku.setSkuName(skuName);
+//                sku.setProdName(skuProdName);
+//                sku.setProperties(properties);
+//                sku.setOriPrice(skuOriPrice);
+//                sku.setPrice(skuPrice);
+//                sku.setStocks(stocks);
+//                sku.setSkuScore(skuScorePrice);
+//                sku.setModelId(modelId);
+//                sku.setPartyCode(partyCode);
+//                sku.setVolume(volume);
+//                sku.setUpdateTime(date);
+//                sku.setWeight(weight);
+//                sku.setVersion(1);
+//                sku.setIsDelete(0);
+//                sku.setStatus(1);
+//                skuList.add(sku);
+//                // 如果prodName为空并且为合并行则为一个prod
+//                totalStocks += stocks;
+//                if(price > skuPrice) {
+//                    oriPrice = skuOriPrice;
+//                    price = skuPrice;
+//                    scorePrice = skuScorePrice;
+//                }
+//                product.setOriPrice(oriPrice);
+//                product.setScorePrice(scorePrice);
+//                product.setPrice(price);
+//                product.setTotalStocks(totalStocks);
+//                product.setSkuList(skuList);
+//            } catch (Exception e) {
+//                //错误信息提示
+//                System.out.println("第" + (i + 1) + "行数据有错误," + e.getMessage());
+//            }
+//        }
+//        workBook.close();
+//        //不为空批量导入
+//        if(CollectionUtils.isNotEmpty(products)){
+//            saveBatch(products);
+////            List<Sku> skuDb = new ArrayList<>();
+//            for (Product productDb : products) {
+//                List<Sku> skus = productDb.getSkuList();
+//                skuMapper.insertBatch(productDb.getProdId(),skus);
+////                skus.forEach(sku -> sku.setProdId(product.getProdId()));
+////                skuDb.addAll(skus);
+//            }
+////            skuMapper.save(skuDb);
+//                return "检查到" + insertRows + "条商品，成功导入" + products.size() + "条卡密！";
+//            }
+//        return "数据错误!导入0条";
+//    }
 
     @Override
     public IPage<Product> pageProducts(PageParam<Product> page, ProductParam product) {
-        return productMapper.pageProducts(page,product);
+        return productMapper.pageProducts(page, product);
     }
 
     @Override
     public IPage<Product> listRelatedProducts(ListRelatedProductsDto listRelatedProductsDto) {
         IPage<Product> products = null;
-        if(null == listRelatedProductsDto.getProdName()){
+        if (null == listRelatedProductsDto.getProdName()) {
             products = page(new Page<>(listRelatedProductsDto.getCurrent(), listRelatedProductsDto.getSize()), new LambdaQueryWrapper<Product>()
                     .eq(Product::getShopCategoryId, listRelatedProductsDto.getShopCategoryId())
                     .orderByDesc(Product::getCreateTime));
-        }else {
+        } else {
             products = page(new Page<>(listRelatedProductsDto.getCurrent(), listRelatedProductsDto.getSize()), new LambdaQueryWrapper<Product>()
                     .eq(Product::getShopCategoryId, listRelatedProductsDto.getShopCategoryId())
                     .orderByDesc(Product::getCreateTime)
@@ -699,24 +727,25 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
             if (product != null) {
                 product.setShopCategoryId(shopCategoryId);
                 productMapper.updateById(product);
-            }else {
+            } else {
                 throw new GlobalException("关联失败！");
-            }});
+            }
+        });
         return true;
     }
 
     @Override
     public IPage<Product> listUnRelatedProducts(ListUnRelatedProductsDTO listUnRelatedProductsDTO) {
         IPage<Product> products = null;
-        if(null == listUnRelatedProductsDTO.getProdName()){
+        if (null == listUnRelatedProductsDTO.getProdName()) {
             products = page(new Page<>(listUnRelatedProductsDTO.getCurrent(), listUnRelatedProductsDTO.getSize()), new LambdaQueryWrapper<Product>()
                     .eq(Product::getShopId, listUnRelatedProductsDTO.getShopId())
-                    .eq(Product::getShopCategoryId,0)
+                    .eq(Product::getShopCategoryId, 0)
                     .orderByDesc(Product::getCreateTime));
-        }else {
+        } else {
             products = page(new Page<>(listUnRelatedProductsDTO.getCurrent(), listUnRelatedProductsDTO.getSize()), new LambdaQueryWrapper<Product>()
                     .eq(Product::getShopId, listUnRelatedProductsDTO.getShopId())
-                    .eq(Product::getShopCategoryId,0)
+                    .eq(Product::getShopCategoryId, 0)
                     .orderByDesc(Product::getCreateTime)
                     .like(Product::getProdName, listUnRelatedProductsDTO.getProdName()));
         }
@@ -727,7 +756,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     public IPage<Product> listProdByCategoryIdAndShopId(ProdByCategoryIdAndShopIdDTO prodByCategoryIdAndShopIdDTO) {
         IPage<Product> productIPage = productMapper.listProdByCategoryIdAndShopId(new Page<>(prodByCategoryIdAndShopIdDTO.getCurrent(), prodByCategoryIdAndShopIdDTO.getSize()),
                 prodByCategoryIdAndShopIdDTO);
-        if(productIPage.getRecords().isEmpty()){
+        if (productIPage.getRecords().isEmpty()) {
             productIPage = productMapper.listProdByCategoryIdAndShopId2(new Page<>(prodByCategoryIdAndShopIdDTO.getCurrent(), prodByCategoryIdAndShopIdDTO.getSize()),
                     prodByCategoryIdAndShopIdDTO);
         }
@@ -746,13 +775,13 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         mode.setHasUserPickUp(false);
         mode.setHasCityDelivery(false);
         for (String str : split) {
-            if(StrUtil.equals(str,"商家邮寄")){
+            if (StrUtil.equals(str, "商家邮寄")) {
                 mode.setHasShopDelivery(true);
             }
-            if(StrUtil.equals(str,"用户自提")){
+            if (StrUtil.equals(str, "用户自提")) {
                 mode.setHasUserPickUp(true);
             }
-            if(StrUtil.equals(str,"同城配送")){
+            if (StrUtil.equals(str, "同城配送")) {
                 mode.setHasCityDelivery(true);
             }
         }
@@ -799,6 +828,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         }
 
     }
+
     private void writeExcel(HttpServletResponse response, ExcelWriter writer) {
         //response为HttpServletResponse对象
         response.setContentType("application/vnd.ms-excel;charset=utf-8");

yami-shop-service/src/main/java/com/yami/shop/service/impl/QnhServiceImpl.java

@@ -1,4 +1,5 @@
 package com.yami.shop.service.impl;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yami.shop.bean.app.param.QnhPushParam;
@@ -24,7 +25,7 @@ import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.dao.ShopDetailMapper;
 import com.yami.shop.service.*;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -43,7 +44,7 @@ import java.util.stream.IntStream;
  * @author wy
  */
 @Service
-@Log4j2
+@Slf4j
 public class QnhServiceImpl implements IQnhService {
     //测试
 //    private static final String APP_ID = "101151";
@@ -110,12 +111,12 @@ public class QnhServiceImpl implements IQnhService {
                 .requestParam(JSON.toJSONString(body))
                 .result(result.toJSONString())
                 .createTime(LocalDateTime.now()).build());
-         if (result.getBoolean("result")) {
+        if (result.getBoolean("result")) {
             JSONArray resultList = result.getJSONArray("resultList");
             List<StoreListVo> storeListVos = JSONObject.parseArray(JSONArray.toJSONString(resultList), StoreListVo.class);
             return storeListVos;
         } else {
-             throw new GlobalException(result.getString("msg"));
+            throw new GlobalException(result.getString("msg"));
         }
     }
 
@@ -151,14 +152,15 @@ public class QnhServiceImpl implements IQnhService {
     }
 
     @Override
-    public boolean getSkuStock(String skuCode,Long prodId) {
+    public boolean getSkuStock(String skuCode, Long prodId) {
         Sku one1 = skuService.getOne(Wrappers.<Sku>lambdaQuery().eq(Sku::getSkuCode, skuCode).eq(Sku::getProdId, prodId));
         Map<String, Object> body = bulidMap();
-        if(null == one1) throw new GlobalException("请重新选择规格，该规格不存在！");
-        ShopDetail shopDetail = shopDetailMapper.selectById(productService.getById(prodId).getShopId());
+        if (null == one1) throw new GlobalException("请重新选择规格，该规格不存在！");
+        Product byId = productService.getById(prodId, 1);
+        ShopDetail shopDetail = shopDetailMapper.selectById(byId.getShopId());
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("page_no", 1);
-        if(ObjectUtils.isNotEmpty(shopDetail)){
+        if (ObjectUtils.isNotEmpty(shopDetail)) {
             jsonObject.put("poi_code", shopDetail.getThirdPartyCode());
         }
         jsonObject.put("sku_code", skuCode);
@@ -185,6 +187,46 @@ public class QnhServiceImpl implements IQnhService {
         }
     }
 
+    @Override
+    public boolean getSkuStock(String skuCode, Long prodId, Integer platform) {
+        Sku one1 = skuService.getOne(Wrappers.<Sku>lambdaQuery().eq(Sku::getSkuCode, skuCode).eq(Sku::getProdId, prodId));
+        Map<String, Object> body = bulidMap();
+        if (null == one1) throw new GlobalException("请重新选择规格，该规格不存在！");
+        Product byId = productService.getById(prodId, platform);
+        ShopDetail shopDetail = shopDetailMapper.selectById(byId.getShopId());
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("page_no", 1);
+        if (ObjectUtils.isNotEmpty(shopDetail)) {
+            jsonObject.put("poi_code", shopDetail.getThirdPartyCode());
+        }
+        jsonObject.put("sku_code", skuCode);
+        jsonObject.put("page_size", 50);
+        //TODO wangjian 原先查询牵牛花的库存，现在需要替换成海博的
+        one1.setStocks(99);
+        one1.setActualStocks(99);
+        return Boolean.TRUE;
+//        HttpResponse execute = getExecute(body, jsonObject, GET_SKU_STOCK);
+//        JSONObject result = JSONObject.parseObject(execute.body());
+//        requestLogService.addLog(RequestLog.builder()
+//                .resource("qnh")
+//                .requestMethod("getSkuStock")
+//                .requestParam(JSON.toJSONString(body))
+//                .result(result.toJSONString())
+//                .createTime(LocalDateTime.now()).build());
+//        if (result.get("data") != null) {
+//            JSONArray resultList = result.getJSONArray("data");
+//            resultList.forEach(rowData -> {
+//                JSONObject jsonObject1 = JSONObject.parseObject(rowData.toString());
+//                one1.setStocks(jsonObject1.getBigDecimal("available_stock").intValue());
+//                one1.setActualStocks(jsonObject1.getBigDecimal("available_stock").intValue());
+//                skuService.updateById(one1);
+//            });
+//            return true;
+//        } else {
+//            throw new GlobalException(result.getString("msg"));
+//        }
+    }
+
     private HttpResponse getExecute(Map<String, Object> body, JSONObject jsonObject, String url) {
         body.put("data", jsonObject);
         body.put("sign", generateSignature(body));
@@ -570,7 +612,7 @@ public class QnhServiceImpl implements IQnhService {
     public Map<String, Object> bulidMap() {
         Map<String, Object> body = new HashMap<>();
         body.put("appid", APP_ID);
-        body.put("timestamp", (System.currentTimeMillis() /1000));
+        body.put("timestamp", (System.currentTimeMillis() / 1000));
         body.put("qid", UUID.randomUUID().toString());
         body.put("version", "2.3");
         return body;
@@ -585,7 +627,7 @@ public class QnhServiceImpl implements IQnhService {
             if (Objects.isNull(data.get(item))) {
                 continue;
             }
-            if(!data.get(item).toString().trim().isEmpty()) {
+            if (!data.get(item).toString().trim().isEmpty()) {
                 sb.append(item).append("=").append(data.get(item).toString().trim()).append("&");
             }
         }
@@ -663,7 +705,7 @@ public class QnhServiceImpl implements IQnhService {
 
     /**
      * 从牵牛花同步商家信息-》商品信息-》sku信息
-     * */
+     */
     public void synchronizedInfo() {
         StoreDto dto = new StoreDto();
         Map<String, Object> body = bulidMap();
@@ -700,7 +742,7 @@ public class QnhServiceImpl implements IQnhService {
                             .setCity(storeListVo.getCity())
                             .setShopName(storeListVo.getName());
                     shopDetailMapper.insert(detail);
-                }else {
+                } else {
                     shopDetail.setShopAddress(storeListVo.getAddress())
                             .setCity(storeListVo.getCity())
                             .setShopName(storeListVo.getName());
@@ -721,6 +763,7 @@ public class QnhServiceImpl implements IQnhService {
                 .result(JSON.toJSONString(object))
                 .createTime(LocalDateTime.now()).build());
     }
+
     public void synchronizedInfo1(String code) {
         List<StoreListVo> storeListVoList = getStores(new StoreDto());
         if (CollectionUtil.isNotEmpty(storeListVoList)) {
@@ -920,7 +963,7 @@ public class QnhServiceImpl implements IQnhService {
                 return info;
             }
         }
-        if(channelItems.isEmpty()){
+        if (channelItems.isEmpty()) {
             return null;
         }
         return channelItems.get(0);

yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopCategoryServiceImpl.java

@@ -157,6 +157,7 @@ public class ShopCategoryServiceImpl extends ServiceImpl<ShopCategoryMapper, Sho
             category.setPic(sc.getPic());
             category.setSeq(sc.getNum());
             category.setGrade(sc.getLevel());
+            category.setLabel(sc.getLabel());
             return category;
         }).collect(Collectors.toList());
         res.setRecords(categories);

yami-shop-service/src/main/java/com/yami/shop/service/impl/SkuServiceImpl.java

@@ -39,13 +39,11 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
     }
 
     @Override
-    @Cacheable(cacheNames = "listByProdIdAndPlatform", key = "#prodId")
     public List<Sku> listByProdId(Long prodId, Integer platform, Long shopId) {
         return skuMapper.listByProdIdAndPlatform(prodId, platform, shopId);
     }
 
     @Override
-    @Cacheable(cacheNames = "sku", key = "#skuId")
     public Sku getSkuBySkuId(Long skuId) {
         return skuMapper.selectById(skuId);
     }

yami-shop-service/src/main/resources/mapper/ProductMapper.xml

@@ -128,6 +128,47 @@
         select * from tz_prod where prod_name = #{prodName} and shop_id = #{shopId}
     </select>
 
+    <select id="doGetById" resultType="com.yami.shop.bean.model.Product">
+        SELECT
+            tp.prod_id,
+            tp.prod_name,
+            tcs.shop_id AS shop_id,  -- 使用tcs.shop_id覆盖默认shop_id
+            tp.brand_id,
+            tp.brand_name,
+            tp.ori_price,
+            tp.price,
+            tp.score_price,
+            tp.brief,
+            tp.video,
+            tp.pic,
+            tp.content,
+            tp.imgs,
+            tp.status,
+            tp.is_delete,
+            tp.shop_category_id,
+            tp.category_id,
+            tp.hb_front_category_id,
+            tp.sold_num,
+            tp.total_stocks,
+            tp.delivery_mode,
+            tp.delivery_template_id,
+            tp.create_time,
+            tp.update_time,
+            tp.putaway_time,
+            tp.version,
+            tp.prod_type,
+            tp.activity_id,
+            tp.sup_id,
+            tp.hb_spu_id,
+            tp.hb_status
+        FROM tz_prod AS tp
+                 LEFT JOIN tz_shop_sku AS tss ON tp.prod_id = tss.spu_id
+                 LEFT JOIN tz_channel_shop AS tcs ON tss.shop_id = tcs.shop_id
+        WHERE tp.prod_id = #{prodId}
+          AND tcs.channel_id = #{platform}
+        GROUP BY tcs.shop_id;
+    </select>
+
 
     <update id="returnStock">
         <foreach collection="prodCollect" item="changeStocks" index="prodId" separator=";">
@@ -552,9 +593,12 @@
         any_value(p.prod_id) as prod_id,
         any_value(p.imgs) as pic,
         any_value(p.prod_name) as prod_name,
-        any_value(p.price) as price,
+        any_value(tss.shop_sku_price) as price,
         any_value(p.brief) as brief,
         any_value ( tss.shop_id ) AS shopId,
+        any_value ( tss.self_label_id ) AS selfLabelId,
+        any_value ( tss.return_label_id ) AS returnLabelId,
+        any_value ( tss.hot_label_id ) AS hotLabelId,
         count(pc.prod_comm_id) as prod_comm_number,
         count( CASE WHEN evaluate = 0 THEN prod_comm_id ELSE null END ) AS praise_number,
         (6371 * acos(cos(radians(#{searchParam.lat})) * cos(radians(shop_lat)) * cos(radians(shop_lng) -

yami-shop-user/yami-shop-user-multishop/src/main/java/com/yami/shop/user/multishop/listener/OrderRefundListener.java

@@ -8,6 +8,7 @@ import com.yami.shop.bean.event.OrderRefundSuccessEvent;
 import com.yami.shop.bean.model.Order;
 import com.yami.shop.bean.model.OrderItem;
 import com.yami.shop.bean.model.UserExtension;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.service.OrderService;
 import com.yami.shop.service.UserExtensionService;