超市在线商城-1

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/OnlineShopVo.java

@@ -0,0 +1,76 @@
+package com.bsd.pjcloud.supermarket.vo;
+
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+
+/**
+ * 在线商城 商品数据
+ */
+@Data
+public class OnlineShopVo {
+
+
+    private Long categoryId;
+
+    private String categoryName;
+
+    private List<SmSpuVo> smSpuVos;
+
+    @Data
+    class SmSpuVo {
+        /**
+         * 线上SPU 编号，自增
+         */
+        @Schema(description="线上SPU 编号，自增")
+        private Long id;
+
+        /**
+         * 库存商品id
+         */
+        @Schema(description="库存商品id")
+        private Long erpSpuId;
+
+        /**
+         * 商品详情
+         */
+        @Schema(description="商品详情")
+        private String description;
+
+        /**
+         * 商品轮播图地址
+         数组，以逗号分隔
+         最多上传15张
+         */
+        @Schema(description="商品轮播图地址")
+        private String sliderPicUrls;
+
+        /**
+         * 排序字段
+         */
+        @Schema(description="排序字段")
+        private Integer sort;
+
+
+
+        /**
+         * 部门id
+         */
+        @Schema(description="部门id")
+        private Long deptId;
+
+        /**
+         * 销量
+         */
+        @Schema(description="销量")
+        private Integer salesCount;
+
+    }
+
+
+}

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java

@@ -11,11 +11,15 @@ import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
+import com.bsd.pjcloud.supermarket.entity.SmErpCategoryEntity;
 import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity;
 import com.bsd.pjcloud.supermarket.entity.SmSpuEntity;
 import com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper;
+import com.bsd.pjcloud.supermarket.service.SmErpCategoryService;
 import com.bsd.pjcloud.supermarket.service.SmErpSpuService;
 import com.bsd.pjcloud.supermarket.service.SmSpuService;
+import com.bsd.pjcloud.supermarket.vo.OnlineShopVo;
+import com.bsd.pjcloud.supermarket.vo.erp.SmErpCategorySimpleVo;
 import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmSpuEditVo;
 import com.bsd.pjcloud.wallet.api.feign.RemoteMchService;
 import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
@@ -31,6 +35,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 线上超市
@@ -50,6 +55,10 @@ public class SmSpuController {
     private final SmErpSpuService smErpSpuService;
 
     private final RemoteMchService remoteMchService;
+
+    private final SmErpCategoryService smErpCategoryService;
+
+
     /**
      * 分页查询
      * @param page 分页对象
@@ -145,5 +154,39 @@ public class SmSpuController {
 
 
 
+    /**
+     * 获取商户下所有的在线商品，并且获取分类
+     * @return
+     */
+    @Operation(summary = "APP在线商城数据查询",description = "通过商户id获取该商户下的在线商品数据")
+    @GetMapping("/app/onlineShopList")
+    public R<List<OnlineShopVo>> getOnlineShopList(@RequestParam("merchantId")Long merchantId) {
+
+        List<SmSpuEntity> list=smSpuService.getOnlineShopList(merchantId);
+
+        return R.ok();
+    }
+
+
+
+    /**
+     * 获取商户下所有的在线商品，并且获取分类
+     * @return
+     */
+    @Operation(summary = "APP在线商城数据查询",description = "通过商户id获取该商户下的在线商品数据")
+    @GetMapping("/app/onlineCategoryList")
+    public R<List<SmErpCategorySimpleVo>> getOnlineCategoryList(@RequestParam("merchantId")Long merchantId) {
+
+        R<MchManageVo> byId = remoteMchService.getById(merchantId);
+        MchManageVo data = byId.getData();
+        if (Objects.isNull(data)){
+            return R.failed("商户不存在");
+        }
+        Long deptId = data.getDeptId();
+
+        List<SmErpCategoryEntity> categoryEntities =  smErpCategoryService.list(Wrappers.<SmErpCategoryEntity>lambdaQuery().eq(SmErpCategoryEntity::getDeptId, deptId));
+        List<SmErpCategorySimpleVo> bean = BeanUtils.toBean(categoryEntities, SmErpCategorySimpleVo.class);
+        return R.ok(bean);
+    }
 
 }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java

@@ -18,4 +18,11 @@ public interface SmSpuService extends IService<SmSpuEntity> {
 
 
     Object getAppPage(Page page, SupermarketSpuAppQueryDTO supermarketSpuQueryDTO);
+
+    /**
+     * 查询该商户下的所有在线商品数据
+     * @param merchantId
+     * @return
+     */
+    List<SmSpuEntity> getOnlineShopList(Long merchantId);
 }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java

@@ -558,7 +558,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
             String productCode = dto.getProductCode();
 
             try {
-                //================================ 新增代码开始 ================================//
+                //================================ 新增代码开始 ======= =========================//
                 // 检查本批次内部重复
                 List<Integer> duplicateRows = importProductCodeMap.get(productCode);
                 if (duplicateRows.size() > 1) {

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java

@@ -48,4 +48,17 @@ public class SmSpuServiceImpl extends ServiceImpl<SmSpuMapper, SmSpuEntity> impl
         IPage<SupermarketAppSpuVo> appPage=baseMapper.getAppPage(page,supermarketSpuQueryDTO);
         return appPage;
     }
+
+    @Override
+    public List<SmSpuEntity> getOnlineShopList(Long merchantId) {
+        LambdaQueryWrapper<SmSpuEntity> eq = new LambdaQueryWrapper<SmSpuEntity>()
+                .eq(SmSpuEntity::getMerchantId, merchantId)
+                //上架数据 0
+                .eq(SmSpuEntity::getStatus, "0");
+        List<SmSpuEntity> list = baseMapper.selectList(eq);
+
+        List<Long> erpSpuIds= list.stream().map(smSpuEntity -> smSpuEntity.getErpSpuId()).collect(Collectors.toList());
+
+        return list;
+    }
 }