Merge remote-tracking branch 'origin/main'

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

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

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

@@ -636,7 +636,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             order.setBalanceAmount(Double.valueOf(balanceAmount));
             order.setOilCardAmount(Double.valueOf(oilCardAmount));
             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.setUserId(userId);
             order.setStaffId(staffId);

fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue

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