dever 3 anni fa
parent
commit
6f1f83ffca
2 ha cambiato i file con 4 aggiunte e 2 eliminazioni
  1. 1 1
      app/shop/lib/Refund.php
  2. 3 1
      app/shop/src/Excel.php

+ 1 - 1
app/shop/lib/Refund.php

@@ -450,7 +450,7 @@ class Refund
             if (!$result) {
                 # 退款失败,抛出错误
                 //throw new \Exception('退款失败');
-                Dever::alert('退款失败');
+                Dever::alert('退款失败,请联系管理员');
             }
         }
         

+ 3 - 1
app/shop/src/Excel.php

@@ -271,7 +271,7 @@ class Excel
         $file = Dever::input('excel_name');
 
 
-        $header = array('仓库名称', '供货商', '订货单号', '订货总数量', '商品编码', '商品名称', '规格型号', '商品订货数量', '订货日期', '发货日期', '收货日期', '订货单状态', '已退商品数量');
+        $header = array('仓库名称', '供货商', '订货单号', '订货总数量', '入库总价', '商品编码', '商品名称', '规格型号', '商品订货数量', '入库单价', '订货日期', '发货日期', '收货日期', '订货单状态', '已退商品数量');
 
         $table = 'store/info';
 
@@ -317,11 +317,13 @@ class Excel
                     $source,
                     $v['order_num'],
                     $v['num'],
+                    $v['p_price'],
 
                     $goods_info['code'],
                     $goods_info['name'],
                     $sku,
                     $v1['num'],
+                    $v1['p_price'],
 
                     $cdate,
                     $fdate,