使用impeccable skill 开发和优化页面,之后的页面开发和优化也都使用impeccable ski,1.创建收益结算单,通过勾选租赁订单的方式,不要用输入,要过滤掉已经结算的。2.供应商usdt-ui\src\views\system\rentSettlement\下面新增供应商结算页面,添加结算申请按钮。要求页面美观,交互友好
This commit is contained in:
1 parent
be6ac23844
commit
611e020f38
6 files changed
+327
-1
No files matched your search
@@ -1049,6 +1049,56 @@ public class RentalBusinessTest {
|
||||
expectFailure(() -> tx.execute(status -> reviews.settlement(Collections.singletonList(order), 90)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void supplierSettlementCandidatesAndDetailAlwaysEnforceOwnership() {
|
||||
long order = incomeOrder();
|
||||
RentalSettlements queries = new RentalSettlements(store);
|
||||
assertEquals(1, number(queries.candidates(20L, "NILE", 0, "", 1), "total"));
|
||||
assertEquals(0, number(queries.candidates(10L, "NILE", supplier, "", 1), "total"));
|
||||
assertEquals(0, number(queries.candidates(20L, "MAINNET", 0, "", 1), "total"));
|
||||
assertEquals(1, queries.accounts("NILE", "20").size());
|
||||
expectFailure(() -> tx.execute(status -> reviews.applySettlement(Collections.singletonList(order), 10)));
|
||||
assertTrue(store.rows("SELECT id FROM rent_settlement").isEmpty());
|
||||
long settlement = tx.execute(status -> reviews.applySettlement(Collections.singletonList(order), 20));
|
||||
assertEquals(0, number(queries.candidates(20L, "NILE", 0, "", 1), "total"));
|
||||
assertEquals(0, number(queries.candidates(null, "NILE", supplier, "", 1), "total"));
|
||||
assertEquals(1, number(queries.list(20L, "NILE", "PENDING", 1), "total"));
|
||||
assertEquals(0, number(queries.list(10L, "NILE", "", 1), "total"));
|
||||
assertEquals(0, number(queries.list(20L, "MAINNET", "", 1), "total"));
|
||||
Map<String, Object> detail = queries.detail(20L, settlement);
|
||||
assertEquals(1, ((List<?>) detail.get("items")).size());
|
||||
Map<String, Object> row = (Map<String, Object>) detail.get("settlement");
|
||||
assertTrue(row.get("created_at") instanceof Long);
|
||||
assertEquals("0.163457", row.get("amount"));
|
||||
expectFailure(() -> queries.detail(10L, settlement));
|
||||
expectFailure(() -> tx.execute(status -> reviews.applySettlement(Collections.singletonList(order), 20)));
|
||||
tx.execute(status -> reviews.transition(settlement, "reject", 91, "重新选择"));
|
||||
assertEquals(1, number(queries.candidates(20L, "NILE", 0, "", 1), "total"));
|
||||
long next = tx.execute(status -> reviews.applySettlement(Collections.singletonList(order), 20));
|
||||
tx.execute(status -> reviews.transition(next, "approve", 91, "入账"));
|
||||
assertEquals(0, number(queries.candidates(20L, "NILE", 0, "", 1), "total"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void settlementCandidatesExcludeInvalidStatesAndRejectForgedFilters() {
|
||||
long order = incomeOrder();
|
||||
RentalSettlements queries = new RentalSettlements(store);
|
||||
for (String state : new String[] {"WAITING", "EXECUTING", "MANUAL_REVIEW", "FAILED"}) {
|
||||
store.update("order", order, map("status", state));
|
||||
assertEquals(0, number(queries.candidates(20L, "NILE", 0, "", 1), "total"));
|
||||
expectFailure(() -> tx.execute(status -> reviews.applySettlement(Collections.singletonList(order), 20)));
|
||||
}
|
||||
store.update("order", order, map("status", "SUCCESS"));
|
||||
assertEquals(1, number(queries.candidates(null, "NILE", supplier, ADDRESS, 1), "total"));
|
||||
assertEquals(0, number(queries.candidates(null, "NILE", payer, "", 1), "total"));
|
||||
expectFailure(() -> queries.candidates(null, "NILE", 0, "", 1));
|
||||
expectFailure(() -> queries.list(20L, "NILE", "INVALID", 1));
|
||||
expectFailure(() -> queries.list(20L, "NILE", "", 0));
|
||||
store.update("order", order, map("supplier_reversed_amount", money("0.163457")));
|
||||
assertEquals(0, number(queries.candidates(20L, "NILE", 0, "", 1), "total"));
|
||||
expectFailure(() -> tx.execute(status -> reviews.applySettlement(Collections.singletonList(order), 20)));
|
||||
}
|
||||
|
||||
private Map<String, Object> onchainRequest(String merchant) {
|
||||
return map("order_type", "ADDRESS_ONCHAIN", "network", "NILE", "merchant_order_no", merchant,
|
||||
"receiver_address", ADDRESS, "expected_amount", "0.173457");
|
||||
|
||||
Reference in new issue
Block a user