合并分支 '1iuzhen' 到 'master'

物流导入、销售登录订单优化



查看合并请求 !52

@@ -98,9 +98,10 @@ class LogisticsController extends AdminBaseController
             }
             $info = $this->logistics_model->where(['express'=>$insert['express']])->find();
             if($info) {
+                $update['update_time'] = time();
                 if(!$this->logistics_model->where(['id'=>$info['id']])->update($update)) {
                     Db::rollback();
-                    $this->error('数据导入中出错，请重试');
+                    $this->error('数据导入中出错，请重试'.$info['id']);
                 }
             } else {
                 if(!$this->logistics_model->addLogistics($insert)) {

@@ -113,7 +113,13 @@ class MemberSalesController extends HomeBaseController
 
     // 选择类型
     public function order_type() {
-        $typeList = $this->singleData($this->table,['delete_time'=>0],1);
+        $sale_id = cmf_get_current_user_sale_id();
+        $where = [
+            'id' => $sale_id
+        ];
+        $allow_order = Db::name('MemberSales')->where($where)->value('allow_order');
+        $allow_order_array = explode(',',$allow_order);
+        $typeList = $this->singleData($this->table,['id'=>['in',$allow_order_array],'delete_time'=>0],1);
         $this->assign('typeList',$typeList);
         return $this->fetch();
     }