feat(withdraw): 落地方案B一体化商城余额提现与手续费内扣模式,完善多端打款退款与对账闭环
这个提交包含在:
@@ -104,8 +104,12 @@ class ScoreShop extends Common
|
||||
}
|
||||
|
||||
|
||||
public function skus($goods_id)
|
||||
public function skus($goods_id = null)
|
||||
{
|
||||
if (empty($goods_id)) {
|
||||
$goods_id = $this->request->param('goods_id');
|
||||
}
|
||||
$goods = $this->goodsModel->where('id', $goods_id)->find();
|
||||
$skus = SkuModel::with('children')->where('goods_id', $goods_id)->where('parent_id', 0)->order('weigh', 'desc')->order('id', 'asc')->select();
|
||||
$skuPrices = SkuPriceModel::with(['score_sku_price'])->where('goods_id', $goods_id)->order('weigh', 'desc')->order('id', 'asc')->select();
|
||||
|
||||
@@ -125,6 +129,7 @@ class ScoreShop extends Common
|
||||
}
|
||||
|
||||
$this->success('获取成功', null, [
|
||||
'goods' => $goods,
|
||||
'skus' => $skus,
|
||||
'sku_prices' => $skuPrices,
|
||||
'score_sku_prices' => $scoreSkuPrices
|
||||
@@ -137,6 +142,9 @@ class ScoreShop extends Common
|
||||
*/
|
||||
public function edit($goods_id = null)
|
||||
{
|
||||
if (empty($goods_id)) {
|
||||
$goods_id = $this->request->param('goods_id');
|
||||
}
|
||||
if (!$this->request->isAjax()) {
|
||||
return $this->view->fetch('add');
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户