diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 121ff7660..d80a33478 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -863,9 +863,7 @@ public class SpringBootTestController { // 需要重新分账的订单信息(针对未分账的订单) public JSONArray getPaymentList() { String jsonArrayString = "[" + - "{\"orderCode\":\"C86136660239\", \"settleAmount\":\"18.65\", \"paymentId\":\"002212024011710230210593518791625003008\"}" + - "{\"orderCode\":\"C23088580525\", \"settleAmount\":\"33.25\", \"paymentId\":\"002212024011711544010593541850900688896\"}" + - "{\"orderCode\":\"C44565166677\", \"settleAmount\":\"18.65\", \"paymentId\":\"002212024011714061810593574975631630336\"}" + + "{\"orderCode\":\"C44778282947\", \"settleAmount\":\"8.38\", \"paymentId\":\"002212023101608315910559788773415297024\"}" + "]"; return JSONArray.parseArray(jsonArrayString); } @@ -879,7 +877,7 @@ public class SpringBootTestController { // TODO 获取默认结算账户,如需分给对应商户就填写正确的汇付会员id // AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.getDefault(); AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount(); - adapayMemberAccount.setAdapayMemberId("ACM46086128"); + adapayMemberAccount.setAdapayMemberId("0"); for (int i = 0; i < paymentList.size(); i++) { JSONObject jsonObject = (JSONObject) paymentList.get(i); BigDecimal confirmAmt = jsonObject.getBigDecimal("settleAmount"); // 确认金额就是结算金额 diff --git a/jsowell-ui/src/views/member/merchantVIP/index.vue b/jsowell-ui/src/views/member/merchantVIP/index.vue index f1dc745ab..95b32be72 100644 --- a/jsowell-ui/src/views/member/merchantVIP/index.vue +++ b/jsowell-ui/src/views/member/merchantVIP/index.vue @@ -179,9 +179,9 @@ {{ totalRechargeAmount }} {{ totalConsumption }} - {{ accumulatedRechargeAmount + {{ totalRechargeAmount }} - {{ accumulatedConsumptionAmount + {{ totalConsumption }}