预付提货单结算时余额判断改为该账户下的“预售余额”

dev
wuwenxiong 2022-02-14 15:43:56 +08:00
parent 3052061eb9
commit c671763676
2 changed files with 54 additions and 1 deletions

View File

@ -237,4 +237,57 @@ public class PresellOrderService extends BaseService {
return out == null ? new BigDecimal(0) : out;
}
/**
* id
* @param id
* @return
*/
public BigDecimal getPresellCustomerSurplus2ById(Integer id) {
List<Object> params = new ArrayList<>();
params.add(id);
params.add(id);
String sql = "SELECT\n" +
" IFNULL(\n" +
" (\n" +
" SELECT\n" +
" (\n" +
" IFNULL(\n" +
" (\n" +
" SELECT\n" +
" sum(t.presell_amount)\n" +
" FROM\n" +
" presell_order t\n" +
" WHERE\n" +
" t.del = 0\n" +
" AND t.customer_id = ?\n" +
" ),\n" +
" 0\n" +
" )\n" +
" ) - (\n" +
" IFNULL(\n" +
" (\n" +
" SELECT\n" +
" sum(\n" +
" t.total_price\n" +
" )\n" +
" FROM\n" +
" order_temp t\n" +
" WHERE\n" +
" t.sale_type = 1\n" +
" AND t.state = 5\n" +
" AND t.customer_id = ?\n" +
" ),\n" +
" 0\n" +
" )\n" +
" )\n" +
" ),\n" +
" 0\n" +
" ) AS suplus";
BigDecimal out = Db.queryBigDecimal(sql, params.toArray());
return out == null ? new BigDecimal(0) : out;
}
}

View File

@ -1127,7 +1127,7 @@ public class OrderTempSyncService {
}
//账户可用余额
BigDecimal availableBalance = PresellOrderService.me.getPresellCustomerSurplusById(ordercluster.getCustomerId());
BigDecimal availableBalance = PresellOrderService.me.getPresellCustomerSurplus2ById(ordercluster.getCustomerId());
if (availableBalance == null || availableBalance.compareTo(min) <= 0) {
return Result.failed("客户余额不足");
}