czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: czg_team:cd7d23d348ce1eff34f3fb22c97b03b75e187773
Branches Tags
czg_team:master czg_team:prod czg_team:test czg_team:dev czg_team:pay czg_team:backup-250910
...
compare: czg_team:a5fdb6eac7a179af770700361d11cfe28f032679
Branches Tags
czg_team:prod czg_team:test czg_team:dev czg_team:pay czg_team:backup-250910 czg_team:master

2 Commits
cd7d23d348 ... a5fdb6eac7

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

2
cash-api/account-server/src/main/java/com/czg/controller/admin/QuickMenuController.java
View File

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

3
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
View File

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