Explorar o código

添加虚拟表和商品表代码

cuixiaodong hai 10 meses
pai
achega
ca4ecd3ab6

+ 70 - 0
raycos-web-api/src/main/java/com/hys/app/raycoswebapi/controller/product/StockVirtualSkuManagerController.java

@@ -0,0 +1,70 @@
+package com.hys.app.raycoswebapi.controller.product;
+
+import com.hys.app.framework.context.user.AdminUserContext;
+import com.hys.app.framework.database.WebPage;
+import com.hys.app.model.support.LogClient;
+import com.hys.app.model.support.validator.annotation.Log;
+import com.hys.app.raycoswebapi.model.dao.product.RaycosStockplusDao;
+import com.hys.app.raycoswebapi.model.dao.product.RaycosStockvirtualskuDao;
+import com.hys.app.raycoswebapi.model.dto.product.StockVirtualSkuDto;
+import com.hys.app.raycoswebapi.model.dto.product.StockplusDto;
+import com.hys.app.raycoswebapi.service.product.StockVirtualSkuManager;
+import com.hys.app.raycoswebapi.service.product.StockplusInfoManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * stock相关api
+ *
+ * @author 崔晓冬
+ * @since 2024年8月9日12:20:17
+ */
+@RestController
+@RequestMapping("/admin/webapi/virtualSku")
+@Api(tags = "stock商品相关API")
+@Validated
+public class StockVirtualSkuManagerController {
+
+    @Autowired
+    private StockVirtualSkuManager stockVirtualSkuManager;
+
+
+
+    @ApiOperation(value = "分页列表")
+    @GetMapping("/list")
+    public WebPage<RaycosStockvirtualskuDao> list(StockVirtualSkuDto stockVirtualSkuDto) {
+        AdminUserContext.hasSuperAdminQuery(stockVirtualSkuDto.getCompanyId());
+        return stockVirtualSkuManager.list(stockVirtualSkuDto);
+    }
+
+    @ApiOperation(value = "添加")
+    @PostMapping("/insert")
+    @Log(client = LogClient.admin, detail = "新增sku主表")
+    public Long add(@RequestBody @Valid StockVirtualSkuDto stockVirtualSkuDto) {
+        AdminUserContext.hasCompany();
+        return stockVirtualSkuManager.add(stockVirtualSkuDto);
+    }
+
+    @ApiOperation(value = "修改")
+    @PutMapping("/update/{id}")
+    @Log(client = LogClient.admin, detail = "编辑ID为[${id}]的入库单")
+    public void updateInfo(@PathVariable Long id, @RequestBody @Valid StockVirtualSkuDto stockVirtualSkuDto) {
+        AdminUserContext.hasCompany();
+        stockVirtualSkuDto.setId(id);
+        stockVirtualSkuManager.updateInfo(stockVirtualSkuDto);
+    }
+
+    @ApiOperation(value = "删除")
+    @DeleteMapping("/delete/{id}")
+    @Log(client = LogClient.admin, detail = "删除ID为[${ids}]的入库单")
+    public void delete(@PathVariable Long id) {
+        stockVirtualSkuManager.delete(id);
+    }
+
+}
+

+ 1 - 1
raycos-web-api/src/main/java/com/hys/app/raycoswebapi/controller/product/StockplusInfoManagerController.java

@@ -26,7 +26,7 @@ import javax.validation.Valid;
  */
 @RestController
 @RequestMapping("/admin/webapi/stockplusinfo")
-@Api(tags = "stock信息相关API")
+@Api(tags = "stock商品相关API")
 @Validated
 public class StockplusInfoManagerController {
 

+ 23 - 0
raycos-web-api/src/main/java/com/hys/app/raycoswebapi/mapper/product/StockVirtualSkuMapper.java

@@ -0,0 +1,23 @@
+package com.hys.app.raycoswebapi.mapper.product;
+
+import com.hys.app.framework.database.WebPage;
+import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
+import com.hys.app.raycoswebapi.model.dao.product.RaycosStockvirtualskuDao;
+import com.hys.app.raycoswebapi.model.dao.product.RaycosStockvirtualskuDao;
+import com.hys.app.raycoswebapi.model.dto.product.StockVirtualSkuDto;
+import com.hys.app.raycoswebapi.model.dto.product.StockplusDto;
+
+public interface StockVirtualSkuMapper extends BaseMapperX<RaycosStockvirtualskuDao> {
+    default WebPage<RaycosStockvirtualskuDao> selectPage(StockVirtualSkuDto params) {
+        return lambdaQuery()
+                .eqIfPresent(RaycosStockvirtualskuDao::getCompanyId, params.getCompanyId())
+                .eqIfPresent(RaycosStockvirtualskuDao::getImportTaskSeq, params.getImportTaskSeq())
+                .eqIfPresent(RaycosStockvirtualskuDao::getStockId, params.getStockId())
+                .eqIfPresent(RaycosStockvirtualskuDao::getVirtualSku, params.getVirtualSku())
+                .eqIfPresent(RaycosStockvirtualskuDao::getPlatformId, params.getPlatformId())
+                .eqIfPresent(RaycosStockvirtualskuDao::getTimeCreated, params.getTimeCreated())
+                .orderByDesc(RaycosStockvirtualskuDao::getTimeCreated)
+                .page(params);
+    }
+
+}

+ 5 - 5
raycos-web-api/src/main/java/com/hys/app/raycoswebapi/model/dao/product/RaycosStockvirtualskuDao.java

@@ -11,20 +11,20 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.io.Serializable;
 import java.sql.Timestamp;
 
 
 @TableName("raycos_stockvirtualsku")
 @Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class RaycosStockvirtualskuDao extends BaseDO {
+public class RaycosStockvirtualskuDao implements Serializable {
   private static final long serialVersionUID = 1L;
   @TableId(type = IdType.ASSIGN_ID)
   @ApiModelProperty(hidden = true)
   private Long id;
-  //@ApiModelProperty(name = "companyId", value = "companyId")
-//  private long companyId;
+
+  @ApiModelProperty(name = "companyId", value = "companyId")
+  private long companyId;
 
   @ApiModelProperty(name = "importTaskSeq", value = "importTaskSeq")
   private String importTaskSeq;

+ 37 - 0
raycos-web-api/src/main/java/com/hys/app/raycoswebapi/model/dto/product/StockVirtualSkuDto.java

@@ -0,0 +1,37 @@
+package com.hys.app.raycoswebapi.model.dto.product;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.hys.app.framework.database.BaseQueryParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class StockVirtualSkuDto extends BaseQueryParam {
+    private static final long serialVersionUID = 1L;
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(hidden = true)
+    private Long id;
+
+    @ApiModelProperty(name = "companyId", value = "companyId")
+    private long companyId;
+
+    @ApiModelProperty(name = "importTaskSeq", value = "importTaskSeq")
+    private String importTaskSeq;
+
+    @ApiModelProperty(name = "stockId", value = "Stock ID(唯一对应)")
+    private Long stockId;
+
+    @ApiModelProperty(name = "virtualSku", value = "virtualSku")
+    private String virtualSku;
+
+    @ApiModelProperty(name = "platformId", value = "平台类型")
+    private Long platformId;
+
+    @ApiModelProperty(name = "timeCreated", value = "创建时间")
+    private Long timeCreated;
+}

+ 31 - 0
raycos-web-api/src/main/java/com/hys/app/raycoswebapi/service/product/StockVirtualSkuManager.java

@@ -0,0 +1,31 @@
+package com.hys.app.raycoswebapi.service.product;
+
+import com.hys.app.framework.database.WebPage;
+import com.hys.app.framework.database.mybatisplus.base.BaseService;
+import com.hys.app.raycoswebapi.model.dao.product.RaycosStockplusDao;
+import com.hys.app.raycoswebapi.model.dao.product.RaycosStockvirtualskuDao;
+import com.hys.app.raycoswebapi.model.dto.product.StockVirtualSkuDto;
+import com.hys.app.raycoswebapi.model.dto.product.StockplusDto;
+
+/**
+ * stock表相关
+ *
+ * @author 崔晓冬
+ * @since 2024年8月9日12:19:19
+ */
+public interface StockVirtualSkuManager extends BaseService<RaycosStockvirtualskuDao> {
+    /**
+     * 分页列表
+     *
+     * @param stockVirtualSkuDto 查询条件
+     * @return 分页数据
+     */
+    WebPage<RaycosStockvirtualskuDao> list(StockVirtualSkuDto stockVirtualSkuDto);
+
+    Long add(StockVirtualSkuDto stockVirtualSkuDto);
+
+    void updateInfo(StockVirtualSkuDto stockVirtualSkuDto);
+
+    void delete(Long id);
+}
+

+ 2 - 0
raycos-web-api/src/main/java/com/hys/app/raycoswebapi/service/product/impl/StockInfoManagerImpl.java

@@ -2,6 +2,7 @@ package com.hys.app.raycoswebapi.service.product.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.hys.app.framework.context.user.AdminUserContext;
 import com.hys.app.framework.database.WebPage;
 import com.hys.app.framework.database.mybatisplus.base.BaseServiceImpl;
 import com.hys.app.framework.exception.ServiceException;
@@ -32,6 +33,7 @@ public class StockInfoManagerImpl extends BaseServiceImpl<StockInfoMapper, Rayco
     public Long add(StockInfoDto stockInfoDto) {
         RaycosStockDao raycosStockDao = BeanUtil.copyProperties(stockInfoDto, RaycosStockDao.class);
         raycosStockDao.setTimeCreated(DateUtil.getDateline());
+        raycosStockDao.setCompanyId(AdminUserContext.getCompanyId());
         save(raycosStockDao);
         Long id = raycosStockDao.getId();
 

+ 53 - 0
raycos-web-api/src/main/java/com/hys/app/raycoswebapi/service/product/impl/StockVirtualSkuManagerImpl.java

@@ -0,0 +1,53 @@
+package com.hys.app.raycoswebapi.service.product.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.hys.app.framework.context.user.AdminUserContext;
+import com.hys.app.framework.database.WebPage;
+import com.hys.app.framework.database.mybatisplus.base.BaseServiceImpl;
+import com.hys.app.raycoswebapi.mapper.product.StockVirtualSkuMapper;
+import com.hys.app.raycoswebapi.mapper.product.StockplusInfoMapper;
+import com.hys.app.raycoswebapi.model.dao.product.RaycosStockplusDao;
+import com.hys.app.raycoswebapi.model.dao.product.RaycosStockvirtualskuDao;
+import com.hys.app.raycoswebapi.model.dto.product.StockVirtualSkuDto;
+import com.hys.app.raycoswebapi.model.dto.product.StockplusDto;
+import com.hys.app.raycoswebapi.service.product.StockVirtualSkuManager;
+import com.hys.app.raycoswebapi.service.product.StockplusInfoManager;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@AllArgsConstructor
+public class StockVirtualSkuManagerImpl extends BaseServiceImpl<StockVirtualSkuMapper, RaycosStockvirtualskuDao> implements StockVirtualSkuManager {
+
+    @Override
+    public WebPage<RaycosStockvirtualskuDao> list(StockVirtualSkuDto stockVirtualSkuDto) {
+        stockVirtualSkuDto.setCompanyId(AdminUserContext.getCompanyId());
+        WebPage<RaycosStockvirtualskuDao> page = baseMapper.selectPage(stockVirtualSkuDto);
+        return page;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long add(StockVirtualSkuDto stockVirtualSkuDto) {
+        RaycosStockvirtualskuDao raycosStockvirtualskuDao = BeanUtil.copyProperties(stockVirtualSkuDto, RaycosStockvirtualskuDao.class);
+        raycosStockvirtualskuDao.setCompanyId(AdminUserContext.getCompanyId());
+        save(raycosStockvirtualskuDao);
+        Long id = raycosStockvirtualskuDao.getId();
+
+        return id;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateInfo(StockVirtualSkuDto stockVirtualSkuDto) {
+        RaycosStockvirtualskuDao raycosStockvirtualskuDao = BeanUtil.copyProperties(stockVirtualSkuDto, RaycosStockvirtualskuDao.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long id) {
+        RaycosStockvirtualskuDao aDo = getById(id);
+        removeById(id);
+    }
+}

+ 2 - 0
raycos-web-api/src/main/java/com/hys/app/raycoswebapi/service/product/impl/StockplusInfoManagerImpl.java

@@ -1,6 +1,7 @@
 package com.hys.app.raycoswebapi.service.product.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.hys.app.framework.context.user.AdminUserContext;
 import com.hys.app.framework.database.WebPage;
 import com.hys.app.framework.database.mybatisplus.base.BaseServiceImpl;
 import com.hys.app.framework.util.DateUtil;
@@ -22,6 +23,7 @@ public class StockplusInfoManagerImpl extends BaseServiceImpl<StockplusInfoMappe
 
     @Override
     public WebPage<RaycosStockplusDao> list(StockplusDto queryParams) {
+        queryParams.setCompanyId(AdminUserContext.getCompanyId());
         WebPage<RaycosStockplusDao> page = baseMapper.selectPage(queryParams);
         return page;
     }

+ 2 - 2
server/src/main/resources/application-test.yml

@@ -8,9 +8,9 @@ spring:
       ds0:
         type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name: com.mysql.jdbc.Driver
-        url: jdbc:mysql://127.0.0.1:3306/erp_warehouse?useUnicode=true&characterEncoding=utf8&autoReconnect=true&rewriteBatchedStatements=true&useSSL=false
+        url: jdbc:mysql://127.0.0.1:3306/erp-warehouse?useUnicode=true&characterEncoding=utf8&autoReconnect=true&rewriteBatchedStatements=true&useSSL=false
         username: root
-        password: e0056c1f91a395a2
+        password: Gd8XCWEef72GerxE
 
   #rabbitmq
   rabbitmq: