diff --git a/src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java index e971603..109a3c5 100644 --- a/src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java @@ -1,10 +1,7 @@ package com.yxt.goods.apiadmin; import com.yxt.goods.biz.goodsbrandinfo.GoodsBrandInfo; -import com.yxt.goods.biz.goodsspu.GoodsSpuDto; -import com.yxt.goods.biz.goodsspu.GoodsSpuQuery; -import com.yxt.goods.biz.goodsspu.GoodsSpuService; -import com.yxt.goods.biz.goodsspu.GoodsSpuVo; +import com.yxt.goods.biz.goodsspu.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -30,6 +27,13 @@ public class GoodsSpuRest { @Autowired GoodsSpuService goodsSpuService; + + @ApiOperation("销售订单获取商品") + @PostMapping("/getGoodsForSales") + public ResultBean> getGoodsForSales(@RequestBody PagerQuery pq) { + return goodsSpuService.getGoodsForSales(pq); + } + @ApiOperation("分页列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq) { diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java index 0102306..8e6daeb 100644 --- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java +++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java @@ -21,4 +21,6 @@ public interface GoodsSpuMapper extends BaseMapper { GoodsSpuVo initialization(@Param("sid")String sid); int updateBySidIsDelete(List list); List listAll(@Param("orgPath")String orgPath); + + IPage getGoodsForSales(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml index 2725329..88b3349 100644 --- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml @@ -34,6 +34,20 @@ left join goods_manufacturer c on c.sid=s.manufacturerSid where s.sid=#{sid} + UPDATE goods_spu SET isDelete=1 @@ -42,4 +56,4 @@ #{item} - \ No newline at end of file + diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java index 406bcfc..5417620 100644 --- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java +++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java @@ -485,4 +485,21 @@ public class GoodsSpuService extends MybatisBaseService> getGoodsForSales(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + SalesGoodsQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getGoodsName())) { + qw.like("s.goodsName", query.getGoodsName()); + } + if (StringUtils.isNotBlank(query.getCreateOrgSid())) { + qw.like("s.createOrgSid", query.getCreateOrgSid()); + } + qw.ne("s.isDelete","1"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.getGoodsForSales(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } } diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/SalesGoodsQuery.java b/src/main/java/com/yxt/goods/biz/goodsspu/SalesGoodsQuery.java new file mode 100644 index 0000000..3fb083a --- /dev/null +++ b/src/main/java/com/yxt/goods/biz/goodsspu/SalesGoodsQuery.java @@ -0,0 +1,15 @@ +package com.yxt.goods.biz.goodsspu; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/19 17:42 + */ +@Data +public class SalesGoodsQuery implements Query { + private String goodsName; + private String createOrgSid; +} diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/SalesGoodsVo.java b/src/main/java/com/yxt/goods/biz/goodsspu/SalesGoodsVo.java new file mode 100644 index 0000000..2fa337c --- /dev/null +++ b/src/main/java/com/yxt/goods/biz/goodsspu/SalesGoodsVo.java @@ -0,0 +1,62 @@ +package com.yxt.goods.biz.goodsspu; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/19 17:43 + */ +@Data +public class SalesGoodsVo implements Vo { + + /** + * 辅单位数量 + */ + private String auxiliaryUnit; + /** + * 数量 + */ + private String count; + /** + * 商品基础信息Sid + */ + private String goodSpuSid; + /** + * 商品编码 + */ + private String goodsSkuCode; + /** + * 规格型号 + */ + private String goodsSkuOwnSpec; + /** + * 商品Skusid + */ + private String goodsSkuSid; + /** + * 商品Sku名称 + */ + private String goodsSkuTitle; + /** + * 商品名称 + */ + private String goodsSpuName; + /** + * 销售单价 + */ + private String price; + /** + * 计量单位 + */ + private String unit; + /** + * 体积(立方米) + */ + private String volume; + /** + * 重量(kg) + */ + private String weight; +}