解决海博添加商品问题

yami-shop-bean/src/main/java/com/yami/shop/bean/vo/ProductPageVO.java

@@ -1,6 +1,7 @@
 package com.yami.shop.bean.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yami.shop.bean.model.Sku;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -46,7 +47,10 @@ public class ProductPageVO {
      * 商品名称
      */
     private String prodName;
-
+    /**
+     * 商品规格名称
+     */
+    private String skuName;
     /**
      * 业务类型
      */
@@ -86,6 +90,10 @@ public class ProductPageVO {
      */
     private List<ProdChannelVO> channelVOS;
 
+    /**
+     * 商品信息
+     */
+    private Sku sku;
     /**
      * 价格
      */

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

@@ -262,6 +262,7 @@ public class ChannelProdServiceImpl extends ServiceImpl<ChannelProdMapper, Chann
                 channelProd.setDeliveryPrice(importVO.getDeliveryPrice());
                 channelProd.setChannelProdPrice(importVO.getChannelProdPrice());
                 channelProd.setRecTime(new Date());
+                channelProd.setUpdateTime(new Date());
 
                 //检查门店是否存在
                 ShopDetail shopDetail = shopDetailMapper.selectOne(new LambdaQueryWrapper<ShopDetail>().eq(ShopDetail::getShopName, importVO.getShopName()));
@@ -325,6 +326,8 @@ public class ChannelProdServiceImpl extends ServiceImpl<ChannelProdMapper, Chann
                 channelProd.setDeliveryPrice(updateShannerProdDTO.getDeliveryPrice());
                 channelProd.setChannelProdPrice(setChannelPriceDto.getChannelProdPrice());
                 channelProd.setRecTime(new Date());
+                channelProd.setIsDelete(0);
+                channelProd.setUpdateTime(new Date());
                 channelProdMapper.insert(channelProd);
 
                 //检查门店是否已存在
@@ -337,6 +340,7 @@ public class ChannelProdServiceImpl extends ServiceImpl<ChannelProdMapper, Chann
                     channelShop.setIsDelete(0);
                     channelShop.setChannelId(setChannelPriceDto.getChannelId());
                     channelShop.setShopId(updateShannerProdDTO.getShopId());
+                    channelProd.setUpdateTime(new Date());
                     channelShopMapper.insert(channelShop);
                     log.info("添加渠道门店关联数据成功");
                 }

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

@@ -42,6 +42,7 @@ public class ShopSkuServiceImpl extends ServiceImpl<ShopSkuMapper, ShopSku> impl
         IPage<ProductPageVO> page1 = shopProdMapper.selectShopSkuPage(page, query);
         //循环获取sku和渠道价格设置信息
         for (ProductPageVO record : page1.getRecords()) {
+            record.setSku(skuMapper.selectById(record.getSkuId()));
             List<ProdChannelVO>  channelProds = channelProdMapper.selectListAll(record.getSkuId(), record.getShopId());
             record.setChannelVOS(channelProds);
             if (channelProds != null && channelProds.size() > 0){
@@ -50,7 +51,7 @@ public class ShopSkuServiceImpl extends ServiceImpl<ShopSkuMapper, ShopSku> impl
                         .map(ProdChannelVO::getUpdateTime)  // 假设ProdChannelVO有getUpdateTime方法
                         .filter(Objects::nonNull)           // 过滤掉空值
                         .max(Date::compareTo)               // 找出最大的日期
-                        .orElse(null);                      // 如果没有找到，返回null
+                        .orElse(null);                // 如果没有找到，返回null
 
                 record.setUpdateTime(maxUpdateTime);
             }

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

@@ -36,6 +36,7 @@
         sku.prod_id spuId,
         sku.hb_spu_id,
         sku.pic,
+        sku.sku_name AS skuName,
         a.prod_name,
         a.channel_code,
         sku.hb_sku_id,