for add data

helper/goods_helper.php

@@ -40,6 +40,11 @@ class goods_helper
         $goods_list = $this->goods_list_extend($goods_list);
         return $goods_list;
     }
+    public function order_goods($goods_ids,$page=0,$order='goods_id asc')
+    {
+        $goods_list = Model('goods')->cls()->getGoodsList(['goods_id' => ['in', $goods_ids]],self::fieldstr,$page,$order);
+        return $goods_list;
+    }
     //show_gid => 显示这个sku的详情
     public function get_spu($common_id,$show_gid,&$err)
     {

helper/order_helper.php

@@ -723,6 +723,9 @@ class order_base
                 $goods_spec = '';
             }
         }
+        else {
+            $val = unserialize($goods_spec);
+        }
 
         return $goods_spec;
     }
@@ -1051,12 +1054,29 @@ class vorder_helper extends order_base
 
     public function format()
     {
+        $gids = [];
+        foreach ($this->mOrders as $order) {
+            $gid = intval($order['goods_id']);
+            $gids[] = $gid;
+        }
+        $helper = new goods_helper(new bonus\normal_calc());
+        $items = $helper->order_goods($gids);
+
+        $all_goods = [];
+        foreach ($items as $item) {
+            $gid = intval($item['goods_id']);
+            $all_goods[$gid] = $item;
+        }
+
         $result = [];
         foreach ($this->mOrders as $order)
         {
+            $gid = intval($order['goods_id']);
+            $goods = $all_goods[$gid];
+
             $item['vorder_info'] = $this->order_info($order);
             $item['actions'] = $this->actions($order);
-            $item['vorder_goods'] = $this->order_goods($order);
+            $item['vorder_goods'] = $this->order_goods($order,$goods);
             if(empty($item['vorder_info']) || empty($item['vorder_goods'])) {
                 continue;
             }
@@ -1076,7 +1096,7 @@ class vorder_helper extends order_base
         return $result;
     }
 
-    private function order_goods($order)
+    private function order_goods($order,$goods_info)
     {
         $result = [];
 
@@ -1090,6 +1110,7 @@ class vorder_helper extends order_base
             return false;
         }
         $goods["goods_commonid"] = $commonid;
+
         $goods["goods_name"] = $val["goods_name"];
         $goods["goods_price"] = doubleval($val["goods_price"]);
         $goods["goods_num"] = intval($val["goods_num"]);
@@ -1102,7 +1123,7 @@ class vorder_helper extends order_base
 
         $goods["promotions_id"] = intval($val["promotions_id"]);
         $goods["gc_id"] = intval($val["gc_id"]);
-        $goods["goods_spec"] = $this->goods_spec($val["goods_spec"],$val["goods_name"]);
+        $goods["goods_spec"] = $this->goods_spec($goods_info["goods_spec"],$val["goods_name"]);
         $goods["refund"] = isset($val["refund"]) ? intval($val["refund"]) : 0;
 
         $refund_state = 0;

test/TestAddData.php

@@ -223,6 +223,13 @@ class TestAddData extends TestCase
             $this->addFile($file);
         }
     }
+    public function test20200902_addCard()
+    {
+        $files = ['fen-p-100-1.xlsx','fen-p-100-2.xlsx'];
+        foreach ($files as $file) {
+            $this->addFile($file);
+        }
+    }
 }
 
 //docker-compose -f ./docker-compose-dev.yml run phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestAddData::testCancelOrder)( .*)?$/" --test-suffix TestAddData.php /var/www/html/test