From 5ff24ff8328a2022bee90e525f82da713306720c Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 8 Jan 2025 16:29:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E8=8F=9C=E8=B0=B1app?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppUserAutoLoginController.java | 22 ++++-- .../api/feign/RemoteDailyMenuService.java | 70 +++++++++++++++++++ .../pjcloud/canteen/dto/app/DailyMenuDTO.java | 43 ++++++++++++ .../canteen/vo/app/DailyMenuAppVO.java | 41 +++++++++++ ...mework.cloud.openfeign.FeignClient.imports | 1 + .../CanteenDailyMenuController.java | 31 +++++++- .../service/CanteenDailyMenuService.java | 6 +- .../impl/CanteenDailyMenuServiceImpl.java | 55 ++++++++++++++- .../service/impl/CanteenSpuServiceImpl.java | 1 - 9 files changed, 261 insertions(+), 9 deletions(-) create mode 100644 pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteDailyMenuService.java create mode 100644 pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/app/DailyMenuDTO.java create mode 100644 pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java diff --git a/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java b/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java index 16be0b0cb..00b78b76b 100644 --- a/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java +++ b/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java @@ -18,6 +18,7 @@ package com.bsd.pjcloud.app.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.admin.api.dto.UserDTO; import com.bsd.pjcloud.admin.api.dto.UserTokenDTO; import com.bsd.pjcloud.admin.api.entity.SysUser; @@ -25,9 +26,12 @@ import com.bsd.pjcloud.admin.api.feign.RemoteTokenService; import com.bsd.pjcloud.admin.api.feign.RemoteUserService; import com.bsd.pjcloud.app.service.AppUserService; import com.bsd.pjcloud.canteen.api.feign.RemoteCanteenSpuService; +import com.bsd.pjcloud.canteen.api.feign.RemoteDailyMenuService; import com.bsd.pjcloud.canteen.api.feign.RemoteOnlineCanteenSpuService; +import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO; import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity; import com.bsd.pjcloud.canteen.vo.app.CanteenOnlineSpuAppVO; +import com.bsd.pjcloud.canteen.vo.app.DailyMenuAppVO; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.security.annotation.Inner; import com.bsd.pjcloud.thirdparty.api.feign.RemoterThirdPartyAuthService; @@ -51,6 +55,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import java.time.LocalDate; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -81,6 +86,7 @@ public class AppUserAutoLoginController { private final RemoteCanteenSpuService remoteCanteenSpuService; private final RemoteOnlineCanteenSpuService remoteOnlineCanteenSpuService; + private final RemoteDailyMenuService remoteDailyMenuService; /* * @@ -256,13 +262,21 @@ public class AppUserAutoLoginController { @Inner(value = false) public R info() { - R> spuListByIds = remoteOnlineCanteenSpuService.getSpuListByIds(Arrays.asList(1876870696924069890L)); -// +// R> spuListByIds = remoteOnlineCanteenSpuService.getSpuListByIds(Arrays.asList(1876870696924069890L)); + // R> spuListByIds = remoteCanteenSpuService.getSpuListByIds(Arrays.asList(1876517188510273537L, 1866411313032441857L)); - List data = spuListByIds.getData(); +// List data = spuListByIds.getData(); - return R.ok(data); + Page objectPage = new Page<>(); + objectPage.setCurrent(1); + objectPage.setSize(10); + DailyMenuDTO dailyMenuDTO = new DailyMenuDTO(); + dailyMenuDTO.setMerchantId(16L); + dailyMenuDTO.setStartTime(LocalDate.of(2024,12,16)); + R pageR = remoteDailyMenuService.selectTimeFoodPage(objectPage, dailyMenuDTO); + + return R.ok(pageR); } // // /** diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteDailyMenuService.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteDailyMenuService.java new file mode 100644 index 000000000..a0333e12b --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteDailyMenuService.java @@ -0,0 +1,70 @@ +/* + * + * Copyright (c) 2018-2025, pjcloud All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: pjcloud + * + */ + +package com.bsd.pjcloud.canteen.api.feign; + + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO; +import com.bsd.pjcloud.canteen.dto.DailyMenuAll; +import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO; +import com.bsd.pjcloud.canteen.vo.APPOnlineSpuVO; +import com.bsd.pjcloud.canteen.vo.app.CanteenOnlineSpuAppVO; +import com.bsd.pjcloud.common.core.constant.ServiceNameConstants; +import com.bsd.pjcloud.common.core.util.R; +import io.swagger.v3.oas.annotations.Operation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +/** + * @author zjf + * @date 2018/6/22 + */ +@FeignClient(contextId = "remoteDailyMenuService", value = ServiceNameConstants.CANTEEN_SERVICE) +public interface RemoteDailyMenuService { + + + /** + * app每日菜谱分页查询 + * @return + */ + @PostMapping("/canteenDailyMenu/app/page") + R selectTimeFoodPage(@RequestParam Page page, @RequestBody @Validated DailyMenuDTO dailyMenuDTO); + + + + + /** + * 取当天指定菜品 + * @return ids + */ + @GetMapping("/canteenDailyMenu/app/selectTimeFood") + R> selectTimeFoodAPP(@RequestParam("time") String time, + @RequestParam("merchantId") Long merchantId, + @RequestParam("categoryId") Long categoryId); + +} diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/app/DailyMenuDTO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/app/DailyMenuDTO.java new file mode 100644 index 000000000..986a33aa0 --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/app/DailyMenuDTO.java @@ -0,0 +1,43 @@ +package com.bsd.pjcloud.canteen.dto.app; + + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; + +@Schema(description = "app 每日菜谱分页列表") +@Data +@ToString(callSuper = true) +public class DailyMenuDTO { + + @Schema(description = "开始时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @NotNull + private LocalDate startTime; + + @Schema(description = "商品 SPU 编号", example = "21292") + private Long spuId; + + /** + * 商户 + */ + @NotNull + private Long merchantId; + /** + * 商品分类编号 + * + */ + private Long categoryId; + + /** + * 时间类型 + */ + @Schema(description = "时间类型") + private Integer hourType; + +} diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java new file mode 100644 index 000000000..70ed64b1c --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java @@ -0,0 +1,41 @@ +package com.bsd.pjcloud.canteen.vo.app; + +import lombok.Data; + +@Data +public class DailyMenuAppVO { + + + private Long id; + + /** + * 菜品id + */ + private Long spuId; + + /** + * 菜品名称 + */ + private String name; + /** + * 商品价格，单位使用：分 + */ + private Integer price; + /** + * 菜品分类编号 + */ + private Long categoryId; + /** + * 菜品封面图 + */ + private String picUrl; + /** + * 库存 + */ + private Integer stock; + + /** + * 时间类型 + */ + private Integer hourType; +} diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports b/pjcloud-canteen/pjcloud-canteen-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports index f65c6ae23..31ad18645 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports @@ -2,4 +2,5 @@ com.bsd.pjcloud.canteen.api.feign.RemoteCanteenCategoryService com.bsd.pjcloud.canteen.api.feign.RemoteCanteenOnlineCategoryService com.bsd.pjcloud.canteen.api.feign.RemoteCanteenSpuService com.bsd.pjcloud.canteen.api.feign.RemoteOnlineCanteenSpuService +com.bsd.pjcloud.canteen.api.feign.RemoteDailyMenuService diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java index 8de7253ae..b74a1ba8b 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.canteen.dto.DailyMenuAll; +import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO; import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity; import com.bsd.pjcloud.canteen.service.CanteenSpuService; import com.bsd.pjcloud.common.core.util.R; @@ -24,6 +25,7 @@ import org.springframework.http.HttpHeaders; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -170,14 +172,39 @@ public class CanteenDailyMenuController { } -// ---------APP------------ +// ---------AD------------ @GetMapping("/ad/getCanteenList") @SysLog("查询每日菜品列表") public R getCanteenList(@RequestParam("day") String day, @RequestParam(value = "hourType", required = false) Integer hourType, @RequestParam(value = "categoryId", required = false) Long categoryId) { - return R.ok(canteenDailyMenuService.getCanteenMenuList(day,hourType,categoryId)); + return R.ok(canteenDailyMenuService.getCanteenMenuListScope(day,hourType,categoryId)); } +// --------------APP--------------- + + + /** + * 获取分页菜品 + */ + @Operation(summary = "分页查询" , description = "分页查询" ) + @PostMapping("/app/page") + public R selectTimeFoodPage(@ParameterObject Page page, @RequestBody @Validated DailyMenuDTO dailyMenuDTO) { + return R.ok(canteenDailyMenuService.selectTimeFoodPage(page,dailyMenuDTO)); + } + + + /** + * 获取当天指定菜品 + */ + @GetMapping("/app/selectTimeFood") + public R> selectTimeFoodAPP(@RequestParam("time") String time, + @RequestParam("merchantId") Long merchantId, + @RequestParam("categoryId") Long categoryId) { + if (ObjectUtil.isEmpty(time)) { + time = DateUtil.today(); + } + return R.ok(canteenDailyMenuService.selectTimeFood(time, merchantId, categoryId)); + } } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java index d3596762a..62f331959 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java @@ -1,7 +1,9 @@ package com.bsd.pjcloud.canteen.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.canteen.dto.DailyMenuAll; +import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO; import com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity; import java.util.List; @@ -37,5 +39,7 @@ public interface CanteenDailyMenuService extends IService implements CanteenDailyMenuService { + + private final CanteenSpuService canteenSpuService; @Override public List selectTimeFood(String time, Long merchantId, Long categoryId) { List dailyMenuAllES = new ArrayList<>(); @@ -92,7 +103,49 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl canteenDailyMenuEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + canteenDailyMenuEntityLambdaQueryWrapper.eq(CanteenDailyMenuEntity::getMerchantId, dailyMenuDTO.getMerchantId()); + canteenDailyMenuEntityLambdaQueryWrapper.eq(CanteenDailyMenuEntity::getStartTime, dailyMenuDTO.getStartTime()); + canteenDailyMenuEntityLambdaQueryWrapper.eq(dailyMenuDTO.getHourType() != null, + CanteenDailyMenuEntity::getHourType, dailyMenuDTO.getHourType()); + Page pageData = baseMapper.selectPage(page, canteenDailyMenuEntityLambdaQueryWrapper); + List canteenDailyMenuEntities = pageData.getRecords(); + if (CollectionUtils.isNotEmpty(canteenDailyMenuEntities)) { + List spuIds = canteenDailyMenuEntities.stream().map(CanteenDailyMenuEntity::getSpuId).distinct().collect(Collectors.toList()); + LambdaQueryWrapper onlineFoodSpuDOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + onlineFoodSpuDOLambdaQueryWrapper.eq(null!=dailyMenuDTO.getCategoryId(),CanteenSpuEntity::getCategoryId, dailyMenuDTO.getCategoryId()); + onlineFoodSpuDOLambdaQueryWrapper.in(CanteenSpuEntity::getId, spuIds); + List canteenSpuEntities = canteenSpuService.list(onlineFoodSpuDOLambdaQueryWrapper); + // 按 id 分组成 Map + Map spuEntityMap = canteenSpuEntities.stream() + .collect(Collectors.toMap(CanteenSpuEntity::getId, spu -> spu)); + // 构造新的 VO 列表 + List dailyMenuVOList = canteenDailyMenuEntities.stream() + .map(menu -> { + DailyMenuAppVO vo = new DailyMenuAppVO(); + BeanUtils.copyProperties(menu, vo); // 拷贝通用属性 + CanteenSpuEntity spuEntity = spuEntityMap.get(menu.getSpuId()); + if (spuEntity != null) { + vo.setSpuId(spuEntity.getId()); + vo.setStock(spuEntity.getStock()); + vo.setPrice(spuEntity.getPrice()); + vo.setPicUrl(spuEntity.getPicUrl()); + vo.setName(spuEntity.getName()); + // 其他需要的字段 + } + return vo; + }) + .collect(Collectors.toList()); + pageData.setRecords(dailyMenuVOList); + return pageData; + } + + return null; + } } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java index e8d924887..58fccccda 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java @@ -28,7 +28,6 @@ import java.util.List; @AllArgsConstructor public class CanteenSpuServiceImpl extends ServiceImpl implements CanteenSpuService { - private final CanteenDailyMenuService coupleDailyMenuService; @Override public Object selectFoodList(LambdaQueryWrapper wrapper) { return baseMapper.selectListByScope(wrapper, DataScope.of()); From 1bd1df932bfda6417a99a17766d0b872cda9eb38 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 8 Jan 2025 16:46:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/entity/CanteenOnlineSpuEntity.java | 8 ++++---- .../bsd/pjcloud/canteen/entity/CanteenSpuEntity.java | 12 ++++++------ .../canteen/vo/app/CanteenOnlineSpuAppVO.java | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenOnlineSpuEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenOnlineSpuEntity.java index 5b8d5ee2e..6aaefe529 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenOnlineSpuEntity.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenOnlineSpuEntity.java @@ -87,16 +87,16 @@ public class CanteenOnlineSpuEntity extends Model { * 商品价格，单位使用：分 */ @Schema(description="商品价格，单位使用：分") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer price; /** * 市场价，单位使用：分 */ @Schema(description="市场价，单位使用：分") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer marketPrice; /** diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java index a5e9364b6..99ab8767e 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java @@ -93,24 +93,24 @@ public class CanteenSpuEntity extends Model { * 商品价格，单位使用：分 */ @Schema(description="商品价格，单位使用：分") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer price; /** * 市场价，单位使用：分 */ @Schema(description="市场价，单位使用：分") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer marketPrice; /** * 成本价，单位： 分 */ @Schema(description="成本价，单位： 分") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer costPrice; /** diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/CanteenOnlineSpuAppVO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/CanteenOnlineSpuAppVO.java index f459eae5e..131f6055f 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/CanteenOnlineSpuAppVO.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/CanteenOnlineSpuAppVO.java @@ -74,16 +74,16 @@ public class CanteenOnlineSpuAppVO { * 商品价格，单位使用：分 */ @Schema(description="商品价格，单位使用：分") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer price; /** * 市场价，单位使用：分 */ @Schema(description="市场价，单位使用：分") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer marketPrice; /**