diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BalanceDeductionJob.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BalanceDeductionJob.java index cdda97f2..10223fa8 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BalanceDeductionJob.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BalanceDeductionJob.java @@ -13,7 +13,6 @@ import cn.iocoder.yudao.module.member.service.diningplates.DiningPlatesService; import cn.iocoder.yudao.module.member.service.order.OrderService; import cn.iocoder.yudao.module.member.service.user.MemberUserService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -71,7 +70,7 @@ public class BalanceDeductionJob implements JobHandler { toPay.forEach(dishOrderDO -> { //新的总价 String s = stringRedisTemplate.opsForValue().get(dishOrderDO.getDiningPlatesNum() + "-" + dishOrderDO.getStoreId()); - BigDecimal total = new BigDecimal(StrUtil.isBlank(s)?"0":s); + BigDecimal total = new BigDecimal(StrUtil.isBlank(s) ? "0" : s); //BigDecimal total = new BigDecimal(0.01); Long userId = dishOrderDO.getUserId(); CardDO cardDO = new CardDO(); @@ -89,12 +88,12 @@ public class BalanceDeductionJob implements JobHandler { dishOrderDO.setReductionState(reductionAmount.compareTo(BigDecimal.ZERO) > 0 ? "1" : "0"); //计算减免后的总价 - if(total.compareTo(reductionAmount)<0){ + if (total.compareTo(reductionAmount) < 0) { total = BigDecimal.ZERO; - }else { + } else { total = total.subtract(reductionAmount); } - + BigDecimal wxAmount = oldCardDO.getWxAmount(); BigDecimal giftAmount = oldCardDO.getGiftAmount(); BigDecimal cashAmount = oldCardDO.getCashAmount(); @@ -119,26 +118,25 @@ public class BalanceDeductionJob implements JobHandler { } else { dishOrderDO.setOrderStatus(DishOrderDO.COMPLETE); //计算金额 - if (total.compareTo(wxAmount) <= 0) { - cardDO.setWxAmount(wxAmount.subtract(total).setScale(2, BigDecimal.ROUND_HALF_UP)); - dishOrderDO.setWxAmount(total); + if (total.compareTo(cashAmount) <= 0) { + cardDO.setCashAmount(cashAmount.subtract(total).setScale(2, BigDecimal.ROUND_HALF_UP)); + dishOrderDO.setCashAmount(total); } else { - cardDO.setWxAmount(BigDecimal.ZERO); - dishOrderDO.setWxAmount(wxAmount); - BigDecimal total1 = total.subtract(wxAmount).setScale(2, BigDecimal.ROUND_HALF_UP); - if (total1.compareTo(cashAmount) <= 0) { - cardDO.setCashAmount(cashAmount.subtract(total1).setScale(2, BigDecimal.ROUND_HALF_UP)); - dishOrderDO.setCashAmount(total1); + cardDO.setCashAmount(BigDecimal.ZERO); + dishOrderDO.setCashAmount(cashAmount); + BigDecimal total1 = total.subtract(cashAmount).setScale(2, BigDecimal.ROUND_HALF_UP); + if (total1.compareTo(giftAmount) <= 0) { + cardDO.setGiftAmount(giftAmount.subtract(total1).setScale(2, BigDecimal.ROUND_HALF_UP)); + dishOrderDO.setGiftAmount(total1); } else { - cardDO.setCashAmount(BigDecimal.ZERO); - dishOrderDO.setCashAmount(cashAmount); - BigDecimal total2 = total1.subtract(cashAmount).setScale(2, BigDecimal.ROUND_HALF_UP); + cardDO.setGiftAmount(BigDecimal.ZERO); + dishOrderDO.setGiftAmount(giftAmount); + BigDecimal total2 = total1.subtract(giftAmount).setScale(2, BigDecimal.ROUND_HALF_UP); - cardDO.setGiftAmount(giftAmount.subtract(total2).setScale(2, BigDecimal.ROUND_HALF_UP)); - dishOrderDO.setGiftAmount(total2); + cardDO.setWxAmount(wxAmount.subtract(total2).setScale(2, BigDecimal.ROUND_HALF_UP)); + dishOrderDO.setWxAmount(total2); } } - } cardDO.setUserId(userId); @@ -149,7 +147,7 @@ public class BalanceDeductionJob implements JobHandler { dishOrderDO.setTotalMoney(total); dishOrderDO.setUpdateTime(LocalDateTime.now()); - stringRedisTemplate.delete(dishOrderDO.getDiningPlatesNum()+ "-" + dishOrderDO.getStoreId()); + stringRedisTemplate.delete(dishOrderDO.getDiningPlatesNum() + "-" + dishOrderDO.getStoreId()); }); //取消批量，防止同一人订餐少扣款 //cardService.insertBatch(list); @@ -164,4 +162,29 @@ public class BalanceDeductionJob implements JobHandler { return String.format("扣款定时任务扣款数量 %s 个", size); } + + public void test() { + //计算金额 + //if (total.compareTo(wxAmount) <= 0) { + // cardDO.setWxAmount(wxAmount.subtract(total).setScale(2, BigDecimal.ROUND_HALF_UP)); + // dishOrderDO.setWxAmount(total); + //} else { + // cardDO.setWxAmount(BigDecimal.ZERO); + // dishOrderDO.setWxAmount(wxAmount); + // BigDecimal total1 = total.subtract(wxAmount).setScale(2, BigDecimal.ROUND_HALF_UP); + // if (total1.compareTo(cashAmount) <= 0) { + // cardDO.setCashAmount(cashAmount.subtract(total1).setScale(2, BigDecimal.ROUND_HALF_UP)); + // dishOrderDO.setCashAmount(total1); + // } else { + // cardDO.setCashAmount(BigDecimal.ZERO); + // dishOrderDO.setCashAmount(cashAmount); + // BigDecimal total2 = total1.subtract(cashAmount).setScale(2, BigDecimal.ROUND_HALF_UP); + // + // cardDO.setGiftAmount(giftAmount.subtract(total2).setScale(2, BigDecimal.ROUND_HALF_UP)); + // dishOrderDO.setGiftAmount(total2); + // } + //} + //计算金 + } + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java index 0801e30c..a74c2d0f 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java @@ -200,17 +200,17 @@ public class StoreOrderServiceImpl implements StoreOrderService { cardDO.setMoney(money.subtract(total).setScale(2, BigDecimal.ROUND_HALF_UP)); //计算金额 - if (total.compareTo(wxAmount) <= 0) { - cardDO.setWxAmount(wxAmount.subtract(total).setScale(2, BigDecimal.ROUND_HALF_UP)); + if (total.compareTo(cashAmount) <= 0) { + cardDO.setCashAmount(cashAmount.subtract(total).setScale(2, BigDecimal.ROUND_HALF_UP)); } else { - cardDO.setWxAmount(BigDecimal.ZERO); - BigDecimal total1 = total.subtract(wxAmount).setScale(2, BigDecimal.ROUND_HALF_UP); - if (total1.compareTo(cashAmount) <= 0) { - cardDO.setCashAmount(cashAmount.subtract(total1).setScale(2, BigDecimal.ROUND_HALF_UP)); + cardDO.setCashAmount(BigDecimal.ZERO); + BigDecimal total1 = total.subtract(cashAmount).setScale(2, BigDecimal.ROUND_HALF_UP); + if (total1.compareTo(giftAmount) <= 0) { + cardDO.setGiftAmount(giftAmount.subtract(total1).setScale(2, BigDecimal.ROUND_HALF_UP)); } else { - cardDO.setCashAmount(BigDecimal.ZERO); - BigDecimal total2 = total1.subtract(cashAmount).setScale(2, BigDecimal.ROUND_HALF_UP); - cardDO.setGiftAmount(giftAmount.subtract(total2).setScale(2, BigDecimal.ROUND_HALF_UP)); + cardDO.setGiftAmount(BigDecimal.ZERO); + BigDecimal total2 = total1.subtract(giftAmount).setScale(2, BigDecimal.ROUND_HALF_UP); + cardDO.setWxAmount(wxAmount.subtract(total2).setScale(2, BigDecimal.ROUND_HALF_UP)); } } @@ -221,4 +221,21 @@ public class StoreOrderServiceImpl implements StoreOrderService { return cardDO.getMoney(); } + + public void test(){ + //计算金额 + //if (total.compareTo(wxAmount) <= 0) { + // cardDO.setWxAmount(wxAmount.subtract(total).setScale(2, BigDecimal.ROUND_HALF_UP)); + //} else { + // cardDO.setWxAmount(BigDecimal.ZERO); + // BigDecimal total1 = total.subtract(wxAmount).setScale(2, BigDecimal.ROUND_HALF_UP); + // if (total1.compareTo(cashAmount) <= 0) { + // cardDO.setCashAmount(cashAmount.subtract(total1).setScale(2, BigDecimal.ROUND_HALF_UP)); + // } else { + // cardDO.setCashAmount(BigDecimal.ZERO); + // BigDecimal total2 = total1.subtract(cashAmount).setScale(2, BigDecimal.ROUND_HALF_UP); + // cardDO.setGiftAmount(giftAmount.subtract(total2).setScale(2, BigDecimal.ROUND_HALF_UP)); + // } + //} + } } \ 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/dishes/DishesAppController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dishes/DishesAppController.java index a50e767d..a8e61dce 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dishes/DishesAppController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dishes/DishesAppController.java @@ -5,6 +5,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.system.controller.admin.dishes.vo.DishesPageReqVO; import cn.iocoder.yudao.module.system.controller.admin.dishes.vo.DishesRespVO; +import cn.iocoder.yudao.module.system.controller.app.dishes.vo.AppSaveVO; +import cn.iocoder.yudao.module.system.controller.app.dishes.vo.AppUpdateVO; import cn.iocoder.yudao.module.system.dal.dataobject.dishes.DishesDO; import cn.iocoder.yudao.module.system.service.dishes.DishesService; import cn.iocoder.yudao.module.system.service.dishesnutrition.DishesNutritionService; @@ -13,6 +15,9 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; 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.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -34,20 +39,18 @@ public class DishesAppController { @Resource private DishesNutritionService dishesNutritionService; -// @PostMapping("/create") -// @Operation(summary = "创建菜品管理") -//// @PreAuthorize("@ss.hasPermission('t:dishes:create')") -// public CommonResult createDishes(@Valid @RequestBody DishesSaveReqVO createReqVO) { -// return success(dishesService.createDishes(createReqVO)); -// } -// -// @PutMapping("/update") -// @Operation(summary = "更新菜品管理") -//// @PreAuthorize("@ss.hasPermission('t:dishes:update')") -// public CommonResult updateDishes(@Valid @RequestBody DishesSaveReqVO updateReqVO) { -// dishesService.updateDishes(updateReqVO); -// return success(true); -// } + @PostMapping("/create") + @Operation(summary = "创建菜品管理") + public CommonResult createDishes(@Valid @RequestBody AppSaveVO vo) { + return success(dishesService.createDishesApp(vo)); + } + + @PutMapping("/update") + @Operation(summary = "更新菜品管理") + public CommonResult updateDishes(@RequestBody AppUpdateVO vo) { + dishesService.updateDishesApp(vo); + return success(true); + } // @DeleteMapping("/delete") // @Operation(summary = "删除菜品管理") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dishes/vo/AppSaveVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dishes/vo/AppSaveVO.java new file mode 100644 index 00000000..0345faa3 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dishes/vo/AppSaveVO.java @@ -0,0 +1,25 @@ +package cn.iocoder.yudao.module.system.controller.app.dishes.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author zt + * @description + * @since 2024/10/6 + */ +@Data +public class AppSaveVO { + /** + * 菜品类型 + */ + private String dishecType; + + @Schema(description = "菜品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + private String dishesName; + + @Schema(description = "总价格", example = "1") + private BigDecimal dishesSumPrice; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dishes/vo/AppUpdateVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dishes/vo/AppUpdateVO.java new file mode 100644 index 00000000..bd8c7e9b --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dishes/vo/AppUpdateVO.java @@ -0,0 +1,23 @@ +package cn.iocoder.yudao.module.system.controller.app.dishes.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author zt + * @description + * @since 2024/10/6 + */ +@Data +public class AppUpdateVO { + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "16516") + private Long id; + + @Schema(description = "菜品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + private String dishesName; + + @Schema(description = "总价格", example = "1") + private BigDecimal dishesSumPrice; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceinfo/DeviceInfoService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceinfo/DeviceInfoService.java index acfaf055..c774bd14 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceinfo/DeviceInfoService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceinfo/DeviceInfoService.java @@ -56,7 +56,7 @@ public interface DeviceInfoService { int updateAlive(); - + Long getCarteen(String mac); } \ 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/deviceinfo/DeviceInfoServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceinfo/DeviceInfoServiceImpl.java index cc8a3ae1..814b9280 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceinfo/DeviceInfoServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceinfo/DeviceInfoServiceImpl.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.system.service.deviceinfo; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.system.controller.admin.deviceinfo.vo.DeviceInfoPageReqVO; @@ -163,4 +164,20 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { } } + @Override + public Long getCarteen(String mac) { + DeviceInfoDO deviceInfoDO = deviceInfoMapper.selectOne(new LambdaQueryWrapper() + .eq(DeviceInfoDO::getDeviceIp, mac) + .last("limit 1")); + if(ObjectUtil.isNotEmpty(deviceInfoDO)){ + return deviceInfoDO.getCarteenId(); + } + FaceDeviceInfoDO faceDeviceInfoDO = faceDeviceInfoMapper.selectOne(new LambdaQueryWrapper() + .eq(FaceDeviceInfoDO::getMac, mac) + .last("limit 1")); + if(ObjectUtil.isNotEmpty(faceDeviceInfoDO)){ + return faceDeviceInfoDO.getCarteenId(); + } + return null; + } } \ 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/dishes/DishesService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesService.java index c56d153e..bec83885 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesService.java @@ -4,6 +4,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.system.controller.admin.dishes.vo.DishesPageReqVO; import cn.iocoder.yudao.module.system.controller.admin.dishes.vo.DishesRespVO; import cn.iocoder.yudao.module.system.controller.admin.dishes.vo.DishesSaveReqVO; +import cn.iocoder.yudao.module.system.controller.app.dishes.vo.AppSaveVO; +import cn.iocoder.yudao.module.system.controller.app.dishes.vo.AppUpdateVO; import cn.iocoder.yudao.module.system.dal.dataobject.dishes.DishesDO; import javax.validation.Valid; @@ -25,6 +27,8 @@ public interface DishesService { */ Long createDishes(@Valid DishesSaveReqVO createReqVO); + Long createDishesApp(AppSaveVO vo); + /** * 更新菜品管理 * @@ -32,6 +36,7 @@ public interface DishesService { */ void updateDishes(@Valid DishesSaveReqVO updateReqVO); + void updateDishesApp( AppUpdateVO vo); /** * 删除菜品管理 * diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java index 0cb0b17d..8f50b92c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java @@ -12,11 +12,14 @@ import cn.iocoder.yudao.module.system.controller.admin.dishesnutrition.vo.Dishes import cn.iocoder.yudao.module.system.controller.admin.dishesnutrition.vo.DishesNutritionSaveReqVO; import cn.iocoder.yudao.module.system.controller.admin.dishesraw.vo.DishesRawPageReqVO; import cn.iocoder.yudao.module.system.controller.admin.dishesraw.vo.DishesRawSaveReqVO; +import cn.iocoder.yudao.module.system.controller.app.dishes.vo.AppSaveVO; +import cn.iocoder.yudao.module.system.controller.app.dishes.vo.AppUpdateVO; import cn.iocoder.yudao.module.system.dal.dataobject.dishes.DishesDO; import cn.iocoder.yudao.module.system.dal.dataobject.dishesnutrition.DishesNutritionDO; import cn.iocoder.yudao.module.system.dal.dataobject.dishesraw.DishesRawDO; import cn.iocoder.yudao.module.system.dal.mysql.dishes.DishesMapper; import cn.iocoder.yudao.module.system.enums.ErrorCodeConstants; +import cn.iocoder.yudao.module.system.service.deviceinfo.DeviceInfoService; import cn.iocoder.yudao.module.system.service.dishesnutrition.DishesNutritionService; import cn.iocoder.yudao.module.system.service.dishesraw.DishesRawService; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -25,6 +28,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -47,6 +51,12 @@ public class DishesServiceImpl implements DishesService { private DishesNutritionService dishesNutritionService; @Resource private DishesRawService dishesRawService; + @Resource + private DeviceInfoService deviceInfoService; + @Resource + private HttpServletRequest httpServletRequest; + + @Override @SneakyThrows public Long createDishes(DishesSaveReqVO createReqVO) { @@ -77,6 +87,30 @@ public class DishesServiceImpl implements DishesService { // 返回 return dishes.getId(); } + + @Override + public Long createDishesApp(AppSaveVO vo) { + // 插入 + DishesDO dishes = BeanUtils.toBean(vo, DishesDO.class); + dishes.setDeleted(Boolean.FALSE); + + Long carteenId = deviceInfoService.getCarteen(getHearder()); + dishes.setCarteenId(carteenId); + //计算每g多少钱 + BigDecimal dishesSumPrice = vo.getDishesSumPrice(); + BigDecimal dishesNumber = new BigDecimal("50"); + BigDecimal div = NumberUtil.div(dishesSumPrice, dishesNumber, 2); + //避免计算出每克价格约 为0 + if(div.floatValue() <= 0.00f){ + dishes.setDishesBasePrice(new BigDecimal("0.01")); + }else{ + dishes.setDishesBasePrice(div); + } + dishesMapper.insert(dishes); + // 返回 + return dishes.getId(); + } + @Override @SneakyThrows public void updateDishes(DishesSaveReqVO updateReqVO) { @@ -108,6 +142,23 @@ public class DishesServiceImpl implements DishesService { } } + @Override + public void updateDishesApp(AppUpdateVO vo) { + DishesDO updateObj = BeanUtils.toBean(vo, DishesDO.class); + + //计算每g多少钱 + BigDecimal dishesSumPrice = updateObj.getDishesSumPrice(); + BigDecimal dishesNumber = new BigDecimal("50"); + BigDecimal div = NumberUtil.div(dishesSumPrice, dishesNumber, 2); + //避免计算出每克价格约 为0 + if(div.floatValue() <= 0.00f){ + updateObj.setDishesBasePrice(new BigDecimal("0.01")); + }else{ + updateObj.setDishesBasePrice(div); + } + dishesMapper.updateById(updateObj); + } + @Override public void deleteDishes(Long id) { // 校验存在 @@ -163,4 +214,12 @@ public class DishesServiceImpl implements DishesService { Map collect = dishesDOS.stream().collect(Collectors.toMap(DishesDO::getId, DishesDO::getDishesName)); return collect; } + + public String getHearder(){ + try { + return httpServletRequest.getHeader("Authorization"); + } catch (Exception e) { + throw exception(2000_10_001,"无法获取设备编码"); + } + } } \ No newline at end of file