Merge branch 'develop' of https://git.yidian-inc.com:8021/bp/goods into develop

application/exception/custom/MarketingException.php

@@ -19,5 +19,7 @@ class MarketingException extends BaseException
         5 => '创建失败',
         6 => '活动id不能为空',
         7 => '更新失败',
+        8 => '开始时间不能为空',
+        9 => '结束时间不能为空',
     ];
 }
\ No newline at end of file

application/services/marketing/MarketingService.php

@@ -48,8 +48,8 @@ class MarketingService
     public static function addMarketing($params){
 
         $marketingName = !empty($params['marketing_name']) ? $params['marketing_name'] : '';
-        $firstCommissionRate = !empty($params['first_commission_rate']) ? $params['first_commission_rate'] : '';
-        $secondCommissionRate = !empty($params['second_commission_rate']) ? $params['second_commission_rate'] : '';
+        $firstCommissionRate = !empty($params['first_commission_value']) ? $params['first_commission_value'] : '';
+        $secondCommissionRate = !empty($params['second_commission_value']) ? $params['second_commission_value'] : '';
         $createUserEmail = !empty($params['op_cur_user']) ? $params['op_cur_user'] : '';
         $startTime = !empty($params['start_time']) ? $params['start_time'] : '';
         $endTime = !empty($params['end_time']) ? $params['end_time'] : '';
@@ -69,11 +69,17 @@ class MarketingService
         //     throw new MarketingException(['cus'=>4]);
         // }
  
- 
         if (self::utf8Strlen($marketingName) > 40) {
             throw new MarketingException(['cus'=>1]);
         }
 
+        if (empty($startTime)) {
+             throw new MarketingException(['cus'=>8]);
+        }
+
+        if (empty($endTime)) {
+             throw new MarketingException(['cus'=>9]);
+        }
 
         $detectParams = [
             'businessId' => 1,
@@ -96,8 +102,8 @@ class MarketingService
         $colums = [
             //'marketing_id' => $marketing_id,
             'marketing_name' => $marketingName,
-            'first_commission_rate' => $firstCommissionRate,
-            'second_commission_rate' => $secondCommissionRate,
+            'first_commission_value' => $firstCommissionRate,
+            'second_commission_value' => $secondCommissionRate,
             'create_user_email' => $createUserEmail,
             'good_count' => 0,
             'start_time' => $startTime,

application/services/shop/ShopService.php

@@ -57,6 +57,7 @@ class ShopService
         if (!empty($sensitive['data'])) {
             throw new ShopException(['cus' => 4]);
         }
+
         //判断店铺重复
         if (!self::isName($name)) {
             throw new ShopException(['cus' => 6]);