shish 6 lat temu
rodzic
commit
109d525547

+ 1 - 4
common/models/xhBaseModel.php

@@ -33,10 +33,7 @@ class xhBaseModel extends ActiveRecord
 		return $model->attributes;
 		return $model->attributes;
 	}
 	}
 
 
-	/**
-	 * 批量添加
-	 * @param unknown $data
-	 */
+	//批量添加
 	public static function batchAdd($data)
 	public static function batchAdd($data)
 	{
 	{
 		$self		= get_called_class();
 		$self		= get_called_class();

+ 5 - 4
common/services/xhTMessageService.php

@@ -26,11 +26,10 @@ class xhTMessageService
 	public static function add($data)
 	public static function add($data)
 	{
 	{
 		$tm = xhTMessage::add($data);
 		$tm = xhTMessage::add($data);
-		$merchantId = isset($tm['merchantId']) ? $tm['merchantId'] : 0;
 		return $tm;
 		return $tm;
 	}
 	}
-	
-	public static function batch_add($data, $merchantId)
+
+	public static function batchAdd($data)
 	{
 	{
 		xhTMessage::batchAdd($data);
 		xhTMessage::batchAdd($data);
 	}
 	}
@@ -76,7 +75,9 @@ class xhTMessageService
 					$batchData[] = $data;
 					$batchData[] = $data;
 				}
 				}
 			}
 			}
-			self::batch_add($batchData, $merchantId);
+			if(!empty($batchData)){
+				self::batchAdd($batchData);
+			}
 		}
 		}
 		xhMerchantExtendService::updateByMerchantId($merchantId, ['wxTMessageInit' => 1]);
 		xhMerchantExtendService::updateByMerchantId($merchantId, ['wxTMessageInit' => 1]);
 	}
 	}