dever 3 years ago
parent
commit
7d1e1abf8e
4 changed files with 28 additions and 32 deletions
  1. 1 0
      app/goods/database/info.php
  2. 7 7
      app/goods/lib/Manage.php
  3. 17 22
      app/mshop/lib/Feieyun.php
  4. 3 3
      app/mshop/src/Data.php

+ 1 - 0
app/goods/database/info.php

@@ -64,6 +64,7 @@ $config = array
     (
         'insert' => 'goods/lib/manage.infoUpdate',
         'update' => 'goods/lib/manage.infoUpdate',
+        'update_status' => 'goods/lib/manage.infoUpdate',
     ),
 
     # 同步更新另外一个或多个表的数据,将数据同步到关联表中

+ 7 - 7
app/goods/lib/Manage.php

@@ -76,6 +76,13 @@ class Manage
      */
     public function infoUpdate($id, $name, $data)
     {
+        $status = Dever::param('status', $data);
+        if ($status > 0) {
+            Dever::db('shop/goods')->updates(array('option_goods_id' => $id, 'set_status' => $status));
+            Dever::db('store/goods')->updates(array('option_goods_id' => $id, 'set_status' => $status));
+            Dever::db('factory/goods')->updates(array('option_goods_id' => $id, 'set_status' => $status));
+        }
+
         # 更新分类id
         $category = Dever::param('category', $data);
         if ($category) {
@@ -112,13 +119,6 @@ class Manage
             $update['where_id'] = $id;
             Dever::db('goods/info')->update($update);
         }
-
-        $status = Dever::param('status', $data);
-        if ($status > 0) {
-            Dever::db('shop/goods')->update(array('goods_id' => $id, 'status' => $status));
-            Dever::db('store/goods')->update(array('goods_id' => $id, 'status' => $status));
-            Dever::db('factory/goods')->update(array('goods_id' => $id, 'status' => $status));
-        }
     }
 
     /**

+ 17 - 22
app/mshop/lib/Feieyun.php

@@ -135,21 +135,20 @@ class Feieyun
 		return $result;
     }
 
-    # 打印商品排版 商品列表,名称长度,单价长度,数量长度,金额长度
-    public function goods($name, $goods, $A = 14, $B = 6, $C = 3, $D = 6)
+    # 打印商品排版 商品列表,名称长度,数量长度,单价长度
+    public function goods($name, $goods, $A = 14, $B = 4, $C = 12)
     {
     	$orderInfo = '';
     	$orderInfo .= '--------------------------------<BR>';
     	if ($name) {
     		$orderInfo .= '<C>'.$name.'</C><BR>';
     	}
-		$orderInfo .= '名称           单价  数量 金额<BR>';
+		$orderInfo .= '名称               数量   单价 <BR>';
 		
 		foreach ($goods as $k5 => $v5) {
 			$name = $v5['title'];
 			$price = $v5['price'];
 			$num = $v5['num'];
-			$prices = $v5['total'];
 			$kw3 = '';
 			$kw1 = '';
 			$kw2 = '';
@@ -161,27 +160,23 @@ class Feieyun
 			$j=1;
 			$blankNum++;
 			$result = array();
-			if (strlen($price) < $B) {
-				$k1 = $B - strlen($price);
+
+      if (strlen($num) < $B) {
+        $k2 = $B - strlen($num);
+        for ($q=0; $q<$k2; $q++) {
+          $kw2 .= ' ';
+        }
+        $num = $num.$kw2;
+      }
+
+			if (strlen($price) < $C) {
+				$k1 = $C - strlen($price);
 				for ($q=0; $q<$k1; $q++) {
 					$kw1 .= ' ';
 				}
 				$price = $price.$kw1;
 			}
-			if (strlen($num) < $C) {
-				$k2 = $C - strlen($num);
-				for ($q=0; $q<$k2; $q++) {
-					$kw2 .= ' ';
-				}
-				$num = $num.$kw2;
-			}
-			if (strlen($prices) < $D) {
-				$k3 = $D - strlen($prices);
-				for ($q=0;$q<$k3;$q++) {
-					$kw4 .= ' ';
-				}
-				$prices = $prices.$kw4;
-			}
+			
 			for ($i=0;$i<$lan;$i++) {
 				$new = mb_substr($str,$m,$j,'utf-8');
 				$j++;
@@ -195,7 +190,7 @@ class Feieyun
 							$kw3 .= ' ';
 						}
 						if ($m==$j) {
-							$tail .= $kw3.' '.$price.' '.$num.' '.$prices;
+							$tail .= $kw3.' '.$num.' '.$price;
 						} else {
 							$tail .= $kw3.'<BR>';
 						}
@@ -218,7 +213,7 @@ class Feieyun
 					$v_lenght = Dever::convert($value);
 					$v_lenght = strlen($v_lenght);
 					if($v_lenght == 13) $value = $value." ";
-					$head .= $value.' '.$price.' '.$num.' '.$prices;
+					$head .= $value.' '.$num.' '.$price;
 				} else {
 					$head .= $value.'<BR>';
 				}

+ 3 - 3
app/mshop/src/Data.php

@@ -501,9 +501,9 @@ class Data extends Core
             $d  = array
             (
                 'title' => $v['info']['name'] . $sku,
-                'price' => '' . $v['price'],
+                'price' => '123.456',
                 'num' => $v['num'],
-                'total' => '' . $v['price']*$v['num'],
+                'total' => '123.456',
             );
             $goods[] = $d;
             if ($v['status'] == 3) {
@@ -567,7 +567,7 @@ class Data extends Core
         $content .= '<C>'.$main_config['worktime'].'</C><BR>';
         //$content .= '<QR>http://www.feieyun.com</QR>';//把二维码字符串用标签套上即可自动生成二维码
 
-        echo $content;die;
+        echo $content;
         Dever::load('mshop/lib/feieyun')->printOrder($info['number'], $content, 1);
 
         return 'ok';