dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

油站财务报表，交易

Browse Source
This commit is contained in:
sw 2024-11-05 15:41:04 +08:00
parent 3615f22367
commit 57206c4ad6
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml
View File

@ -142,7 +142,7 @@
<select id="getInfoByStoreId" resultType="com.fuint.business.printer.entity.PrintDeviceInfo">
select
id,machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id ,acquiesce from print_device_info
where store_id = #{storeId} and acquiesce = true limit 1
where store_id = #{storeId} and acquiesce = 0 order by create_time ASC limit 1
</select>
<!--新增所有列-->

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintOilOrderReport.java
View File

@ -154,9 +154,9 @@ public class PrintOilOrderReport {
sb.append("<table><tr><td>油品</td><td>金额</td></tr>");
List<Map<String,String>> o = (List<Map<String,String>>)handover.get("oilOrder");
for (Map<String, String> stringStringMap : o) {
sb.append("<tr><td>"+stringStringMap.get("oilName")+"</td>");
sb.append("<td>￥"+ stringStringMap.get("amount")+"</td></tr>");
for (Map<String, String> stringStringMap1 : o) {
sb.append("<tr><td>"+stringStringMap1.get("oilName")+"</td>");
sb.append("<td>￥"+ stringStringMap1.get("amount")+"</td></tr>");
}
sb.append("</table>");
sb.append("--------------------------------\r\n");
@ -165,11 +165,11 @@ public class PrintOilOrderReport {
if (ObjectUtil.isNotEmpty(handover.get("goodsOrder"))) {
sb.append("<table><tr><td>商品</td><td>数量</td><td>单价</td></tr>");
List<Map<String,String>> o = (List<Map<String,String>>)handover.get("goodsOrder");
for (Map<String, String> stringStringMap : o) {
sb.append("<tr><td>"+stringStringMap.get("oilName")+"</td>");
sb.append("<td>"+stringStringMap.get("unit")+"</td>");
for (Map<String, String> stringStringMap2 : o) {
sb.append("<tr><td>"+stringStringMap2.get("oilName")+"</td>");
sb.append("<td>"+stringStringMap2.get("unit")+"</td>");
sb.append("<td>"+ stringStringMap.get("amount")+"</td></tr>");
sb.append("<td>"+ stringStringMap2.get("amount")+"</td></tr>");
}
sb.append("</table>");
sb.append("--------------------------------\r\n");

11
fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
View File

@ -186,7 +186,7 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<div style="color: #fe8c4a" size="mini"
<div style="color: #fe8c4a" size="mini" class="makeupticket"
@click="getOrdersInfo(scope.row.id)"
type="text" plain round
>详情
@ -195,13 +195,13 @@
<!-- @click="getOrdersInfo2(scope.row.id)"-->
<!-- type="text" plain round>详情2-->
<!-- </el-button>-->
<div style="color: #fe8c4a" size="mini"
<div style="color: #fe8c4a" size="mini" class="makeupticket"
v-if="scope.row.status === 'paid'"
@click="patchwork(scope.row)"
type="text" plain round
>补打小票
</div>
<div style="color: #fe8c4a" size="mini"
<div style="color: #fe8c4a" size="mini" class="makeupticket"
v-if="scope.row.status === 'paid'"
@click="refHandleRefund(scope.row.id)"
type="text" plain round
@ -1024,13 +1024,14 @@ export default {
if (order.oilCardAmount) {
oilCardAmount += order.oilCardAmount
}
console.log(22222222222)
let o = {
oilName: this.getName(this.oilNameList, order.oils) + "-" + this.getName1(this.oilGunList, order.oilGunNum),
amount: order.orderAmount.toString(),
// amount : order.oilPayAmount.toString(),
oilNum: order.oilNum.toString(),
payUser:order.payUser.toString(),
orderNo:order.orderNo.toString()
payUser:order.payUser,
orderNo:order.orderNo
}
oilOrderR.push(o)
})