diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodsinventory/StoreGoodsInventoryController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodsinventory/StoreGoodsInventoryController.java index b772072b..6cda34ca 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodsinventory/StoreGoodsInventoryController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodsinventory/StoreGoodsInventoryController.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.member.controller.admin.storegoodsinventory; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -89,7 +90,7 @@ public class StoreGoodsInventoryController { StoreGoodsInventoryDO storeGoodsInventory = storeGoodsInventoryService.getStoreGoodsInventory(id); StoreGoodsInventoryRespVO bean = BeanUtils.toBean(storeGoodsInventory, StoreGoodsInventoryRespVO.class); StoreGoodsDO storeGoods = storeGoodsService.getStoreGoods(storeGoodsInventory.getGoodsId()); - bean.setGoodsInfo(storeGoods); + BeanUtil.copyProperties(storeGoods, bean); return success(bean); } @@ -105,7 +106,7 @@ public class StoreGoodsInventoryController { List all = storeGoodsService.getAll(goodsList); Map collect = all.stream().collect(Collectors.toMap(StoreGoodsDO::getGoodsId, a -> a)); for (StoreGoodsInventoryRespVO vo:list){ - vo.setGoodsInfo(collect.get(vo.getGoodsId())); + BeanUtil.copyProperties(collect.get(vo.getGoodsId()), vo); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodsinventory/vo/StoreGoodsInventoryRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodsinventory/vo/StoreGoodsInventoryRespVO.java index 6d093590..9058526b 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodsinventory/vo/StoreGoodsInventoryRespVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodsinventory/vo/StoreGoodsInventoryRespVO.java @@ -38,8 +38,37 @@ public class StoreGoodsInventoryRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; - @Schema(description = "商品ID", example = "16735") + /** + * 类别Id + */ @ExcelIgnore - private StoreGoodsDO goodsInfo; + private Integer categoryId; + /** + * 商品名称 + */ + @ExcelIgnore + private String goodsName; + /** + * 价格 + */ + @ExcelIgnore + private Double price; + /** + * 售卖模式 + */ + @ExcelIgnore + private Integer salesModel; + + /** + * 库存 + */ + @ExcelIgnore + private Integer inventory; + + /** + * 图片 + */ + @ExcelIgnore + private String img; } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/StoreOrderController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/StoreOrderController.java index b0cd4343..b0a2b7df 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/StoreOrderController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/StoreOrderController.java @@ -125,7 +125,7 @@ public class StoreOrderController { } @PostMapping("/customize") - @Operation(summary = "自定义") + @Operation(summary = "自定义扣款") public CommonResult customize(@RequestBody StoreOrderDto dto){ storeOrderService.customize(dto); return CommonResult.success(true); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storegoodsinventory/StoreGoodsInventoryServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storegoodsinventory/StoreGoodsInventoryServiceImpl.java index 937ef9dc..c94e44eb 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storegoodsinventory/StoreGoodsInventoryServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storegoodsinventory/StoreGoodsInventoryServiceImpl.java @@ -61,11 +61,12 @@ public class StoreGoodsInventoryServiceImpl implements StoreGoodsInventoryServic storeGoodsInventoryDO.setWeight(storeGoodsInventoryDO.getWeight() + vo.getWeight()); storeGoodsInventoryMapper.updateById(storeGoodsInventoryDO); id = storeGoodsInventoryDO.getId(); - } else { - StoreGoodsInventoryDO storeGoodsInventory = BeanUtils.toBean(createReqVO, StoreGoodsInventoryDO.class); - storeGoodsInventoryMapper.insert(storeGoodsInventory); - id = storeGoodsInventory.getId(); } +// else { +// StoreGoodsInventoryDO storeGoodsInventory = BeanUtils.toBean(createReqVO, StoreGoodsInventoryDO.class); +// storeGoodsInventoryMapper.insert(storeGoodsInventory); +// id = storeGoodsInventory.getId(); +// } } else {// 出库 if (CollectionUtil.isEmpty(storeGoodsInventoryDOS)) { throw exception(STORE_GOODS_INVENTORY_NOT_EXISTS);