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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
zhaohengkun 2024-10-18 09:34:48 +08:00
commit 68a94aa3fc
3 changed files with 11 additions and 10 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/template/PrintOilOrderReport.java
View File

@ -82,7 +82,7 @@ public class PrintOilOrderReport {
} }
if (ObjectUtil.isNotEmpty(handover.get("consumeRefuelMoney"))) { if (ObjectUtil.isNotEmpty(handover.get("consumeRefuelMoney"))) {
sb.append("囤油卡付款："+handover.get("consumeRefuelMoney")+"L\r\n"); sb.append("囤油卡付款：￥"+handover.get("consumeRefuelMoney")+"\r\n");
sb.append("--------------------------------\r\n"); sb.append("--------------------------------\r\n");
} }

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
View File

@ -333,7 +333,7 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
growthValue = growth * growthValue; growthValue = growth * growthValue;
//更新用户余额表成长值 //更新用户余额表成长值
UserBalance userBalance = baseMapper.selectOne(new LambdaQueryWrapper<UserBalance>() UserBalance userBalance = baseMapper.selectOne(new LambdaQueryWrapper<UserBalance>()
.eq(UserBalance::getMtUserId, userId)); .eq(UserBalance::getMtUserId, userId).eq(UserBalance::getStoreId, storeId));
userBalance.setGrowthValue(userBalance.getGrowthValue() + growthValue); userBalance.setGrowthValue(userBalance.getGrowthValue() + growthValue);
//更新成长值记录变化表 //更新成长值记录变化表

17
fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
View File

@ -1168,9 +1168,10 @@ export default {
'WECHAT': '微信', 'WECHAT': '微信',
'ALIPAY': '支付宝', 'ALIPAY': '支付宝',
'UNIONPAY': '银联二维码', 'UNIONPAY': '银联二维码',
'credit': '挂账', 'after_pay': '挂账',
'oilCard': '囤油卡', 'fule_card': '囤油卡',
'balance': '储值卡' 'card_value': '储值卡',
'car_card_value': '车队卡',
}; };
let payTypeText = payTypeMap[this.payType] || '小程序码'; let payTypeText = payTypeMap[this.payType] || '小程序码';
@ -1181,15 +1182,15 @@ export default {
unitName: "", // 挂账单位 unitName: "", // 挂账单位
// consumeAmount:this.consumeAmount, // consumeAmount:this.consumeAmount,
creditAmount: (this.oilAmount + (+this.goodsAmount)).toFixed(2),//挂账金额 creditAmount: this.realAmount.toFixed(2),//挂账金额
// 优惠合计 // 优惠合计
discount: (this.oilDiscount + this.goodsDiscount + this.fullReduction + this.couponAmount).toFixed(2), // 油惠合计 discount: this.disTotal.toFixed(2), // 油惠合计
// 储值卡付款 // 储值卡付款
consumeAmount: this.consumeAmount, consumeAmount: this.realAmount.toFixed(2),
// 屯油卡付款 // 屯油卡付款
consumeRefuelMoney: this.consumeRefuelMoney ? this.consumeRefuelMoney.toFixed(2) : 0, consumeRefuelMoney: this.realAmount.toFixed(2),
// 实付款 // 实付款
actualPay: ((+this.oilActualPay) + (+this.goodsActualPay)).toFixed(2), actualPay: this.realAmount.toFixed(2),
// 找零 // 找零
seekZero: this.seekZero ? this.seekZero.toFixed(2) : 0, seekZero: this.seekZero ? this.seekZero.toFixed(2) : 0,
} }