diff --git a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinfo/dto/GoodsInfoRespDTO.java b/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinfo/dto/GoodsInfoRespDTO.java index 7ba774c..ee8164b 100644 --- a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinfo/dto/GoodsInfoRespDTO.java +++ b/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinfo/dto/GoodsInfoRespDTO.java @@ -25,10 +25,6 @@ public class GoodsInfoRespDTO { * 商品类型id */ private Long goodsTypeId; - /** - * 商品单位 - */ - private String goodsUnit; /** * 商品规格 */ diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoBaseVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoBaseVO.java index dd7f82b..b186d40 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoBaseVO.java +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoBaseVO.java @@ -27,18 +27,9 @@ public class GoodsInfoBaseVO { @ApiModelProperty(value = "商品类型id", required = true) private Long goodsTypeId; - @ApiModelProperty(value = "是否基础单位(kg)") - private Boolean isBaseUnit; - - @ApiModelProperty(value = "商品单位id, 是基础单位(kg)时 该字段为0") - private Long goodsUnitId; - - @ApiModelProperty(value = "商品规格, 换算之后写入的数值 如：5kg/袋 (或者kg)") + @ApiModelProperty(value = "商品规格") private String goodsSpecs; - @ApiModelProperty(value = "换算值") - private BigDecimal conversionValue; - @ApiModelProperty(value = "商品说明") private String goodsRemarks; diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoForTransferRespVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoForTransferRespVO.java index 9162ab2..5ba75d1 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoForTransferRespVO.java +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoForTransferRespVO.java @@ -17,8 +17,8 @@ public class GoodsInfoForTransferRespVO { @ApiModelProperty(value = "商品编码", required = true) private String goodsId; - @ApiModelProperty(value = "商品单位", required = true) - private String goodsUnit; + @ApiModelProperty(value = "商品规格", required = true) + private String goodsSpecs; @ApiModelProperty(value = "所属商户id", required = true) private Long belongBusinessId; diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoListReqVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoListReqVO.java index 85b5b04..4c71ae6 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoListReqVO.java +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoListReqVO.java @@ -32,18 +32,9 @@ public class GoodsInfoListReqVO { @ApiModelProperty(value = "商品类型id") private Long goodsTypeId; - @ApiModelProperty(value = "是否基础单位(kg)") - private Boolean isBaseUnit; - - @ApiModelProperty(value = "商品单位id, 是基础单位(kg)时 该字段为0") - private Long goodsUnitId; - - @ApiModelProperty(value = "商品规格, 换算之后写入的数值 如：5kg/袋 (或者kg)") + @ApiModelProperty(value = "商品规格") private String goodsSpecs; - @ApiModelProperty(value = "换算值") - private BigDecimal conversionValue; - @ApiModelProperty(value = "商品说明") private String goodsRemarks; diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoPageReqVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoPageReqVO.java index f697ed2..0d53c7c 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoPageReqVO.java +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoPageReqVO.java @@ -30,18 +30,9 @@ public class GoodsInfoPageReqVO extends PageParam { @ApiModelProperty(value = "商品类型id") private Long goodsTypeId; - @ApiModelProperty(value = "是否基础单位(kg)") - private Boolean isBaseUnit; - - @ApiModelProperty(value = "商品单位id, 是基础单位(kg)时 该字段为0") - private Long goodsUnitId; - - @ApiModelProperty(value = "商品规格, 换算之后写入的数值 如：5kg/袋 (或者kg)") + @ApiModelProperty(value = "商品规格") private String goodsSpecs; - @ApiModelProperty(value = "换算值") - private BigDecimal conversionValue; - @ApiModelProperty(value = "商品单位名称") private String goodsUnitName; diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoRespVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoRespVO.java index 72850e8..55ab904 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoRespVO.java +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinfo/vo/GoodsInfoRespVO.java @@ -14,8 +14,8 @@ public class GoodsInfoRespVO extends GoodsInfoBaseVO { @ApiModelProperty(value = " 编码", required = true) private Long id; - @ApiModelProperty(value = "商品单位") - private String unitName; + @ApiModelProperty(value = "商品规格") + private String goodsSpecs; @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/UnitController.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/UnitController.java deleted file mode 100644 index ef20d5c..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/UnitController.java +++ /dev/null @@ -1,88 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.unit; - -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.annotations.*; - -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*; - -import cn.iocoder.yudao.module.basic.controller.admin.unit.vo.*; -import cn.iocoder.yudao.module.basic.dal.dataobject.unit.UnitDO; -import cn.iocoder.yudao.module.basic.convert.unit.UnitConvert; -import cn.iocoder.yudao.module.basic.service.unit.UnitService; - -@Api(tags = "管理后台 - 单位") -@RestController -@RequestMapping("/basic/unit") -@Validated -public class UnitController { - - @Resource - private UnitService unitService; - - @PostMapping("/create") - @ApiOperation("创建单位") - @PreAuthorize("@ss.hasPermission('basic:unit:create')") - public CommonResult createUnit(@Valid @RequestBody UnitCreateReqVO createReqVO) { - return success(unitService.createUnit(createReqVO)); - } - - @PutMapping("/update") - @ApiOperation("更新单位") - @PreAuthorize("@ss.hasPermission('basic:unit:update')") - public CommonResult updateUnit(@Valid @RequestBody UnitUpdateReqVO updateReqVO) { - unitService.updateUnit(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @ApiOperation("删除单位") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('basic:unit:delete')") - public CommonResult deleteUnit(@RequestParam("id") Long id) { - unitService.deleteUnit(id); - return success(true); - } - - @GetMapping("/get") - @ApiOperation("获得单位") - @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('basic:unit:query')") - public CommonResult getUnit(@RequestParam("id") Long id) { - UnitDO unit = unitService.getUnit(id); - return success(UnitConvert.INSTANCE.convert(unit)); - } - - @GetMapping("/list") - @ApiOperation("获得单位列表") - @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class) - @PreAuthorize("@ss.hasPermission('basic:unit:query')") - public CommonResult> getUnitList(@RequestParam("ids") Collection ids) { - List list = unitService.getUnitList(ids); - return success(UnitConvert.INSTANCE.convertList(list)); - } - - @GetMapping("/page") - @ApiOperation("获得单位分页") - @PreAuthorize("@ss.hasPermission('basic:unit:query')") - public CommonResult> getUnitPage(@Valid UnitPageReqVO pageVO) { - PageResult pageResult = unitService.getUnitPage(pageVO); - return success(UnitConvert.INSTANCE.convertPage(pageResult)); - } - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitBaseVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitBaseVO.java deleted file mode 100644 index d828523..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitBaseVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.unit.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -/** -* 商品 Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class UnitBaseVO { - - @ApiModelProperty(value = "单位名称", required = true) - @NotNull(message = "单位名称不能为空") - private String unitName; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitCreateReqVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitCreateReqVO.java deleted file mode 100644 index 08c50d7..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitCreateReqVO.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.unit.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 商品创建 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class UnitCreateReqVO extends UnitBaseVO { - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitExcelVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitExcelVO.java deleted file mode 100644 index 51ea79d..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitExcelVO.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.unit.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; - -import com.alibaba.excel.annotation.ExcelProperty; - -/** - * 商品 Excel VO - * - * @author 芋道源码 - */ -@Data -public class UnitExcelVO { - - @ExcelProperty(" 编码") - private Long id; - - @ExcelProperty("单位名称") - private String unitName; - - @ExcelProperty("创建时间") - private Date createTime; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitExportReqVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitExportReqVO.java deleted file mode 100644 index dcc229f..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitExportReqVO.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.unit.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; - -@ApiModel(value = "管理后台 - 商品 Excel 导出 Request VO", description = "参数和 UnitPageReqVO 是一致的") -@Data -public class UnitExportReqVO { - - @ApiModelProperty(value = "单位名称") - private String unitName; - - @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] createTime; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitPageReqVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitPageReqVO.java deleted file mode 100644 index 64b1e98..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitPageReqVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.unit.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; - -@ApiModel("管理后台 - 商品分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class UnitPageReqVO extends PageParam { - - @ApiModelProperty(value = "单位名称") - private String unitName; - - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT") - @ApiModelProperty(value = "创建时间") - private Date[] createTime; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitRespVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitRespVO.java deleted file mode 100644 index 701d206..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitRespVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.unit.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.*; -import io.swagger.annotations.*; - -import java.util.Date; - -@ApiModel("管理后台 - 商品 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class UnitRespVO extends UnitBaseVO { - - @ApiModelProperty(value = " 编码", required = true) - private Long id; - - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT") - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitUpdateReqVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitUpdateReqVO.java deleted file mode 100644 index a3aded9..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/unit/vo/UnitUpdateReqVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.unit.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 商品更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class UnitUpdateReqVO extends UnitBaseVO { - - @ApiModelProperty(value = " 编码", required = true) - @NotNull(message = " 编码不能为空") - private Long id; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/convert/unit/UnitConvert.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/convert/unit/UnitConvert.java deleted file mode 100644 index d56b7a4..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/convert/unit/UnitConvert.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.iocoder.yudao.module.basic.convert.unit; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import cn.iocoder.yudao.module.basic.controller.admin.unit.vo.*; -import cn.iocoder.yudao.module.basic.dal.dataobject.unit.UnitDO; - -/** - * 商品 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface UnitConvert { - - UnitConvert INSTANCE = Mappers.getMapper(UnitConvert.class); - - UnitDO convert(UnitCreateReqVO bean); - - UnitDO convert(UnitUpdateReqVO bean); - - UnitRespVO convert(UnitDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - List convertList02(List list); - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/dataobject/goodsinfo/GoodsInfoDO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/dataobject/goodsinfo/GoodsInfoDO.java index b604867..d71e47d 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/dataobject/goodsinfo/GoodsInfoDO.java +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/dataobject/goodsinfo/GoodsInfoDO.java @@ -47,21 +47,9 @@ public class GoodsInfoDO extends BaseDO { */ private Long goodsTypeId; /** - * 是否基础单位(kg) - */ - private Boolean isBaseUnit; - /** - * 商品单位id, 是基础单位(kg)时 该字段为0 - */ - private Long goodsUnitId; - /** - * 商品规格, 换算之后写入的数值 如：5kg/袋 (或者kg) + * 商品规格 */ private String goodsSpecs; - /** - * 换算值 - */ - private BigDecimal conversionValue; /** * 商品说明 */ diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/goodsinfo/GoodsInfoMapper.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/goodsinfo/GoodsInfoMapper.java index 67cac46..eb80366 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/goodsinfo/GoodsInfoMapper.java +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/goodsinfo/GoodsInfoMapper.java @@ -29,10 +29,7 @@ public interface GoodsInfoMapper extends BaseMapperX { .eqIfPresent(GoodsInfoDO::getGoodsId, reqVO.getGoodsId()) .eqIfPresent(GoodsInfoDO::getGoodsType, reqVO.getGoodsType()) .eqIfPresent(GoodsInfoDO::getGoodsTypeId, reqVO.getGoodsTypeId()) - .eqIfPresent(GoodsInfoDO::getIsBaseUnit, reqVO.getIsBaseUnit()) .eqIfPresent(GoodsInfoDO::getGoodsSpecs, reqVO.getGoodsSpecs()) - .eqIfPresent(GoodsInfoDO::getGoodsUnitId, reqVO.getGoodsUnitId()) - .eqIfPresent(GoodsInfoDO::getConversionValue,reqVO.getConversionValue()) .eqIfPresent(GoodsInfoDO::getGoodsImgUrl, reqVO.getGoodsImgUrl()) .eqIfPresent(GoodsInfoDO::getShelfLife, reqVO.getShelfLife()) .eqIfPresent(GoodsInfoDO::getBelongBusinessId, reqVO.getBelongBusinessId()) @@ -47,10 +44,7 @@ public interface GoodsInfoMapper extends BaseMapperX { .eqIfPresent(GoodsInfoDO::getGoodsId, reqVO.getGoodsId()) .eqIfPresent(GoodsInfoDO::getGoodsType, reqVO.getGoodsType()) .eqIfPresent(GoodsInfoDO::getGoodsTypeId, reqVO.getGoodsTypeId()) - .eqIfPresent(GoodsInfoDO::getIsBaseUnit, reqVO.getIsBaseUnit()) .eqIfPresent(GoodsInfoDO::getGoodsSpecs, reqVO.getGoodsSpecs()) - .eqIfPresent(GoodsInfoDO::getGoodsUnitId, reqVO.getGoodsUnitId()) - .eqIfPresent(GoodsInfoDO::getConversionValue,reqVO.getConversionValue()) .eqIfPresent(GoodsInfoDO::getGoodsImgUrl, reqVO.getGoodsImgUrl()) .eqIfPresent(GoodsInfoDO::getShelfLife, reqVO.getShelfLife()) .eqIfPresent(GoodsInfoDO::getBelongBusinessId, reqVO.getBelongBusinessId()) @@ -64,7 +58,6 @@ public interface GoodsInfoMapper extends BaseMapperX { IPage selectGoodsInfoById(Page page, @Param("goodsName") String goodsName, @Param("goodsId") String goodsId, - @Param("goodsUnitId") Long goodsUnitId, @Param("belongBusinessName") String belongBusinessName); List getGoodsListByBusinessInfoId(@Param("businessInfoId") Long businessInfoId); diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/unit/UnitMapper.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/unit/UnitMapper.java deleted file mode 100644 index 2c8dae5..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/unit/UnitMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.iocoder.yudao.module.basic.dal.mysql.unit; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.basic.dal.dataobject.unit.UnitDO; -import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.basic.controller.admin.unit.vo.*; - -/** - * 商品 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface UnitMapper extends BaseMapperX { - - default PageResult selectPage(UnitPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(UnitDO::getUnitName, reqVO.getUnitName()) - .betweenIfPresent(UnitDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(UnitDO::getId)); - } - - default List selectList(UnitExportReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .likeIfPresent(UnitDO::getUnitName, reqVO.getUnitName()) - .betweenIfPresent(UnitDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(UnitDO::getId)); - } - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/goodsinfo/GoodsInfoServiceImpl.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/goodsinfo/GoodsInfoServiceImpl.java index e37fc69..774c030 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/goodsinfo/GoodsInfoServiceImpl.java +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/goodsinfo/GoodsInfoServiceImpl.java @@ -12,7 +12,6 @@ import cn.iocoder.yudao.module.basic.dal.dataobject.goodsinfo.GoodsInfoDO; import cn.iocoder.yudao.module.basic.dal.dataobject.unit.UnitDO; import cn.iocoder.yudao.module.basic.dal.mysql.dealergoods.DealerGoodsMapper; import cn.iocoder.yudao.module.basic.dal.mysql.goodsinfo.GoodsInfoMapper; -import cn.iocoder.yudao.module.basic.dal.mysql.unit.UnitMapper; import cn.iocoder.yudao.module.basic.enums.ErrorCodeConstants; import cn.iocoder.yudao.module.basic.service.businessinfo.BusinessInfoServiceImpl; import cn.iocoder.yudao.module.product.api.harvestbatch.HarvestBatchApi; @@ -56,9 +55,6 @@ public class GoodsInfoServiceImpl implements GoodsInfoService { @Resource private HarvestBatchApi harvestBatchApi; - @Resource - private UnitMapper unitMapper; - /** * 创建商品 * @@ -75,36 +71,17 @@ public class GoodsInfoServiceImpl implements GoodsInfoService { GoodsInfoDO goodsInfo = GoodsInfoConvert.INSTANCE.convert(createReqVO); try { goodsInfo.setGoodsId(CodeEnum.GOODS_INFO_CODE.getCode()); - // 设置商品规格 - if (goodsInfo.getIsBaseUnit()) { - goodsInfo.setGoodsSpecs("kg"); - } else { - BigDecimal conversionValue = goodsInfo.getConversionValue(); - if (conversionValue != null) { - String goodsSpecs = String.format("%skg/%s", conversionValue, getUnitName(goodsInfo.getGoodsUnitId())); - goodsInfo.setGoodsSpecs(goodsSpecs); - } - } - goodsInfoMapper.insert(goodsInfo); - } catch(Exception e){ - e.printStackTrace(); - throw exception(GOODS_INFO_FAIL_CREATE); - } - - redisUtil.updateGoodsInfoRedis(goodsInfo.getId(), GoodsInfoConvert.INSTANCE.convertToDTO(goodsInfo)); - // 返回 - return goodsInfo.getId(); + goodsInfoMapper.insert(goodsInfo); + } catch (Exception e) { + e.printStackTrace(); + throw exception(GOODS_INFO_FAIL_CREATE); } - // 根据商品单位ID获取单位名称 - private String getUnitName(Long unitId) { - UnitDO unit = unitMapper.selectById(unitId); - if (unit != null) { - return unit.getUnitName(); - } else { - throw new RuntimeException("无法找到对应的单位"); - } + redisUtil.updateGoodsInfoRedis(goodsInfo.getId(), GoodsInfoConvert.INSTANCE.convertToDTO(goodsInfo)); + // 返回 + return goodsInfo.getId(); } + /** * 更新商品实现 * @@ -120,21 +97,12 @@ public class GoodsInfoServiceImpl implements GoodsInfoService { throw exception(GOODS_INFO_NOT_EXISTS); } //检查商品名称是否发生变化 - if (!Objects.equals(originalGoodsInfo.getGoodsName(),updateReqVO.getGoodsName())){ + if (!Objects.equals(originalGoodsInfo.getGoodsName(), updateReqVO.getGoodsName())) { //商品名称发生变化,进行唯一校验 validateGoodsNameExists(updateReqVO.getGoodsName()); } // 更新记录 GoodsInfoDO newGoodsInfo = GoodsInfoConvert.INSTANCE.convert(updateReqVO); - - // 设置商品规格 - if (newGoodsInfo.getIsBaseUnit()) { - newGoodsInfo.setGoodsSpecs("kg"); - newGoodsInfo.setGoodsUnitId(0L); - } else { - String goodsSpecs = String.format("%skg/%s", newGoodsInfo.getConversionValue(), getUnitName(newGoodsInfo.getGoodsUnitId())); - newGoodsInfo.setGoodsSpecs(goodsSpecs); - } try { goodsInfoMapper.updateById(newGoodsInfo); } catch (Exception e) { @@ -144,13 +112,15 @@ public class GoodsInfoServiceImpl implements GoodsInfoService { redisUtil.updateGoodsInfoRedis(newGoodsInfo.getId(), GoodsInfoConvert.INSTANCE.convertToDTO(newGoodsInfo)); } + private void validateGoodsNameExists(String goodsName) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("goods_name",goodsName); + wrapper.eq("goods_name", goodsName); if (goodsInfoMapper.selectOne(wrapper) != null) { throw exception(GOODS_INFO_ALREADY_EXIST); } } + /** * 删除商品实现 * @@ -212,18 +182,11 @@ public class GoodsInfoServiceImpl implements GoodsInfoService { */ @Override public PageResult getGoodsInfoPage(GoodsInfoPageReqVO pageReqVO) { - Page page = new Page<>(pageReqVO.getPageNo(),pageReqVO.getPageSize()); + Page page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); IPage goodsInfoDOIPage = goodsInfoMapper.selectGoodsInfoById(page, pageReqVO.getGoodsName(), - pageReqVO.getGoodsId(), pageReqVO.getGoodsUnitId(),pageReqVO.getBelongBusinessName()); - // 根据goodsUnitId设置goodsUnitName + pageReqVO.getGoodsId(), pageReqVO.getBelongBusinessName()); + List records = goodsInfoDOIPage.getRecords(); - for (GoodsInfoDO goodsInfo : records) { - if (goodsInfo.getGoodsUnitId() == 0) { - goodsInfo.setGoodsUnitName("kg"); - } else { - goodsInfo.setGoodsUnitName(getUnitName(goodsInfo.getGoodsUnitId())); - } - } PageResult goodsInfoDOPageResult = new PageResult().setList(records); goodsInfoDOPageResult.setTotal(goodsInfoDOIPage.getTotal()); return goodsInfoDOPageResult; diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/unit/UnitService.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/unit/UnitService.java deleted file mode 100644 index 62ecdae..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/unit/UnitService.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.iocoder.yudao.module.basic.service.unit; - -import java.util.*; -import javax.validation.*; -import cn.iocoder.yudao.module.basic.controller.admin.unit.vo.*; -import cn.iocoder.yudao.module.basic.dal.dataobject.unit.UnitDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -/** - * 单位 Service 接口 - * - * @author 芋道源码 - */ -public interface UnitService { - - /** - * 创建单位 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createUnit(@Valid UnitCreateReqVO createReqVO); - - /** - * 更新单位 - * - * @param updateReqVO 更新信息 - */ - void updateUnit(@Valid UnitUpdateReqVO updateReqVO); - - /** - * 删除单位 - * - * @param id 编号 - */ - void deleteUnit(Long id); - - /** - * 获得单位 - * - * @param id 编号 - * @return 商品 - */ - UnitDO getUnit(Long id); - - /** - * 获得单位列表 - * - * @param ids 编号 - * @return 商品列表 - */ - List getUnitList(Collection ids); - - /** - * 获得单位分页 - * - * @param pageReqVO 分页查询 - * @return 商品分页 - */ - PageResult getUnitPage(UnitPageReqVO pageReqVO); - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/unit/UnitServiceImpl.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/unit/UnitServiceImpl.java deleted file mode 100644 index f3f06ae..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/unit/UnitServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package cn.iocoder.yudao.module.basic.service.unit; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; -import cn.iocoder.yudao.module.basic.controller.admin.unit.vo.*; -import cn.iocoder.yudao.module.basic.dal.dataobject.unit.UnitDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import cn.iocoder.yudao.module.basic.convert.unit.UnitConvert; -import cn.iocoder.yudao.module.basic.dal.mysql.unit.UnitMapper; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.basic.enums.ErrorCodeConstants.*; - -/** - * 单位 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class UnitServiceImpl implements UnitService { - - @Resource - private UnitMapper unitMapper; - - @Override - public Long createUnit(UnitCreateReqVO createReqVO) { - //校验单位昵称是否重复 - validateUnitNameExists(createReqVO.getUnitName()); - // 插入 - UnitDO unit = UnitConvert.INSTANCE.convert(createReqVO); - unitMapper.insert(unit); - // 返回 - return unit.getId(); - } - - private void validateUnitNameExists(String unitName) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("unit_name",unitName); - if (unitMapper.selectOne(queryWrapper) != null){ - throw exception(UNIT_NAME_ALREADY_EXISTS); - } - } - - @Override - public void updateUnit(UnitUpdateReqVO updateReqVO) { - // 校验存在 - UnitDO unitInfo = unitMapper.selectById(updateReqVO.getId()); - if (unitInfo == null){ - throw exception(UNIT_NOT_EXISTS); - } - // 检查单位名称是否发生变化 - if (!Objects.equals(unitInfo.getUnitName(),updateReqVO.getUnitName())) { - //校验商户昵称的地块类型名称是否重复 - validateUnitNameExists(updateReqVO.getUnitName()); - } - // 更新 - UnitDO updateObj = UnitConvert.INSTANCE.convert(updateReqVO); - unitMapper.updateById(updateObj); - } - - @Override - public void deleteUnit(Long id) { - // 校验存在 - validateUnitExists(id); - // 删除 - unitMapper.deleteById(id); - } - - private void validateUnitExists(Long id) { - if (unitMapper.selectById(id) == null) { - throw exception(UNIT_NOT_EXISTS); - } - } - - @Override - public UnitDO getUnit(Long id) { - return unitMapper.selectById(id); - } - - @Override - public List getUnitList(Collection ids) { - return unitMapper.selectBatchIds(ids); - } - - @Override - public PageResult getUnitPage(UnitPageReqVO pageReqVO) { - return unitMapper.selectPage(pageReqVO); - } - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/resources/mapper/goodsinfo/GoodsInfoMapper.xml b/yudao-module-basic/yudao-module-basic-biz/src/main/resources/mapper/goodsinfo/GoodsInfoMapper.xml index 9f6f558..0929df9 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/resources/mapper/goodsinfo/GoodsInfoMapper.xml +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/resources/mapper/goodsinfo/GoodsInfoMapper.xml @@ -31,28 +31,22 @@ - SELECT - bii.id, bii.goods_id, bii.goods_name,bii.belong_business_id,bii.belong_business_name, - CASE - bii.goods_unit_id - WHEN 0 THEN - 'kg' - ELSE bu.unit_name - END goodsUnit - FROM basic_goods_info bii - LEFT JOIN basic_unit bu ON bii.goods_unit_id = bu.id - WHERE bii.deleted = 0 AND bii.belong_business_id = #{belongBusinessId} + SELECT bgi.id, + bgi.goods_id, + bgi.goods_name, + bgi.goods_specs, + bgi.belong_business_id, + bgi.belong_business_name + FROM basic_goods_info bgi + WHERE bgi.deleted = 0 + AND bgi.belong_business_id = #{belongBusinessId}