Compare commits
2 Commits
cd7d23d348
...
a5fdb6eac7
| Author | SHA1 | Date | |
|---|---|---|---|
| a5fdb6eac7 | |||
| 4484b62cee |
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user