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

11.14

Browse Source
This commit is contained in:
sw 2024-11-14 14:04:58 +08:00
parent f81228b459
commit f35039da9b
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
View File

@ -666,6 +666,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
// 更新油品订单状态 // 更新油品订单状态
oilOrder.setOrderStatus("refund"); oilOrder.setOrderStatus("refund");
oilOrderMapper.updateById(oilOrder); oilOrderMapper.updateById(oilOrder);
userBalance.setGiveAmount((new BigDecimal(oilOrder.getBalanceGiftAmount().toString()).add(new BigDecimal(userBalance.getGiveAmount().toString()))).doubleValue());
} }
// 如果订单有商品 // 如果订单有商品
if (ObjectUtil.isNotEmpty(cashierOrder.getGoodsOrderId())) { if (ObjectUtil.isNotEmpty(cashierOrder.getGoodsOrderId())) {

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

@ -636,7 +636,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setBalanceAmount(Double.valueOf(balanceAmount)); order.setBalanceAmount(Double.valueOf(balanceAmount));
order.setOilCardAmount(Double.valueOf(oilCardAmount)); order.setOilCardAmount(Double.valueOf(oilCardAmount));
order.setActiveAmount(activeAmount); order.setActiveAmount(activeAmount);
order.setBalanceGiftAmount( this.countCardBalance(Double.valueOf(balanceAmount), userId, storeId, orderNo)); order.setBalanceGiftAmount( this.countCardBalance(Double.valueOf(amount), userId, storeId, orderNo));
order.setStoreId(storeId); order.setStoreId(storeId);
order.setUserId(userId); order.setUserId(userId);
order.setStaffId(staffId); order.setStaffId(staffId);

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

@ -1185,9 +1185,13 @@ export default {
'car_card_value': '车队卡', 'car_card_value': '车队卡',
}; };
let payTypeText = payTypeMap[this.payType] || '小程序码'; let payTypeText = payTypeMap[this.payType] || '小程序码';
let mm=[]
mm.push({
orderNo:this.orderNo,
payUser:this.chooseVipUser.mobile
})
let f = { let f = {
oilOrder: oilOrderR, oilOrder: mm,
goodsOrder: goodsOrderR, goodsOrder: goodsOrderR,
payType: payTypeText, payType: payTypeText,
unitName: "", // 挂账单位 unitName: "", // 挂账单位