Compare commits

2 Commits

Author SHA1 Message Date
a5fdb6eac7 金额问题 2026-03-31 16:21:09 +08:00
4484b62cee 快捷菜单 借口权限 2026-03-31 15:20:48 +08:00
2 changed files with 2 additions and 3 deletions

View File

@@ -29,7 +29,7 @@ public class QuickMenuController {
@Resource
private QuickMenuService quickMenuService;
@SaAdminCheckPermission(parentName = "悬浮窗", value = "quick:list", name = "悬浮窗-列表")
// @SaAdminCheckPermission(parentName = "悬浮窗", value = "quick:list", name = "悬浮窗-列表")
@GetMapping
public CzgResult<List<QuickMenu>> getQuickList(@RequestParam(required = false) Integer status,
@RequestParam(required = false, defaultValue = "0") Integer isEdit) {

View File

@@ -1726,8 +1726,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
} else {
unitPrice = orderDetail.getPrice();
}
totalAmount = totalAmount.add((orderDetail.getNum().subtract(orderDetail.getReturnNum())))
.multiply(unitPrice);
totalAmount = totalAmount.add((orderDetail.getNum().subtract(orderDetail.getReturnNum())).multiply(unitPrice));
}
if (subtract.compareTo(BigDecimal.ZERO) > 0
&& orderDetail.getPackAmount().compareTo(BigDecimal.ZERO) > 0