|
|
@@ -1068,7 +1068,6 @@ public class OrderService extends BaseService<Order> {
|
|
|
throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISFLGVALID_FALSE.getMessage());
|
|
|
}
|
|
|
//endregion
|
|
|
-
|
|
|
//region 作废
|
|
|
Order orderUpdate = new Order();
|
|
|
orderUpdate.setFlgValid(false).setOrderId(id);
|
|
|
@@ -1098,8 +1097,13 @@ public class OrderService extends BaseService<Order> {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ String gradeCode = authUtils.getStaff().getGradeCode();
|
|
|
// 更新总账表的总收款额和可用额
|
|
|
- accountService.updateReceiptLock(recPayForUpdate.getObjectId());
|
|
|
+ if ("STD".equals(gradeCode)) {
|
|
|
+ accountService.updateReceipt(recPayForUpdate.getObjectId());
|
|
|
+ } else {
|
|
|
+ accountService.updateReceiptLock(recPayForUpdate.getObjectId());
|
|
|
+ }
|
|
|
|
|
|
// 更新账户余额
|
|
|
for (String macId : macList) {
|