整改超市

2025-01-22 18:22:41 +08:00
1 parent 91393d2af2
commit 203a62c88b
@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.supermarket.vo.sm;
+package com.bsd.pjcloud.supermarket.vo.sm.smspu;

 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.supermarket.vo.sm;
+package com.bsd.pjcloud.supermarket.vo.sm.smspu;

 import com.baomidou.mybatisplus.annotation.*;
 import com.bsd.pjcloud.common.core.util.MoneyDeserializer;
@@ -0,0 +1,62 @@
+package com.bsd.pjcloud.supermarket.vo.sm.smspu;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@Schema(description = "后台线上商品-分页查询")
+public class SmSpuPageVo {
+
+    /**
+     * 线上SPU 编号，自增
+     */
+    @Schema(description="线上SPU 编号，自增")
+    private Long id;
+
+    /**
+     * 库存商品id
+     */
+    @Schema(description="库存商品id")
+    private String erpSpuId;
+
+
+    /**
+     * 排序字段
+     */
+    @Schema(description="排序字段")
+    private Integer sort;
+
+    /**
+     * 商品状态: 1 上架（开启） 0 下架（禁用） -1 回收
+     */
+    @Schema(description="商品状态")
+    private String status;
+
+
+    /**
+     * 销量
+     */
+    @Schema(description="销量")
+    private Integer salesCount;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建人")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建时间")
+    private LocalDateTime createTime;
+
+}
@@ -81,6 +81,7 @@ public class SmErpSpuController {
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_view')" )
    public R getOnlineSpuPageScope(@ParameterObject Page page, @ParameterObject SmErpSpuEntity supermarketSpu) {
        LambdaQueryWrapper<SmErpSpuEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(SmErpSpuEntity::getStatus,"0");
        wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getProductCode()), SmErpSpuEntity::getProductCode,supermarketSpu.getProductCode());
        wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getBarcode()), SmErpSpuEntity::getBarcode,supermarketSpu.getBarcode());
        wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getProductName()), SmErpSpuEntity::getProductName,supermarketSpu.getProductName());
@@ -6,12 +6,12 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.supermarket.entity.SmErpAuxiliaryCodeEntity;
-import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity;
 import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity;
 import com.bsd.pjcloud.supermarket.service.SmErpUnitService;
+import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpUnitVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -85,8 +85,8 @@ public class SmErpUnitController {

        List<SmErpUnitEntity> list = smErpUnitService.list(smErpUnitEntityLambdaQueryWrapper);

-
-        return R.ok(list);
+        List<SmErpUnitVo> bean = BeanUtils.toBean(list, SmErpUnitVo.class);
+        return R.ok(bean);
    }
    /**
     * 新增商品包装单位(sku)
@@ -49,8 +49,8 @@ public class SmSpuController {
    @PreAuthorize("@pms.hasPermission('supermarket_smSpu_view')" )
    public R getSmSpuPage(@ParameterObject Page page, @ParameterObject SmSpuEntity smSpu) {
        LambdaQueryWrapper<SmSpuEntity> wrapper = Wrappers.lambdaQuery();
-		wrapper.like(StrUtil.isNotBlank(smSpu.getErpSpuId()),SmSpuEntity::getErpSpuId,smSpu.getErpSpuId());
-        return R.ok(smSpuService.page(page, wrapper));
+		wrapper.like(null!=smSpu.getErpSpuId(),SmSpuEntity::getErpSpuId,smSpu.getErpSpuId());
+        return R.ok(smSpuService.pageScope(page, wrapper));
    }


@@ -33,7 +33,7 @@ public class SmSpuEntity extends Model<SmSpuEntity> {
 	* 库存商品id
 	*/
    @Schema(description="库存商品id")
-    private String erpSpuId;
+    private Long erpSpuId;

 	/**
 	* 商品详情
@@ -7,7 +7,7 @@ import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO;
 import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity;
-import com.bsd.pjcloud.supermarket.vo.sm.SmErpPageScopeVo;
+import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo;

 import java.util.ArrayList;

@@ -1,8 +1,13 @@
 package com.bsd.pjcloud.supermarket.service;

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.supermarket.entity.SmSpuEntity;

 public interface SmSpuService extends IService<SmSpuEntity> {

+
+
+    Object pageScope(Page page, LambdaQueryWrapper<SmSpuEntity> wrapper);
 }
@@ -20,7 +20,7 @@ import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppUnitVo;
 import com.bsd.pjcloud.supermarket.vo.erp.SmErpAuxiliaryCodeVo;
 import com.bsd.pjcloud.supermarket.vo.erp.SmErpSpuVo;
 import com.bsd.pjcloud.supermarket.vo.erp.SmErpUnitVo;
-import com.bsd.pjcloud.supermarket.vo.sm.SmErpPageScopeVo;
+import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -1,9 +1,15 @@
 package com.bsd.pjcloud.supermarket.service.impl;

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.supermarket.entity.SmSpuEntity;
+import com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper;
+import com.bsd.pjcloud.supermarket.mapper.SmErpUnitMapper;
 import com.bsd.pjcloud.supermarket.mapper.SmSpuMapper;
 import com.bsd.pjcloud.supermarket.service.SmSpuService;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 /**
 * 线上超市
@@ -12,5 +18,20 @@ import org.springframework.stereotype.Service;
 * @date 2025-01-21 17:38:38
 */
@Service
+@AllArgsConstructor
 public class SmSpuServiceImpl extends ServiceImpl<SmSpuMapper, SmSpuEntity> implements SmSpuService {
+
+    private final SmErpSpuMapper smErpSpuMapper;
+
+    private final SmErpUnitMapper smErpUnitMapper;
+    @Override
+    public Object pageScope(Page page, LambdaQueryWrapper<SmSpuEntity> wrapper) {
+        Page<SmSpuEntity> pageData = baseMapper.selectPageByScope(page, wrapper, DataScope.of());
+
+        pageData.getRecords().forEach(item -> {
+            Long erpSpuId = item.getErpSpuId();
+
+        });
+        return null;
+    }
 }