From 3f8f24c1ed91162e3c1bc6f05effeb6ec622669e Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 10 Jan 2025 14:16:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=A1=AC=E4=BB=B6=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hard/api/dto/hard/HardBindDto.java | 4 +- .../pjcloud/hard/api/vo/HardManagerVo.java | 4 ++ .../controller/hard/HardApiController.java | 2 +- .../hard/service/HardManagerService.java | 2 + .../service/impl/HardManagerServiceImpl.java | 10 ++++- .../impl/order/HardCarServiceImpl.java | 6 +-- .../vo/SupermarketUnitWithSpuVo.java | 37 ++++++++++--------- .../mapper/SupermarketUnitMapper.xml | 2 + .../controller/MchManageController.java | 1 - 9 files changed, 43 insertions(+), 25 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/hard/HardBindDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/hard/HardBindDto.java index dd33cd611..85ae493ab 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/hard/HardBindDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/hard/HardBindDto.java @@ -11,7 +11,7 @@ public class HardBindDto { @NotNull(message = "设备ID") private Long id; - @Schema(description = "mac地址", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "mac地址") + @Schema(description = "android唯一标识", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "android唯一标识") private String uniqueCode; } diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardManagerVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardManagerVo.java index 85cd91a54..ee3cba814 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardManagerVo.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardManagerVo.java @@ -8,6 +8,10 @@ import lombok.Data; @Data public class HardManagerVo extends HardManagerEntity implements BaseDeptInterface, BaseMchInterface { + /** + * android重点使用 + */ + private Long merchantDeptId; private String deptName; diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/hard/HardApiController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/hard/HardApiController.java index d30f56395..900ec7cc0 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/hard/HardApiController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/hard/HardApiController.java @@ -44,7 +44,7 @@ public class HardApiController { @GetMapping("/get") @Operation(summary = "获取硬件配置信息") public R get(@RequestParam Long id) { - return R.ok(BeanUtils.toBean(hardManagerService.getById(id), HardManagerVo.class)); + return R.ok(hardManagerService.getById(id)); } @GetMapping("/get-by-order-id") diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardManagerService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardManagerService.java index a946f4500..1830ca1e3 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardManagerService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardManagerService.java @@ -16,4 +16,6 @@ public interface HardManagerService extends IService { void edit(HardManagerDto dto); HardManagerVo bind(HardBindDto dto); + + HardManagerVo getById(Long hardId); } \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java index f2ee29b02..a9857db11 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java @@ -109,7 +109,15 @@ public class HardManagerServiceImpl extends ServiceImpl supList = supermarketUnitSkuService.getSupermarketUnits(productIds).getData(); for (HardCreateCarDto v : list) { supList.stream().filter(i -> ObjectUtil.equals(i.getId(), v.getProductId())).findFirst().ifPresent(spu -> { - int itemTotalPrice = v.getProductCount() * spu.getRetailPrice(); + int itemTotalPrice = v.getProductCount() * spu.getPromotionPrice(); supermarketTotalPrice.addAndGet(itemTotalPrice); }); } @@ -192,10 +192,10 @@ public class HardCarServiceImpl extends ServiceImpl ObjectUtil.equals(i.getId(), v.getProductId())).findFirst().ifPresent(spu -> { - int totalPrice = v.getProductCount() * spu.getRetailPrice(); + int totalPrice = v.getProductCount() * spu.getPromotionPrice(); item.setProductId(spu.getId()); item.setProductName(spu.getProductName()); - item.setProductPrice(spu.getRetailPrice()); + item.setProductPrice(spu.getPromotionPrice()); item.setProductPic(spu.getPicUrl()); item.setTotalPrice((long) totalPrice); item.setProductCount(v.getProductCount()); diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitWithSpuVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitWithSpuVo.java index a536ad029..b1ff47581 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitWithSpuVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitWithSpuVo.java @@ -16,40 +16,39 @@ public class SupermarketUnitWithSpuVo { /** * 货号 */ - @Schema(description="货号") + @Schema(description = "货号") private String productCode; /** * 自编码/条码 */ - @Schema(description="自编码/条码") + @Schema(description = "自编码/条码") private String barcode; /** * 商品封面图 */ - @Schema(description="商品封面图") + @Schema(description = "商品封面图") private String picUrl; /** * 商品名称 */ - @Schema(description="商品名称") + @Schema(description = "商品名称") private String productName; /** * 商品分类编号 */ - @Schema(description="商品分类编号") + @Schema(description = "商品分类编号") private Long categoryId; - /** * 品牌id */ - @Schema(description="品牌id") + @Schema(description = "品牌id") private Long brandId; @@ -60,43 +59,43 @@ public class SupermarketUnitWithSpuVo { * 包装单位id */ @TableId(type = IdType.ASSIGN_ID) - @Schema(description="包装单位id") + @Schema(description = "包装单位id") private Long id; /** * 条码 */ - @Schema(description="条码") + @Schema(description = "条码") private String barCode; /** * 规格 */ - @Schema(description="规格") + @Schema(description = "规格") private String spec; /** * 单位 */ - @Schema(description="单位") + @Schema(description = "单位") private String unit; /** * 状态(0正常，1停销) */ - @Schema(description="状态(0正常，1停销)") + @Schema(description = "状态(0正常，1停销)") private Integer status; /** * 内装数量 */ - @Schema(description="内装数量") + @Schema(description = "内装数量") private Integer packageNum; /** * 进价/单位分 */ - @Schema(description="进价") + @Schema(description = "进价") @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer purchasePrice; @@ -104,17 +103,21 @@ public class SupermarketUnitWithSpuVo { /** * 零售价/单位分 */ - @Schema(description="零售价") + @Schema(description = "零售价") @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer retailPrice; + /** + * 促销价 + */ + private Integer promotionPrice; + /** * spuID */ - @Schema(description="spuID") + @Schema(description = "spuID") private Long spuId; - } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketUnitMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketUnitMapper.xml index 0406d40e0..209e7caf3 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketUnitMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketUnitMapper.xml @@ -38,6 +38,7 @@ +