From de13e25f055d631e9a0bcf900b93533b314cff95 Mon Sep 17 00:00:00 2001 From: zengtao01 Date: Mon, 22 Jul 2024 17:44:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/business/vo/BusinessRespVO.java | 3 +++ .../system/controller/admin/devuce/DevuceController.java | 4 ++-- .../system/controller/app/devuce/vo/DevuceReqVO.java | 3 +++ .../module/system/dal/mysql/devuce/DevuceMapper.java | 8 +++++--- .../yudao/module/system/service/devuce/DevuceService.java | 2 +- .../module/system/service/devuce/DevuceServiceImpl.java | 7 ++++--- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/BusinessRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/BusinessRespVO.java index b518f69c..993acb37 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/BusinessRespVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/BusinessRespVO.java @@ -65,4 +65,7 @@ public class BusinessRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + private Long carteenId; + + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/DevuceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/DevuceController.java index c0ebd577..e2c30dfd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/DevuceController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/DevuceController.java @@ -30,7 +30,7 @@ public class DevuceController { @GetMapping("/get") @Operation(summary = "获取菜品剩余重量") - public CommonResult> get() { - return success(devuceService.getList()); + public CommonResult> get(Long storeId) { + return success(devuceService.getList(storeId)); } } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/vo/DevuceReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/vo/DevuceReqVO.java index c64726d9..8d6e54b2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/vo/DevuceReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/vo/DevuceReqVO.java @@ -14,4 +14,7 @@ public class DevuceReqVO { @Schema(description = "剩余重量") private BigDecimal remWeight; + @Schema(description = "菜品总重量") + private BigDecimal totalWeight; + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/devuce/DevuceMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/devuce/DevuceMapper.java index d68656e1..d99354b5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/devuce/DevuceMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/devuce/DevuceMapper.java @@ -29,7 +29,9 @@ public interface DevuceMapper extends BaseMapperX { .orderByDesc(DevuceDO::getId)); } - @Select("select de.*,di.dishes_name from t_devuce de left join t_dishes di on de.dishes_id = di.id\n" + - "where bind = true") - List getList(); + @Select(" select de.*,di.dishes_name from t_devuce de\n" + + " left join t_device_info dn on de.device_sn = dn.device_ip\n" + + " left join t_dishes di on de.dishes_id = di.id\n" + + " where bind = true and de.deleted = false and dn.carteen_id = #{storeId}") + List getList(Long storeId); } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java index abd1c328..3b8ec175 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java @@ -90,7 +90,7 @@ public interface DevuceService { List getDishesNutrition(Long dishesId,String cId); void updateWeight(DevuceReqVO updateReqVO); - List getList(); + List getList(Long storeId); } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java index 73b8efea..ebcd5fa5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java @@ -237,14 +237,15 @@ public class DevuceServiceImpl implements DevuceService { public void updateWeight(DevuceReqVO updateReqVO) { String hearder = this.getHearder(); devuceMapper.update(new DevuceDO(),new LambdaUpdateWrapper() - .set(DevuceDO::getRemWeight,updateReqVO.getRemWeight()) + .set(updateReqVO.getRemWeight()!=null,DevuceDO::getRemWeight,updateReqVO.getRemWeight()) + .set(updateReqVO.getTotalWeight()!=null,DevuceDO::getTotalWeight,updateReqVO.getTotalWeight()) .eq(DevuceDO::getDeviceSn,hearder) .eq(DevuceDO::getBind,true)); } @Override - public List getList() { - List list = devuceMapper.getList(); + public List getList(Long storeId) { + List list = devuceMapper.getList(storeId); return list; }