github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 06:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

Browse Source
This commit is contained in:
From-wh 2023-02-17 15:39:56 +08:00
commit 4503c866b0
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crmeb/app/adminapi/controller/v1/export/ExportExcel.php
View File

@ -110,7 +110,8 @@ class ExportExcel extends AuthController
$where = $this->request->getMore([
['store_name', ''],
['cate_id', ''],
['type', 1]
['type', 1],
['ids', []]
]);
return app('json')->success($this->service->exportProductList($where));
}

3
crmeb/app/api/controller/v1/order/StoreOrderController.php
View File

@ -409,6 +409,7 @@ class StoreOrderController
$uid = $type == 1 ? (int)$request->uid() : $orderInfo->uid;
$orderInfo->pay_uid = $uid;
$orderInfo->save();
$orderInfo = $orderInfo->toArray();
$order = $this->services->get(['order_id' => $uni]);
if (!$order)
return app('json')->fail(410173);
@ -455,7 +456,7 @@ class StoreOrderController
$success = app()->make(StoreOrderSuccessServices::class);
$payPriceStatus = $success->zeroYuanPayment($orderInfo, $uid, $paytype);
if ($payPriceStatus)//0元支付成功
return app('json')->status('success', 410195, ['order_id' => $orderInfo['order_id'], 'key' => $orderInfo['unique ']]);
return app('json')->status('success', 410195, ['order_id' => $orderInfo['order_id'], 'key' => $orderInfo['unique']]);
else
return app('json')->status('pay_error');
}

10
crmeb/app/model/product/product/StoreProduct.php
View File

@ -338,6 +338,16 @@ class StoreProduct extends BaseModel
}
}
/**
* 不在当前id中查询
* @param $query
* @param $value
*/
public function searchIdsAttr($query, $value)
{
if ($value != '') $query->whereIn('id', $value);
}
/**
* 不在当前id中查询
* @param $query

8
crmeb/app/services/product/product/StoreProductServices.php
View File

@ -93,8 +93,14 @@ class StoreProductServices extends BaseServices
/**
* 获取列表
* @param $where
* @param array $where
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @author 吴汐
* @email 442384644@qq.com
* @date 2023/02/17
*/
public function getList(array $where)
{