zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/test'

Browse Source
This commit is contained in:
zengtao01
2024-07-22 17:55:53 +08:00
parent 60bcdc8bc5 de13e25f05
commit edde6c07be
6 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/BusinessRespVO.java
View File

@ -65,4 +65,7 @@ public class BusinessRespVO {
@ExcelProperty("创建时间")
private LocalDateTime createTime;
private Long carteenId;
}

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/DevuceController.java
View File

@ -30,7 +30,7 @@ public class DevuceController {
@GetMapping("/get")
@Operation(summary = "获取菜品剩余重量")
public CommonResult<List<DevuceListVO>> get() {
return success(devuceService.getList());
public CommonResult<List<DevuceListVO>> get(Long storeId) {
return success(devuceService.getList(storeId));
}
}

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/vo/DevuceReqVO.java
View File

@ -14,4 +14,7 @@ public class DevuceReqVO {
@Schema(description = "剩余重量")
private BigDecimal remWeight;
@Schema(description = "菜品总重量")
private BigDecimal totalWeight;
}

8
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/devuce/DevuceMapper.java
View File

@ -29,7 +29,9 @@ public interface DevuceMapper extends BaseMapperX<DevuceDO> {
.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<DevuceListVO> 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<DevuceListVO> getList(Long storeId);
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java
View File

@ -90,7 +90,7 @@ public interface DevuceService {
List<Map> getDishesNutrition(Long dishesId,String cId);
void updateWeight(DevuceReqVO updateReqVO);
List<DevuceListVO> getList();
List<DevuceListVO> getList(Long storeId);
}

7
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
View File

@ -237,14 +237,15 @@ public class DevuceServiceImpl implements DevuceService {
public void updateWeight(DevuceReqVO updateReqVO) {
String hearder = this.getHearder();
devuceMapper.update(new DevuceDO(),new LambdaUpdateWrapper<DevuceDO>()
.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<DevuceListVO> getList() {
List<DevuceListVO> list = devuceMapper.getList();
public List<DevuceListVO> getList(Long storeId) {
List<DevuceListVO> list = devuceMapper.getList(storeId);
return list;
}