ad

app/admin/controller/Activity.php

@@ -278,6 +278,11 @@ class Activity extends Base
         if($activity_name==""){
             return error_show(1004,"参数activity_name不能为空");
         }
+        $ist =Db::name("good_activity")->where([["activity_name","=",$activity_name],["status","<",7],["is_del","=",
+        0]])->findOrEmpty();
+        if(!empty($ist)){
+        	return error_show(1004,"活动名称已存在");
+        }
         $platform_code = isset($this->post['platform_code'])&&$this->post['platform_code']!="" ? trim($this->post['platform_code']):"";
         if($platform_code==""){
             return error_show(1004,"参数platform_code不能为空");

app/admin/controller/OrderOutChild.php

@@ -530,12 +530,12 @@ class OrderOutChild extends Base
 
             foreach ($param as $value) {
 
-                if ($val->check($value) == false) throw new Exception($val->getError());
+                if ($val->check($value) == false) throw new \Exception($val->getError());
 
                 //如果是库存品，只能由库管操作
                 //其他商品，若level2只能由供应商负责人操作，level3不限制
                 if ($sale[$child[$value['outChildCode']]['orderCode']]['is_stock'] == 1) {
-                    if ($this->uid != $wsm_contactor[$child[$value['outChildCode']]['wsm_code']]) throw new Exception('库存品只能由仓库管理员操作');
+                    if ($this->uid != $wsm_contactor[$child[$value['outChildCode']]['wsm_code']]) throw new \Exception('库存品只能由仓库管理员操作');
                 } else {
 //                    if (($this->level == 2) && ($this->uid != $person[$child[$value['outChildCode']]['supplierNo']])) throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                 }
@@ -551,7 +551,7 @@ class OrderOutChild extends Base
 //                if (($this->level) == 3 && ($sale[$child[$value['outChildCode']]['orderCode']]['is_stock'] == 1) && ($this->uid != $wsm_contactor[$child[$value['outChildCode']]['wsm_code']])) throw new Exception('库存品只能由仓库管理员操作');
 
                 //工单
-                if (!isset($child[$value['outChildCode']])) throw new Exception($value['outChildCode'] . '工单不存在或状态不允许发货');
+                if (!isset($child[$value['outChildCode']])) throw new \Exception($value['outChildCode'] . '工单不存在或状态不允许发货');
 
               $up=  Db::name('order_out_child')
                     ->where(['id' => $child[$value['outChildCode']]['id'], 'is_del' => 0, 'status' => 1])
@@ -702,7 +702,7 @@ class OrderOutChild extends Base
             }
             return json_show(0, '操作完成');
 
-        } catch (Exception $exception) {
+        } catch (\Exception $exception) {
 
             Db::rollback();
 

app/admin/controller/SaleReport.php

@@ -3297,8 +3297,8 @@ class SaleReport extends Base
 		 	'person_id' => '',
 		 	'page' => 1,
 		 	'size' => 15,
-		 	'start_day' => date('Y-m-01'),
-		 	'end_day' => date('Y-m-t'),
+//		 	'start_day' => date('Y-m-01'),
+//		 	'end_day' => date('Y-m-t'),
 		 	'order_start_day' => date('Y-m-01'),
 		 	'order_end_day' => date('Y-m-t')],
 		 	'post', 'trim');
@@ -3315,8 +3315,8 @@ class SaleReport extends Base
         if ($param['supplier_name'] != '') $where[] = ['a.supplierName', 'like', '%' . $param['supplier_name'] . '%'];
         if ($param['companyNo'] != '') $where[] = ['a.companyNo', 'like', '%' . $param['companyNo'] . '%'];
         if ($param['companyName'] != '') $where[] = ['a.companyName', 'like', '%' . $param['companyName'] . '%'];
-         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
-         if ($param['order_start_day'] != '' && $param['order_end_day'] != '') $where[] = ['c.addtime', 'between',
+//         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
+         if ($param['order_start_day'] != '' && $param['order_end_day'] != '') $where[] = ['a.addtime', 'between',
          [$param['order_start_day'] . ' 00:00:00', $param['order_end_day'] . ' 23:59:59']];
         $count = Db::name("order_out_child")->alias("a")->leftJoin('sale c','a.orderCode=c.orderCode')->where($where)->count();
         $list = Db::name("order_out_child")
@@ -3376,7 +3376,7 @@ class SaleReport extends Base
 		 	'depart_id' => '',
 		 	'person_id' => '',
 		 	'supplier_name' => '',
-		 	'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t'),
+//		 	'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t'),
 		 	'order_start_day' => date('Y-m-01'), 'order_end_day' => date('Y-m-t'),
 		 	], 'post', 'trim');
 
@@ -3392,8 +3392,8 @@ class SaleReport extends Base
         if ($param['supplier_name'] != '') $where[] = ['a.supplierName', 'like', '%' . $param['supplier_name'] . '%'];
         if ($param['companyNo'] != '') $where[] = ['a.companyNo', 'like', '%' . $param['companyNo'] . '%'];
         if ($param['companyName'] != '') $where[] = ['a.companyName', 'like', '%' . $param['companyName'] . '%'];
-        if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
-        if ($param['order_start_day'] != '' && $param['order_end_day'] != '') $where[] = ['c.addtime', 'between',
+//        if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
+        if ($param['order_start_day'] != '' && $param['order_end_day'] != '') $where[] = ['a.addtime', 'between',
          [$param['order_start_day'] . ' 00:00:00', $param['order_end_day'] . ' 23:59:59']];
         $list = Db::name("order_out_child")
         ->alias("a")

app/command/ImportOrderFromCAnalysisData.php

@@ -145,7 +145,7 @@ class ImportOrderFromCAnalysisData extends Command
                         $activity_info = Db::name('activity_info')
                             ->alias('ai')
                             ->field('ai.id,ga.activity_name,ga.activity_code,ai.moq_num,ai.activity_price')
-                            ->where(['ai.skuCode' => $extend_insert_data['skuCode'], 'ga.activity_name' => $rs['activity_name'], 'ai.is_del' => 0])
+                            ->where(['ai.skuCode' => $extend_insert_data['skuCode'], 'ga.activity_name' => $rs['activity_name'], 'ai.is_del' => 0,"ga.status"=>6])
                             ->leftJoin('good_activity ga', 'ga.activity_code=ai.activity_code AND ga.is_del=0')
                             ->find();
                         if (empty($activity_info)) {