修改计算余额方式-2
parent
7791a585b5
commit
26abe85861
|
|
@ -585,8 +585,7 @@ public class OrderclusterSyncService extends BaseSyncService {
|
|||
}
|
||||
|
||||
// 余额
|
||||
BigDecimal pug_amount = PresellOrderService.me.getPresellCustomerSurplusById(model.getCustomerId());
|
||||
BigDecimal surplus = presellOrder.getPresellAmount().subtract(pug_amount);
|
||||
BigDecimal surplus = PresellOrderService.me.getPresellCustomerSurplusById(model.getCustomerId());
|
||||
|
||||
if (unitprice.multiply(model.getTotalWeight()).compareTo(surplus) > 0) {
|
||||
return Result.failedstr("余额 %.2f 不足以购买 %.2f 吨 %s", surplus, model.getTotalWeight(), product.getName());
|
||||
|
|
@ -901,8 +900,7 @@ public class OrderclusterSyncService extends BaseSyncService {
|
|||
return Result.failed(false, "未获取到订单信息");
|
||||
}
|
||||
// 余额
|
||||
BigDecimal pug_amount = PresellOrderService.me.getPresellCustomerSurplusById(oldobj.getCustomerId());
|
||||
BigDecimal surplus = order.getPresellAmount().subtract(pug_amount);
|
||||
BigDecimal surplus = PresellOrderService.me.getPresellCustomerSurplusById(oldobj.getCustomerId());
|
||||
if (plan_total_price.compareTo(surplus) > 0) {
|
||||
return Result.failedstr("共计总配额达 %.2f元,客户余额(%.2f元)不足", plan_total_price, surplus);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue