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

update

Browse Source
This commit is contained in:
Lemon
2023-07-08 15:37:53 +08:00
parent e641b18270
commit 3aaabbbdfc
3 changed files with 93 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,12 +173,23 @@ public class SpringBootTestController {
@Autowired @Autowired
private AMapService aMapService; private AMapService aMapService;
@Autowired
private IPileConnectorInfoService pileConnectorInfoService;
@Autowired @Autowired
private TransactionRecordsRequestHandler transactionRecordsRequestHandler; private TransactionRecordsRequestHandler transactionRecordsRequestHandler;
@Autowired @Autowired
private IMemberBasicInfoService memberBasicInfoService; private IMemberBasicInfoService memberBasicInfoService;
@Test
public void testUpdateConnectorStatus() {
String pileConnectorCode = "8800000000000101";
String status = PileConnectorStatusEnum.FREE.getValue();
pileConnectorInfoService.updateConnectorStatus(pileConnectorCode, status);
}
@Test @Test
public void testOrder() throws Exception { public void testOrder() throws Exception {
// 通过vin码查询数据库绑定用户信息 // 通过vin码查询数据库绑定用户信息

1
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java
View File

@@ -30,6 +30,7 @@ public class OrderListVO {
/** /**
* 交易流水号 * 交易流水号
*/ */
@Excel(name = "交易流水号")
private String transactionCode; private String transactionCode;
/** /**

131
jsowell-ui/src/views/order/order/index.vue
View File

@@ -96,7 +96,7 @@
margin-bottom: 15px; margin-bottom: 15px;
" "
:icon="icon" :icon="icon"
>{{ showOrHideText }} >{{ showOrHideText }}
</el-button> </el-button>
</el-form> </el-form>
@@ -107,7 +107,8 @@
icon="el-icon-search" icon="el-icon-search"
size="mini" size="mini"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索
</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@@ -115,7 +116,8 @@
icon="el-icon-refresh" icon="el-icon-refresh"
size="mini" size="mini"
@click="resetQuery" @click="resetQuery"
>重置</el-button >重置
</el-button
> >
</el-col> </el-col>
<el-button <el-button
@@ -125,17 +127,21 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['order:order:export']" v-hasPermi="['order:order:export']"
>导出</el-button >导出
</el-button
> >
<div> <div>
{{ dateDescription }}期间，总用电量{{sumUsedElectricity}}度，总消费金额{{ sumOrderAmount }}元，总结算金额{{sumSettleAmount}}元 {{ dateDescription }}期间，总用电量{{ sumUsedElectricity }}度，总消费金额{{
sumOrderAmount
}}元，总结算金额{{ sumSettleAmount }}元
</div> </div>
<el-popover placement="top-start" width="400" trigger="click"> <el-popover placement="top-start" width="400" trigger="click">
<el-checkbox <el-checkbox
:indeterminate="isIndeterminate" :indeterminate="isIndeterminate"
v-model="checkAll" v-model="checkAll"
@change="handleCheckAllChange" @change="handleCheckAllChange"
>全选</el-checkbox >全选
</el-checkbox
> >
<div style="margin: 15px 0"></div> <div style="margin: 15px 0"></div>
<el-checkbox-group <el-checkbox-group
@@ -147,7 +153,8 @@
v-for="city in cities" v-for="city in cities"
:label="city" :label="city"
:key="city.id" :key="city.id"
>{{ city }}</el-checkbox >{{ city }}
</el-checkbox
> >
</el-checkbox-group> </el-checkbox-group>
</el-popover> </el-popover>
@@ -159,7 +166,7 @@
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
/> />
<div style="padding: 14px"> <div style="padding: 14px">
<el-skeleton-item variant="h3" style="width: 50%" /> <el-skeleton-item variant="h3" style="width: 50%"/>
<div <div
style=" style="
display: flex; display: flex;
@@ -173,7 +180,7 @@
variant="text" variant="text"
style="margin-right: 16px" style="margin-right: 16px"
/> />
<el-skeleton-item variant="text" style="width: 30%" /> <el-skeleton-item variant="text" style="width: 30%"/>
</div> </div>
</div> </div>
</template> </template>
@@ -193,13 +200,15 @@
item.orderCode item.orderCode
" "
class="link-type" class="link-type"
>订单编号：{{ item.orderCode }}</router-link >订单编号：{{ item.orderCode }}
</router-link
> >
<el-tag <el-tag
:type="color(item.orderStatus)" :type="color(item.orderStatus)"
style="margin-left: 10px" style="margin-left: 10px"
>{{ item.orderStatusDescribe }}</el-tag >{{ item.orderStatusDescribe }}
</el-tag
> >
</div> </div>
<div> <div>
@@ -214,53 +223,69 @@
:column="4" :column="4"
> >
<el-descriptions-item label="交易流水号">{{ <el-descriptions-item label="交易流水号">{{
item.transactionCode || "一" item.transactionCode || "一"
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="站点">{{ <el-descriptions-item label="站点">{{
item.stationName || "一" item.stationName || "一"
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="充电桩枪口号">{{ <el-descriptions-item label="充电桩枪口号">{{
item.pileConnectorCode || "一" item.pileConnectorCode || "一"
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="卡号">{{ <el-descriptions-item label="卡号">{{
item.logicCard || "一" item.logicCard || "一"
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="微信商户订单号">{{ <el-descriptions-item label="微信商户订单号">{{
item.outTradeNo || "一" item.outTradeNo || "一"
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="启动方式">{{ <el-descriptions-item label="启动方式">{{
startMode(item.startMode) startMode(item.startMode)
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="支付方式">{{ <el-descriptions-item label="支付方式">{{
payMode(item.payMode) payMode(item.payMode)
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="支付金额">{{ <el-descriptions-item label="支付金额">{{
item.payAmount || "一" item.payAmount || "一"
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="支付状态">{{ <el-descriptions-item label="支付状态">{{
payStatus(item.payStatus) payStatus(item.payStatus)
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="充电度数">{{ <el-descriptions-item label="充电度数">{{
item.chargingDegree || "一" item.chargingDegree || "一"
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="起始SOC">{{ <el-descriptions-item label="起始SOC">{{
item.startSoc || "一" item.startSoc || "一"
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="终止SOC">{{ <el-descriptions-item label="终止SOC">{{
item.endSoc || "一" item.endSoc || "一"
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="结束充电时间">{{ <el-descriptions-item label="结束充电时间">{{
item.chargeEndTime || "一" item.chargeEndTime || "一"
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="总消费金额">{{ <el-descriptions-item label="总消费金额">{{
item.orderAmount || "一" item.orderAmount || "一"
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="虚拟金额">{{ <el-descriptions-item label="虚拟金额">{{
item.virtualAmount || "一" item.virtualAmount || "一"
}}</el-descriptions-item> }}
</el-descriptions-item>
<el-descriptions-item label="结算金额">{{ <el-descriptions-item label="结算金额">{{
item.settleAmount || "一" item.settleAmount || "一"
}}</el-descriptions-item> }}
</el-descriptions-item>
</el-descriptions> </el-descriptions>
<div <div
style=" style="
@@ -296,11 +321,12 @@ import {
totalData, totalData,
} from "@/api/order/order"; } from "@/api/order/order";
import Template from "@/views/billing/template"; import Template from "@/views/billing/template";
import { listStation } from "@/api/pile/station"; import {listStation} from "@/api/pile/station";
import { getDay } from "@/utils/common"; import {getDay} from "@/utils/common";
export default { export default {
name: "Order", name: "Order",
components: { Template }, components: {Template},
dicts: ["order_status", "start_mode", "pay_mode", "pay_status"], dicts: ["order_status", "start_mode", "pay_mode", "pay_status"],
data() { data() {
@@ -578,10 +604,11 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}) })
.catch(() => {}); .catch(() => {
});
}, },
/** 订单详情序号 */ /** 订单详情序号 */
rowOrderDetailIndex({ row, rowIndex }) { rowOrderDetailIndex({row, rowIndex}) {
row.index = rowIndex + 1; row.index = rowIndex + 1;
}, },
/** 订单详情添加按钮操作 */ /** 订单详情添加按钮操作 */
@@ -671,13 +698,15 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep ::v-deep
.el-descriptions--medium:not(.is-bordered) .el-descriptions--medium:not(.is-bordered)
.el-descriptions-item__cell { .el-descriptions-item__cell {
padding-bottom: 4px; padding-bottom: 4px;
} }
::v-deep .el-descriptions__header { ::v-deep .el-descriptions__header {
margin-bottom: 10px; margin-bottom: 10px;
} }
.cardview-box { .cardview-box {
width: 100%; width: 100%;
margin-bottom: 12px; margin-bottom: 12px;
@@ -685,6 +714,7 @@ export default {
color: #4a4a4a; color: #4a4a4a;
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
} }
.cardview-static { .cardview-static {
height: 100%; height: 100%;
width: 100%; width: 100%;
@@ -696,6 +726,7 @@ export default {
line-height: 46px; line-height: 46px;
background-color: #f0f0f0; background-color: #f0f0f0;
} }
.flex { .flex {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;