From b5c718b8f65dd86be3cee601cdee25c137bb0021 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Tue, 11 Feb 2025 17:36:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E7=B1=BB=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/apiadmin/base/BaseGoodsSpuRest.java | 25 ++++++++++- .../basegoodsspu/BaseGoodsDetailsDto.java | 6 ++- .../base/basegoodsspu/BaseGoodsDetailsVo.java | 4 ++ .../biz/base/basegoodsspu/BaseGoodsSpu.java | 4 ++ .../basegoodsspu/BaseGoodsSpuListQuery.java | 6 ++- .../base/basegoodsspu/BaseGoodsSpuListVo.java | 5 ++- .../base/basegoodsspu/BaseGoodsSpuMapper.xml | 4 ++ .../basegoodsspu/BaseGoodsSpuService.java | 42 +++++++++++++------ 8 files changed, 80 insertions(+), 16 deletions(-) diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java index 4b0fc2e7c9..a65f9c356e 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java @@ -30,12 +30,18 @@ public class BaseGoodsSpuRest { @ApiOperation("商品管理分页列表") @PostMapping("/goodsListPage") public ResultBean> goodsListPage(@RequestBody PagerQuery pq) { + BaseGoodsSpuListQuery query = pq.getParams(); + query.setType("0"); return baseGoodsSpuService.goodsListPage(pq); } @ApiOperation("保存修改商品信息") @PostMapping("/saveOrUpdateGoods") public ResultBean saveOrUpdateGoods(@RequestBody BaseGoodsDetailsDto dto) { + dto.setGoodsClassKey("004"); + dto.setGoodsClassValue("售后类"); + dto.setGoodsLevelKey("001"); + dto.setGoodsLevelValue("一级"); return baseGoodsSpuService.saveOrUpdateGoods(dto); } @@ -95,5 +101,22 @@ public class BaseGoodsSpuRest { @GetMapping("/selByCodeAndDept") ResultBean selByCodeAndDept(@RequestParam("code") String code,@RequestParam("deptSid") String deptSid){ return baseGoodsSpuService.selByCodeAndDept(code,deptSid); - }; + } + + //------------------------------- 行政类商品管理 -------------------------------- + + @ApiOperation("保存修改行政商品信息") + @PostMapping("/saveOrUpdateOaGoods") + public ResultBean saveOrUpdateOaGoods(@RequestBody BaseGoodsDetailsDto dto) { + return baseGoodsSpuService.saveOrUpdateGoods(dto); + } + + @ApiOperation("行政商品管理分页列表") + @PostMapping("/oaGoodsListPage") + public ResultBean> oaGoodsListPage(@RequestBody PagerQuery pq) { + BaseGoodsSpuListQuery query = pq.getParams(); + query.setType("1"); + return baseGoodsSpuService.goodsListPage(pq); + } + } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java index 0483557627..d7c56186a6 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java @@ -1,6 +1,5 @@ package com.yxt.base.biz.base.basegoodsspu; -import com.baomidou.mybatisplus.annotation.TableField; import com.yxt.common.core.dto.Dto; import lombok.Data; @@ -48,4 +47,9 @@ public class BaseGoodsDetailsDto implements Dto { private String agencyPrice;//首保价格 private List picPath = new ArrayList<>();//商品图片 + private String goodsClassKey;//商品类型key + private String goodsClassValue;//商品类型 + private String goodsLevelKey;//商品等级key + private String goodsLevelValue;//商品等级 + } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java index a6e784e335..01fe74f24f 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java @@ -46,4 +46,8 @@ public class BaseGoodsDetailsVo implements Vo { private String agencyPrice;//首保价格 private List picPath = new ArrayList<>();//商品图片 + private String goodsClassKey;//商品类型key + private String goodsClassValue;//商品类型 + private String goodsLevelKey;//商品等级key + private String goodsLevelValue;//商品等级 } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java index 8de4df826b..54d106a3a1 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java @@ -30,4 +30,8 @@ public class BaseGoodsSpu extends BaseEntity { private String isListed;//是否上架 private String useOrgSid;//使用组织sid private String createOrgSid;//创建组织sid + private String goodsClassKey;//商品类型key + private String goodsClassValue;//商品类型 + private String goodsLevelKey;//商品等级key + private String goodsLevelValue;//商品等级 } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListQuery.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListQuery.java index f0a8638709..6f7226e85b 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListQuery.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListQuery.java @@ -25,5 +25,9 @@ public class BaseGoodsSpuListQuery implements Query { private String goodsTypeName;//商品类别 private String brandName;//品牌 private String manufacturerName;//厂家 - + private String goodsClassKey;//商品类型key + private String goodsClassValue;//商品类型 + private String goodsLevelKey;//商品等级key + private String goodsLevelValue;//商品等级 + private String type;// 0售后商品 1行政商品 } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java index 848fe2b8ae..cd6f925667 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java @@ -34,6 +34,9 @@ public class BaseGoodsSpuListVo implements Vo { private String agencyPrice;//首保价格 private String picUrl; private List picPath = new ArrayList<>();//商品图片 - + private String goodsClassKey;//商品类型key + private String goodsClassValue;//商品类型 + private String goodsLevelKey;//商品等级key + private String goodsLevelValue;//商品等级 } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml index 96727d2451..1514875d29 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml @@ -41,6 +41,10 @@ WHERE