bug

fuintAdmin/src/views/order/order_Cashier.vue

@@ -172,6 +172,10 @@
           <el-descriptions-item label="油品优惠总额">{{ cashierOrder.oilDiscountAmount }}</el-descriptions-item>
           <el-descriptions-item label="商品优惠总额">{{ cashierOrder.goodsDiscountAmount }}</el-descriptions-item>
           <el-descriptions-item label="实付金额">{{ cashierOrder.payAmount }}</el-descriptions-item>
+          <el-descriptions-item label="储值卡或囤油卡消费金额">
+            <span v-if="cashierOrder.oilOrderAmount - cashierOrder.oilDiscountAmount - cashierOrder.payAmount>0 && cashierOrder.status=='paid' && cashierOrder.payUser!='散客'">{{ (cashierOrder.oilOrderAmount - cashierOrder.oilDiscountAmount - cashierOrder.payAmount).toFixed(2) || 0 }}</span>
+            <span v-else>0</span>
+          </el-descriptions-item>
           <el-descriptions-item label="找零金额">{{ cashierOrder.seekZero }}</el-descriptions-item>
           <el-descriptions-item label="付款方式">
             <span v-if="cashierOrder.payType == 'CASH'">现金</span>

fuintAdmin/src/views/order/order_Oil.vue

@@ -181,7 +181,13 @@
           </el-table-column>
           <el-table-column label="付款信息" align="center">
             <el-table-column prop="payAmount" label="实付金额" align="center" width="120"> </el-table-column>
-            <el-table-column prop="payUser" label="付款用户" align="center" > </el-table-column>
+            <el-table-column prop="payAmount" label="储值卡或囤油卡付款金额" align="center" width="120">
+              <template slot-scope="props">
+                <span v-if="props.row.orderAmount - props.row.discountAmount - props.row.payAmount>0 && props.row.userId && props.row.orderStatus=='paid'">{{ (props.row.orderAmount - props.row.discountAmount - props.row.payAmount).toFixed(2) || 0 }}</span>
+                <span v-else>0</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="payUser" label="付款用户" align="center" width="120" > </el-table-column>
             <el-table-column prop="payType" label="付款方式" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{getType(payList,scope.row.payType)}}</span>
@@ -204,7 +210,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
 <!--              <el-button style="width: 60px" size="mini"-->
 <!--                         @click="patchwork(scope.row)"-->

fuintAdmin/src/views/order/order_Ordinary.vue

@@ -114,7 +114,13 @@
           </el-table-column>
           <el-table-column label="付款信息" align="center">
             <el-table-column prop="payAmount" label="实付金额" align="center" width="120"> </el-table-column>
-            <el-table-column prop="payUser" label="付款用户" align="center" > </el-table-column>
+            <el-table-column prop="payAmount" label="储值卡或囤油卡付款金额" align="center" width="120">
+              <template slot-scope="props">
+                <span v-if="props.row.orderAmount - props.row.discountAmount - props.row.payAmount>0 && props.row.userId && props.row.orderStatus=='paid'">{{ (props.row.orderAmount - props.row.discountAmount - props.row.payAmount).toFixed(2) || 0 }}</span>
+                <span v-else>0</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="payUser" label="付款用户" align="center" width="120" > </el-table-column>
             <el-table-column prop="payType" label="付款方式" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{getType(payList,scope.row.payType)}}</span>
@@ -136,7 +142,7 @@
               <span>{{ scope.row.payTime ? parseTime(scope.row.payTime):"--" }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
             <template slot-scope="scope">
 <!--              <el-button style="width: 60px" size="mini"-->
 <!--                         @click="getOrdersInfo(scope.row.id)"-->

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

@@ -350,6 +350,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                     order.setOrderAmount(amount);
                     order.setPayAmount(oilActualPay);
                     order.setOrderNo(orderNo);
+                    order.setDiscountAmount(oilDiscount);
                     if (payType.equals("CASH")){
                         staffCommissionService.countStaffCommission(staffId,storeId,oilAmount,oilActualPay,oilLiters,"1",orderNo);
                     }
@@ -373,7 +374,6 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                 order.setOils((String) jsonObjects.get(i).get("oilName"));
                 order.setOilGunNum(jsonObjects.get(i).get("gunName").toString());
                 order.setOilNum(oilNum);
-                order.setDiscountAmount(oilDiscount);
                 order.setPayUser(payUser);
                 order.setPayType(payType);
                 order.setInvoicing("未开票");
@@ -458,6 +458,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                 e.printStackTrace();
 //                throw new RuntimeException("支付失败");
             }
+        }else {
+            this.insertAllOrderInfo(orderNo,storeId,oilAmount+goodsAmount,Double.valueOf(map.get("allAmount")),payType,userId,"PC","6","paid");
         }
 
         OilOrder oilOrder2 = this.selectOilOrderByOrderNo(orderNo);

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

@@ -2526,7 +2526,7 @@
         this.map.goodsAmount = this.goodsAmount;
         this.map.oilActualPay = this.oilActualPay;
         this.map.goodsActualPay = this.goodsActualPay;
-        this.map.oilDiscount = this.oilDiscount;
+        this.map.oilDiscount = (this.oilDiscount + this.goodsDiscount + this.fullReduction + this.couponAmount).toFixed(2) ;
         this.map.goodsDiscount = this.goodsDiscount;
         this.map.goodsNum = this.goodsTotal;
         this.map.oilOrder = JSON.stringify(this.oilOrder);

fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue

@@ -172,6 +172,10 @@
           <el-descriptions-item label="油品优惠总额">{{ cashierOrder.oilDiscountAmount }}</el-descriptions-item>
           <el-descriptions-item label="商品优惠总额">{{ cashierOrder.goodsDiscountAmount }}</el-descriptions-item>
           <el-descriptions-item label="实付金额">{{ cashierOrder.payAmount }}</el-descriptions-item>
+          <el-descriptions-item label="储值卡或囤油卡消费金额">
+            <span v-if="cashierOrder.oilOrderAmount - cashierOrder.oilDiscountAmount - cashierOrder.payAmount>0 && cashierOrder.status=='paid' && cashierOrder.payUser!='散客'">{{ (cashierOrder.oilOrderAmount - cashierOrder.oilDiscountAmount - cashierOrder.payAmount).toFixed(2) || 0 }}</span>
+            <span v-else>0</span>
+          </el-descriptions-item>
           <el-descriptions-item label="找零金额">{{ cashierOrder.seekZero }}</el-descriptions-item>
           <el-descriptions-item label="付款方式">
             <span v-if="cashierOrder.payType == 'CASH'">现金</span>

fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue

@@ -182,7 +182,13 @@
           </el-table-column>
           <el-table-column label="付款信息" align="center">
             <el-table-column prop="payAmount" label="实付金额" align="center" width="120"> </el-table-column>
-            <el-table-column prop="payUser" label="付款用户" align="center" > </el-table-column>
+            <el-table-column prop="payAmount" label="储值卡或囤油卡付款金额" align="center" width="120">
+              <template slot-scope="props">
+                <span v-if="props.row.orderAmount - props.row.discountAmount - props.row.payAmount>0 && props.row.userId && props.row.orderStatus=='paid'">{{ (props.row.orderAmount - props.row.discountAmount - props.row.payAmount).toFixed(2) || 0 }}</span>
+                <span v-else>0</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="payUser" label="付款用户" align="center"  width="120"> </el-table-column>
             <el-table-column prop="payType" label="付款方式" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{getType(payList,scope.row.payType)}}</span>

fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue

@@ -114,6 +114,12 @@
           </el-table-column>
           <el-table-column label="付款信息" align="center">
             <el-table-column prop="payAmount" label="实付金额" align="center" width="120"> </el-table-column>
+            <el-table-column prop="payAmount" label="储值卡或囤油卡付款金额" align="center" width="120">
+              <template slot-scope="props">
+                <span v-if="props.row.orderAmount - props.row.discountAmount - props.row.payAmount>0 && props.row.userId && props.row.orderStatus=='paid'">{{ (props.row.orderAmount - props.row.discountAmount - props.row.payAmount).toFixed(2) || 0 }}</span>
+                <span v-else>0</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="payUser" label="付款用户" align="center" > </el-table-column>
             <el-table-column prop="payType" label="付款方式" align="center" width="120">
               <template slot-scope="scope">