|
|
@@ -96,7 +96,7 @@ class GoodsService extends BaseService
|
|
|
->where(function ($query) use ($params) {
|
|
|
$keyword = isset($params['keyword']) ? $params['keyword'] : '';
|
|
|
if ($keyword) {
|
|
|
- $query->where('a.goods_name', 'like', "%{$keyword}%")->orWhere('c.name', 'like', "%{$keyword}%")->orWhere('b.nickname', 'like', "%{$keyword}%")->orWhere('b.mobile', 'like', "%{$keyword}%");
|
|
|
+ $query->orWhere('b.nickname', 'like', "%{$keyword}%")->orWhere('b.mobile', 'like', "%{$keyword}%")->orWhere('c.name', 'like', "%{$keyword}%")->orWhere('c.code', 'like', "%{$keyword}%")->where('a.goods_name', 'like', "%{$keyword}%");
|
|
|
}
|
|
|
|
|
|
$username = isset($params['username']) ? $params['username'] : '';
|
|
|
@@ -224,13 +224,10 @@ class GoodsService extends BaseService
|
|
|
}
|
|
|
|
|
|
if (!isset($data['goods_name']) || empty($data['goods_name'])) {
|
|
|
- $data['goods_name'] = isset($data['id']) && $data['id'] ? '商品' . $data['id'] : '商品' . (GoodsModel::max('id') + 1);
|
|
|
+ $data['goods_name'] = 'HY' . $data['code'];
|
|
|
}
|
|
|
|
|
|
$data['real_price'] = ($data['price']-$data['sell_price']+$data['source_price']);
|
|
|
-// $feeRate = ConfigService::make()->getConfigByCode('sell_fee_rate');
|
|
|
-// $feeRate = $feeRate? $feeRate : '2.5';
|
|
|
-// $data['fee'] = round($data['price'] * $feeRate/100, 0);
|
|
|
return parent::edit($data); // TODO: Change the autogenerated stub
|
|
|
}
|
|
|
|
APPLE