Merge branch 'master-dev' of wugg/cxinv into master

app/command/good.php

@@ -66,6 +66,9 @@ class good extends Command
 				];
 				Db::name("good")->insert($array);
 				echo "【".date("Y-m-d H:i:s")."】 添加商品{$v['spuCode']}进入类目表\r\n";
+			}else{
+
+				echo "【".date("Y-m-d H:i:s")."】 更新商品{$v['spuCode']}进入类目表\r\n";
 			}
         }
     }
@@ -82,8 +85,10 @@ class good extends Command
             })
             ->withAttr("good_unit",function ($m){
             	return Db::connect('mysql_wsm')->name('unit')->where("id",$m)->value("unit","");
-            })->field("spuCode,good_name,cat_id,good_unit,craft_desc,after_sales,supplierNo,companyNo,good_img,good_info_img,good_thumb_img,creater,createrid,is_stock,0 isZx")
-            ->where("addtime",">=", $this->date)
+            })->field("spuCode,good_name,cat_id,good_unit,craft_desc,after_sales,supplierNo,companyNo,good_img,
+            good_info_img,good_thumb_img,creater,createrid,is_stock,0 isZx")
+            ->where("updatetime",">=", $this->date)
+            ->where("status","=", 1)
             ->select()->toArray();
     	    return $this->addGood($list);
     }