no message

admin-ui/src/views/order/financial/manageDay.vue

@@ -60,17 +60,17 @@
               <span class="card-title">洗衣订单统计</span>
             </div>
             <el-descriptions :column="4" border>
-              <el-descriptions-item label="订单数量">{{ orderStats.clothOrderCount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="订单笔数">{{ orderStats.clothOrderCount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="订单金额">¥{{ orderStats.clothOrderAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="实收金额">¥{{ orderStats.clothReceiveAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="会员金额">¥{{ orderStats.clothMemberAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="退款金额">¥{{ orderStats.clothRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="微信退款">¥{{ orderStats.clothWechatRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="支付宝退款">¥{{ orderStats.clothAlipayRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="现金退款">¥{{ orderStats.clothCashRefundAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="微信支付">¥{{ orderStats.clothWechatAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="支付宝支付">¥{{ orderStats.clothAlipayAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="现金支付">¥{{ orderStats.clothCashAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="退款总金额">¥{{ orderStats.clothRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="微信退款">¥{{ orderStats.clothWechatRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="支付宝退款">¥{{ orderStats.clothAlipayRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="现金退款">¥{{ orderStats.clothCashRefundAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="会员退款">¥{{ orderStats.clothMemberRefundAmount || 0 }}</el-descriptions-item>
             </el-descriptions>
           </el-card>
@@ -83,17 +83,18 @@
               <span class="card-title">商品订单统计</span>
             </div>
             <el-descriptions :column="4" border>
-              <el-descriptions-item label="订单数量">{{ orderStats.goodsOrderCount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="订单笔数">{{ orderStats.goodsOrderCount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="订单金额">¥{{ orderStats.goodsOrderAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="实收金额">¥{{ orderStats.goodsReceiveAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="会员金额">¥{{ orderStats.goodsMemberAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="退款金额">¥{{ orderStats.goodsRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="微信支付">¥{{ orderStats.goodsWechatAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="支付宝支付">¥{{ orderStats.goodsAlipayAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="现金支付">¥{{ orderStats.goodsCashAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="退款总金额">¥{{ orderStats.goodsRefundAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="微信退款">¥{{ orderStats.goodsWechatRefundAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="支付宝退款">¥{{ orderStats.goodsAlipayRefundAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="现金退款">¥{{ orderStats.goodsCashRefundAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="会员退款">¥{{ orderStats.goodsMemberRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="微信支付">¥{{ orderStats.goodsWechatAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="支付宝支付">¥{{ orderStats.goodsAlipayAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="现金支付">¥{{ orderStats.goodsCashAmount || 0 }}</el-descriptions-item>
             </el-descriptions>
           </el-card>
         </el-col>
@@ -105,21 +106,22 @@
               <span class="card-title">充值统计</span>
             </div>
             <el-descriptions :column="4" border>
-              <el-descriptions-item label="充值次数">{{ chargeStats.rechargeCount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="充值金额">¥{{ chargeStats.rechargePayAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="赠送金额">¥{{ chargeStats.arriveGiveAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="福利金额">¥{{ chargeStats.arriveWelfareAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="退款金额">¥{{ chargeStats.refundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="微信退款">¥{{ chargeStats.wechatRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="支付宝退款">¥{{ chargeStats.alipayRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="现金退款">¥{{ chargeStats.cashRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="充值笔数">{{ chargeStats.rechargeCount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="现金实付">¥{{ chargeStats.rechargePayAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="现金到账">¥{{ chargeStats.arriveCashAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="赠送到账">¥{{ chargeStats.arriveGiveAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="福利金到账">¥{{ chargeStats.arriveWelfareAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="微信支付">¥{{ chargeStats.wechatPayAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="支付宝支付">¥{{ chargeStats.alipayAmount || 0 }}</el-descriptions-item>
               <el-descriptions-item label="现金支付">¥{{ chargeStats.cashPayAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="卡支付">¥{{ chargeStats.cardPayAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="赠送退款">¥{{ chargeStats.arriveGiveRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="福利退款">¥{{ chargeStats.arriveWelfareRefundAmount || 0 }}</el-descriptions-item>
-              <el-descriptions-item label="现金赠送退款">¥{{ chargeStats.arriveCashRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="卡密支付">¥{{ chargeStats.cardPayAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="退款总金额">¥{{ chargeStats.refundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="微信退款">¥{{ chargeStats.wechatRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="支付宝退款">¥{{ chargeStats.alipayRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="现金退款">¥{{ chargeStats.cashRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="赠送余额退回">¥{{ chargeStats.arriveGiveRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="福利余额退回">¥{{ chargeStats.arriveWelfareRefundAmount || 0 }}</el-descriptions-item>
+              <el-descriptions-item label="现金余额退回">¥{{ chargeStats.arriveCashRefundAmount || 0 }}</el-descriptions-item>
             </el-descriptions>
           </el-card>
         </el-col>
@@ -169,6 +171,7 @@
           clothMemberRefundAmount: 0,
           goodsOrderCount: 0,
           goodsOrderAmount: 0,
+          goodsReceiveAmount: 0,
           goodsMemberAmount: 0,
           goodsRefundAmount: 0,
           goodsWechatRefundAmount: 0,
@@ -227,6 +230,7 @@
             clothMemberRefundAmount: orderStats.clothMemberRefundAmount || 0,
             goodsOrderCount: orderStats.goodsOrderCount || 0,
             goodsOrderAmount: orderStats.goodsOrderAmount || 0,
+            goodsReceiveAmount: orderStats.goodsReceiveAmount || 0,
             goodsMemberAmount: orderStats.goodsMemberAmount || 0,
             goodsRefundAmount: orderStats.goodsRefundAmount || 0,
             goodsWechatRefundAmount: orderStats.goodsWechatRefundAmount || 0,