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

no message

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-06-04 16:15:30 +08:00
parent 8bcf58ca2b
commit f58d384840
12 changed files with 149 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/views/member/userInfo.vue
View File

@ -1873,7 +1873,7 @@ export default {
//赠送金额
giftBalance:this.cardValueForm.giftBalance,
// 到账金额
getAmount:this.cardValueForm.giftBalance + this.realyPayBills,
getAmount:Number(this.cardValueForm.giftBalance) + Number(this.realyPayBills),
payType:payTypeText,
// 实付款

2
fuintAdmin/src/views/setting/print/index.vue
View File

@ -112,7 +112,7 @@
<!-- <el-form-item label="token" prop="accessToken">-->
<!-- <el-input v-model="deviceInfo.accessToken"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="isAcquiesce" prop="isAcquiesce">
<el-form-item label="启用状态" prop="isAcquiesce">
<el-switch
v-model="deviceInfo.acquiesce"
active-color="#13ce66"

14
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -16,6 +16,7 @@
<el-tree
:data="Thetree"
show-checkbox
:indent="0 "
:props="defaultProps"
@change="handleChange"
node-key="id"
@ -551,7 +552,7 @@
<el-row v-if="ruleForm.deptType !== '3'">
<el-col span="3">
<el-col :span="3">
<el-form-item label="设置油站数量">
<el-switch
:disabled="isTopDept"
@ -1295,6 +1296,8 @@ export default {
},
// 查询菜单树结构
getMenuTreeselect(merchantId) {
console.log("response")
// merchantId 代表deptType
return menuTreeselect({merchantId:merchantId}).then(response => {
this.menuOptions = response.data;
@ -1328,7 +1331,7 @@ export default {
this.title = "修改角色";
let checkedKeys = response.data.checkedKeys
this.form1.checkedKeys = checkedKeys
// this.getMenuTreeselect(response.data.roleInfo.type)
this.getMenuTreeselect(response.data.roleInfo.type)
// this.$nextTick(() => {
// roleMenu.then(res => {
@ -1475,6 +1478,7 @@ export default {
// this.getList();
this.onlyGetUser()
this.getDutyList()
this.getMenuTreeselect(data.deptType);
},
@ -1672,12 +1676,16 @@ export default {
//修改树
appedit(id,label) {
this.pdinfo = 2
console.log("点击树获取部门信息",id)
// 点击树获取部门信息
Userlist(id).then(res=>{
let ancestors = res.data.ancestors.slice(2).toString();
console.log('Userlist:',res)
this.parentName = res.data.parentName
this.ruleForm = res.data
// this.ruleForm.parentId = res.data.parentId
// this.ruleForm.status = res.data.status
// this.ruleForm.leaderName = res.data.leaderName

18
fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue
View File

@ -129,7 +129,15 @@
<el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
<el-table-column prop="storeName" align="center" label="门店"> </el-table-column>
<el-table-column prop="createBy" align="center" label="收银员"> </el-table-column>
<el-table-column prop="payChannel" align="center" label="支付渠道"> </el-table-column>
<el-table-column prop="payChannel" align="center" label="支付渠道">
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
<span v-else-if="scope.row.payChannel=='POS'">POS机</span>
<span v-else-if="scope.row.payChannel=='PC'">平台</span>
<span v-else>其他</span>
</template>
</el-table-column>
<el-table-column prop="mchntCd" align="center" label="商户号"> </el-table-column>
<el-table-column prop="amount" align="center" label="费率"> </el-table-column>
<el-table-column prop="type" align="center" label="订单来源">
@ -161,7 +169,13 @@
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>
<el-table-column prop="goodsMoney" align="center" label="订单金额"> </el-table-column>
<el-table-column prop="goodsMoney" align="center" label="订单金额">
<template slot-scope="scope">
<span v-if="scope.row.type=='3'">{{scope.row.goodsMoney + scope.row.payMoney}}</span>
<span v-else>{{scope.row.goodsMoney}}</span>
</template>
</el-table-column>
<el-table-column prop="payMoney" align="center" label="优惠后应付金额"> </el-table-column>
<el-table-column prop="refMoney" align="center" label="退款金额">
<template slot-scope="scope">

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

@ -322,7 +322,7 @@
COUNT(CASE WHEN aoi.content = '油品充值' THEN 0 END) AS oilBalanceCount,
SUM(CASE WHEN (aoi.content = '储值卡订单' or aoi.content = '油品充值') and pay_type = 'WECHAT' THEN pay_money ELSE 0 END) AS userBalanceByWechat,
COUNT(CASE WHEN (aoi.content = '储值卡订单' or aoi.content = '油品充值') and pay_type = 'WECHAT' and pay_type = 'WECHAT' THEN 0 END) AS userBalanceCountByWechat,
COUNT(CASE WHEN (aoi.content = '储值卡订单' or aoi.content = '油品充值') and pay_type = 'WECHAT' THEN 0 END) AS userBalanceCountByWechat,
SUM(CASE WHEN (aoi.content = '储值卡订单' or aoi.content = '油品充值') and pay_type = 'ALIPAY' THEN pay_money ELSE 0 END) AS userBalanceByAli,
COUNT(CASE WHEN (aoi.content = '储值卡订单' or aoi.content = '油品充值') and pay_type = 'ALIPAY' THEN 0 END) AS userBalanceCountByali

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

@ -205,11 +205,11 @@ machine_code = values(machine_code)msign = values(msign)device_name = values(dev
<delete id="deleteById">
delete from print_device_info where id = #{id}
</delete>
<update id="updateacquiesce">
<update id="updateIsAcquiesce">
update print_device_info set acquiesce = false where store_id = #{storeId}
</update>
<select id="getacquiesceByStoreId" resultType="java.lang.Integer">
<select id="getIsAcquiesceByStoreId" resultType="java.lang.Integer">
</select>

30
fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintCardValueReport.java
View File

@ -1,7 +1,12 @@
package com.fuint.business.printer.template;
import cn.hutool.core.util.ObjectUtil;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@ -9,31 +14,42 @@ public class PrintCardValueReport {
public static Map<String, Object> handover = new HashMap<>();
public static String printOilOrder() {
StringBuilder sb = new StringBuilder();
LocalDateTime now = LocalDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String formattedDateTime = now.format(formatter);
System.out.println("当前时间：" + formattedDateTime);
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
sb.append("<center>订单统计\r\n</center>");
sb.append("------------------------------------\r\n");
sb.append("打印时间："+formattedDateTime +"\r\n");
sb.append("店铺名称："+nowAccountInfo.getStoreName() +"\r\n");
sb.append("--------------------------------\r\n");
if (ObjectUtil.isNotEmpty(handover.get("realyPayBills"))) {
sb.append("充值金额：￥"+handover.get("realyPayBills")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("giftBalance"))) {
sb.append("赠送金额：￥"+handover.get("giftBalance")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("getAmount"))) {
sb.append("到账金额：￥"+handover.get("getAmount")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("payType"))) {
sb.append("支付方式："+handover.get("payType")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("actualPay"))) {
sb.append("实付款：￥"+handover.get("actualPay")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("seekZero"))) {
sb.append("找零：￥"+handover.get("seekZero")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
sb.append("<center>谢谢惠顾，欢迎下次光临！</center>");

30
fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintFuelDieselReport.java
View File

@ -1,7 +1,11 @@
package com.fuint.business.printer.template;
import cn.hutool.core.util.ObjectUtil;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Map;
@ -10,35 +14,45 @@ public class PrintFuelDieselReport {
public static String printFeulOrder() {
StringBuilder sb = new StringBuilder();
LocalDateTime now = LocalDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String formattedDateTime = now.format(formatter);
System.out.println("当前时间：" + formattedDateTime);
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
sb.append("<center>订单统计\r\n</center>");
sb.append("------------------------------------\r\n");
sb.append("打印时间："+formattedDateTime +"\r\n");
sb.append("店铺名称："+nowAccountInfo.getStoreName() +"\r\n");
sb.append("--------------------------------\r\n");
if (ObjectUtil.isNotEmpty(handover.get("oilType"))) {
sb.append("充值油品："+handover.get("oilType")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("incomeLitres"))) {
sb.append("充值升数："+handover.get("incomeLitres")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("realyPayBills"))) {
sb.append("订单金额：￥"+handover.get("realyPayBills")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("lockupPrice"))) {
sb.append("锁价金额：￥"+handover.get("lockupPrice")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("payType"))) {
sb.append("支付方式："+handover.get("payType")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("realyPayBills"))) {
sb.append("实付款：￥"+handover.get("realyPayBills")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("seekZero"))) {
sb.append("找零：￥"+handover.get("seekZero")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
sb.append("<center>谢谢惠顾，欢迎下次光临！</center>");

24
fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintIntegralReport.java
View File

@ -1,7 +1,11 @@
package com.fuint.business.printer.template;
import cn.hutool.core.util.ObjectUtil;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -11,8 +15,18 @@ public class PrintIntegralReport {
public static String printIntegral(){
StringBuilder sb=new StringBuilder();
sb.append("<center>积分兑换订单\r\n</center>");
sb.append("------------------------------------\r\n");
LocalDateTime now = LocalDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String formattedDateTime = now.format(formatter);
System.out.println("当前时间：" + formattedDateTime);
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
sb.append("<center>订单统计\r\n</center>");
sb.append("打印时间："+formattedDateTime +"\r\n");
sb.append("店铺名称："+nowAccountInfo.getStoreName() +"\r\n");
sb.append("--------------------------------\r\n");
if (ObjectUtil.isNotEmpty(handover.get("shoppingCart"))) {
sb.append("<table><tr><td>商品名称</td><td>商品数量</td><td>价格</td></tr>");
@ -23,19 +37,19 @@ public class PrintIntegralReport {
sb.append("<td>"+ stringStringMap.get("price")+"</td></tr>");
}
sb.append("</table>");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("allPoints"))) {
sb.append("总积分："+handover.get("allPoints")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("allAmout"))) {
sb.append("总价格：￥"+handover.get("allAmout")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}

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

@ -1,11 +1,12 @@
package com.fuint.business.printer.template;
import cn.hutool.core.util.ObjectUtil;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
public class PrintOilOrderReport {
public static Map<String, Object> handover = new HashMap<>();
@ -13,18 +14,29 @@ public class PrintOilOrderReport {
StringBuilder sb=new StringBuilder();
LocalDateTime now = LocalDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String formattedDateTime = now.format(formatter);
System.out.println("当前时间：" + formattedDateTime);
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
sb.append("<center>订单统计\r\n</center>");
sb.append("------------------------------------\r\n");
sb.append("打印时间："+formattedDateTime +"\r\n");
sb.append("店铺名称："+nowAccountInfo.getStoreName() +"\r\n");
sb.append("--------------------------------\r\n");
if (ObjectUtil.isNotEmpty(handover.get("oilOrder"))) {
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>");
sb.append("<td>￥"+ stringStringMap.get("amount")+"</td></tr>");
}
sb.append("</table>");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("goodsOrder"))) {
@ -37,7 +49,7 @@ public class PrintOilOrderReport {
sb.append("<td>"+ stringStringMap.get("amount")+"</td></tr>");
}
sb.append("</table>");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
@ -45,7 +57,7 @@ public class PrintOilOrderReport {
if ("credit".equals(handover.get("payType"))) {
sb.append("挂账单位："+handover.get("unitName")+"\r\n");
sb.append("挂账金额：￥"+handover.get("creditAmount")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
@ -56,32 +68,32 @@ public class PrintOilOrderReport {
// }
if (ObjectUtil.isNotEmpty(handover.get("discount"))) {
sb.append("优惠合计：￥"+handover.get("discount")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("amount"))) {
sb.append("总金额：￥"+handover.get("amount")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("consumeAmount"))) {
sb.append("储值卡付款：￥"+handover.get("consumeAmount")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("consumeRefuelMoney"))) {
sb.append("囤油卡付款："+handover.get("consumeRefuelMoney")+"L\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("actualPay"))) {
sb.append("实付款：￥"+handover.get("actualPay")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("seekZero"))) {
sb.append("找零：￥"+handover.get("seekZero")+"\r\n");
sb.append("------------------------------------\r\n");
sb.append("--------------------------------\r\n");
}

35
fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/RePrintOilOrderReport.java
View File

@ -1,7 +1,12 @@
package com.fuint.business.printer.template;
import cn.hutool.core.util.ObjectUtil;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -11,8 +16,18 @@ public class RePrintOilOrderReport {
public static String rePrintOilOrder(){
StringBuilder sb=new StringBuilder();
LocalDateTime now = LocalDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String formattedDateTime = now.format(formatter);
System.out.println("当前时间：" + formattedDateTime);
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
sb.append("<center>订单统计\r\n</center>");
sb.append("--------------------------------\r\n");
sb.append("打印时间："+formattedDateTime +"\r\n");
sb.append("店铺名称："+nowAccountInfo.getStoreName() +"\r\n");
sb.append("----------------------------\r\n");
if (ObjectUtil.isNotEmpty(handover.get("oilOrder"))) {
sb.append("<table><tr><td>油品</td><td>加油升数</td><td>金额</td></tr>");
@ -23,7 +38,7 @@ public class RePrintOilOrderReport {
sb.append("<td>"+ stringStringMap.get("amount")+"</td></tr>");
}
sb.append("</table>");
sb.append("--------------------------------\r\n");
sb.append("----------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("goodsOrder"))) {
@ -35,7 +50,7 @@ public class RePrintOilOrderReport {
sb.append("<td>"+ stringStringMap.get("amount")+"</td></tr>");
}
sb.append("</table>");
sb.append("--------------------------------\r\n");
sb.append("----------------------------\r\n");
}
@ -44,39 +59,39 @@ public class RePrintOilOrderReport {
if (ObjectUtil.isNotEmpty(handover.get("amount"))) {
sb.append("合计：￥"+handover.get("amount")+"\r\n");
sb.append("--------------------------------\r\n");
sb.append("----------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("payAmount"))) {
sb.append("实付款：￥"+handover.get("payAmount")+"\r\n");
sb.append("--------------------------------\r\n");
sb.append("----------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("discount"))) {
sb.append("优惠：￥"+handover.get("discount")+"\r\n");
sb.append("--------------------------------\r\n");
sb.append("----------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("seekZero"))) {
sb.append("找零：￥"+handover.get("seekZero")+"\r\n");
sb.append("--------------------------------\r\n");
sb.append("----------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("type")) && "2".equals(handover.get("type"))) {
if (ObjectUtil.isNotEmpty(handover.get("balanceAmount"))) {
sb.append("储值卡：￥"+handover.get("balanceAmount")+"\r\n");
sb.append("--------------------------------\r\n");
sb.append("----------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("oilCardAmount"))) {
sb.append("屯油卡："+handover.get("oilCardAmount")+"L\r\n");
sb.append("--------------------------------\r\n");
sb.append("----------------------------\r\n");
}
if (ObjectUtil.isNotEmpty(handover.get("calculateRefundsV"))) {
sb.append("退款：￥"+handover.get("calculateRefundsV")+"\r\n");
sb.append("--------------------------------\r\n");
sb.append("----------------------------\r\n");
}
}

2
fuintCashierWeb/src/views/details/index.vue
View File

@ -2139,7 +2139,7 @@ export default {
//赠送金额
giftBalance:this.cardValueForm.giftBalance,
// 到账金额
getAmount:this.cardValueForm.giftBalance + this.realyPayBills,
getAmount:Number(this.cardValueForm.giftBalance) + Number(this.realyPayBills),
payType:payTypeText,
// 实付款