autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-02 13:07:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改字段名

Browse Source
This commit is contained in:
Guoqs
2024-06-06 09:37:22 +08:00
parent d3b9f8f7f9
commit 252844f83b
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -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"); // 确认金额就是结算金额

4
jsowell-ui/src/views/member/merchantVIP/index.vue
View File

@@ -179,9 +179,9 @@
<el-col :span="24">
<el-form-item label="充值余额:"> {{ totalRechargeAmount }} </el-form-item>
<el-form-item label="消费金额:" style="padding-left: 50px;">{{ totalConsumption }}</el-form-item>
<el-form-item label="累计充值金额:" style="padding-left: 50px;">{{ accumulatedRechargeAmount
<el-form-item label="累计充值金额:" style="padding-left: 50px;">{{ totalRechargeAmount
}}</el-form-item>
<el-form-item label="累计消费金额:" style="padding-left: 50px;">{{ accumulatedConsumptionAmount
<el-form-item label="累计消费金额:" style="padding-left: 50px;">{{ totalConsumption
}}</el-form-item>
</el-col>
</el-form>