更新调货详情
This commit is contained in:
parent
e800de2046
commit
7ba9772db9
@ -137,10 +137,10 @@ class CommunityRepository extends BaseRepository
|
|||||||
}
|
}
|
||||||
$list[$k]['mer_name'] = '';
|
$list[$k]['mer_name'] = '';
|
||||||
$list[$k]['mer_avatar'] = '';
|
$list[$k]['mer_avatar'] = '';
|
||||||
$merInfo = Db::name('StoreService')->alias('ss')->leftJoin('Merchant m','ss.mer_id = m.mer_id')->where('ss.uid', $item['uid'])->field('m.mer_avatar, m.mer_name')->find();
|
$merInfo = Db::name('StoreService')->alias('ss')->leftJoin('Merchant m','ss.mer_id = M.mer_id')->where('ss.uid', $item['uid'])->field('m.mer_avatar, m.mer_name')->find();
|
||||||
if ($merInfo) {
|
if ($merInfo) {
|
||||||
$list[$k]['mer_avatar'] = $merInfo['mer_avatar'];
|
|
||||||
$list[$k]['mer_name'] = $merInfo['mer_name'];
|
$list[$k]['mer_name'] = $merInfo['mer_name'];
|
||||||
|
$list[$k]['mer_avatar'] = $merInfo['mer_avatar'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -286,6 +286,17 @@ class CommunityRepository extends BaseRepository
|
|||||||
foreach ($data['resale'] as $value) {
|
foreach ($data['resale'] as $value) {
|
||||||
$data['total_price'] = bcadd($data['total_price'], bcmul($value['price'], $value['number'], 2), 2);
|
$data['total_price'] = bcadd($data['total_price'], bcmul($value['price'], $value['number'], 2), 2);
|
||||||
}
|
}
|
||||||
|
$data['mer_avatar'] = '';
|
||||||
|
$data['mer_name'] = '';
|
||||||
|
$data['sales'] = 0;
|
||||||
|
$data['care_count'] = 0;
|
||||||
|
$merInfo = Db::name('StoreService')->alias('ss')->leftJoin('Merchant m','ss.mer_id = m.mer_id')->where('ss.uid', $data['uid'])->field('m.mer_avatar, m.mer_name, m.sales, m.care_count')->find();
|
||||||
|
if ($merInfo) {
|
||||||
|
$data['mer_avatar'] = $merInfo['mer_avatar'];
|
||||||
|
$data['mer_name'] = $merInfo['mer_name'];
|
||||||
|
$data['sales'] = $merInfo['sales'];
|
||||||
|
$data['care_count'] = $merInfo['care_count'];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user