Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud

2025-01-22 19:11:50 +08:00
commit 1968a8ff6c
@@ -139,7 +139,7 @@ public class SmErpSpuEntity extends Model<SmErpSpuEntity> {
 	* 规格
 	*/
    @Schema(description="规格")
-    private String specification;
+    private String spec;

 	/**
 	* 产地
@@ -151,7 +151,7 @@ public class SmErpSpuEntity extends Model<SmErpSpuEntity> {
 	* 装数
 	*/
    @Schema(description="装数")
-    private Integer packingQuantity;
+    private Integer packageNum;

 	/**
 	* 进价（分为单位）
@@ -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;
@@ -0,0 +1,72 @@
+package com.bsd.pjcloud.supermarket.vo.sm.smspu;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.bsd.pjcloud.common.core.util.MoneyDeserializer;
+import com.bsd.pjcloud.common.core.util.MoneySerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+
+@Data
+@Schema(description = "后台线上商品-选择库存商品-查询包装单位信息")
+public class SmErpUnitVo {
+
+
+    /**
+     * 包装单位id
+     */
+    @Schema(description="包装单位id")
+    private Long id;
+
+    /**
+     * 条码
+     */
+    @Schema(description="条码")
+    private String barCode;
+
+    /**
+     * 规格
+     */
+    @Schema(description="规格")
+    private String spec;
+
+    /**
+     * 单位
+     */
+    @Schema(description="单位")
+    private String unit;
+
+    /**
+     * 内装数量
+     */
+    @Schema(description="内装")
+    private Integer packageNum;
+
+
+    /**
+     * 零售价/单位分
+     */
+    @Schema(description="零售价/单位分")
+    @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
+    @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+    private Integer retailPrice;
+
+    /**
+     * spuID
+     */
+    @Schema(description="spuID")
+    private Long spuId;
+
+    /**
+     * 促销价
+     */
+    @Schema(description="促销价")
+    @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
+    @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+    private Integer promotionPrice;
+
+}
@@ -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,12 +81,14 @@ 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());
        wrapper.eq(null!=supermarketSpu.getCategoryId(), SmErpSpuEntity::getCategoryId,supermarketSpu.getCategoryId());
        return R.ok(smErpSpuService.OnlineSpuPageScope(page, wrapper));
    }
+
    /**
     * 通过id查询商品spu
     * @param id id
@@ -6,10 +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.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;
@@ -67,6 +69,25 @@ public class SmErpUnitController {
        return R.ok(smErpUnitService.getById(id));
    }

+    /**
+     * 分页查询-线上商城通过id查询商品详情
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id查询详情" , description = "通过id查询" )
+    @GetMapping("/getOnlineSkuBySpuId/{id}" )
+    @PreAuthorize("@pms.hasPermission('supermarket_supermarketUnit_view')" )
+    public R getOnlineSkuBySpuId(@PathVariable("id" ) Long id) {
+        LambdaQueryWrapper<SmErpUnitEntity> smErpUnitEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        smErpUnitEntityLambdaQueryWrapper.eq(SmErpUnitEntity::getSpuId, id);
+        //过滤停售的
+        smErpUnitEntityLambdaQueryWrapper.eq(SmErpUnitEntity::getStatus, "0");
+
+        List<SmErpUnitEntity> list = smErpUnitService.list(smErpUnitEntityLambdaQueryWrapper);
+
+        List<SmErpUnitVo> bean = BeanUtils.toBean(list, SmErpUnitVo.class);
+        return R.ok(bean);
+    }
    /**
     * 新增商品包装单位(sku)
     * @param supermarketUnit 商品包装单位(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;
+    }
 }
@@ -21,9 +21,9 @@
        <result property="giveIntegral" column="give_integral"/>
        <result property="merchantId" column="merchant_id"/>
        <result property="deptId" column="dept_id"/>
-        <result property="specification" column="specification"/>
+        <result property="spec" column="spec"/>
        <result property="origin" column="origin"/>
-        <result property="packingQuantity" column="packing_quantity"/>
+        <result property="packageNum" column="package_num"/>
        <result property="purchasePrice" column="purchase_price"/>
        <result property="retailPrice" column="retail_price"/>
        <result property="memberPrice1" column="member_price1"/>