|
|
@@ -75,13 +75,12 @@ class MerchantService extends BaseService
|
|
|
$applyData['parentId'] = $applyData['introSjId'] ?? 0;
|
|
|
$sj = self::add($applyData);
|
|
|
$sjId = $sj['id'];
|
|
|
- $mobile = $applyData['mobile'];
|
|
|
+ $mobile = $applyData['mobile'] ?? '';
|
|
|
|
|
|
if (!empty($applyId)) {
|
|
|
ApplyClass::updateById($applyId, ['sjId' => $sjId]);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
//生成资产
|
|
|
$assetData = [
|
|
|
'balance' => 0,
|
|
|
@@ -242,7 +241,7 @@ class MerchantService extends BaseService
|
|
|
//商家列表 ssh 2019.12.20
|
|
|
public static function getMerchantList($where)
|
|
|
{
|
|
|
- $data = MerchantClass::getList(['id', 'name','style'], $where, 'addTime DESC');
|
|
|
+ $data = MerchantClass::getList(['id', 'name', 'style'], $where, 'addTime DESC');
|
|
|
$list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
|
|
|
if (empty($list)) {
|
|
|
return $data;
|