github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 22:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

Browse Source
This commit is contained in:
From-wh 2023-04-17 16:54:14 +08:00
commit b8737147db
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crmeb/app/adminapi/route/user.php
View File

@ -15,11 +15,12 @@ use think\facade\Route;
*/
Route::group('user', function () {
//用户管理资源路由
Route::resource('user', 'v1.user.user')->except(['read'])->option([
Route::resource('user', 'v1.user.user')->option([
'real_name' => [
'index' => '获取用户列表',
'create' => '获取用户表单',
'save' => '保存用户',
'read' => '获取用户详情',
'edit' => '获取修改用户表单',
'update' => '修改用户',
'delete' => '删除用户'

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

@ -605,6 +605,7 @@ class StoreOrderController
* 订单统计数据
* @param Request $request
* @return mixed
* @throws \ReflectionException
*/
public function data(Request $request)
{

10
crmeb/app/dao/order/StoreOrderDao.php
View File

@ -50,17 +50,19 @@ class StoreOrderDao extends BaseDao
$realName = $where['real_name'] ?? '';
$fieldKey = $where['field_key'] ?? '';
$fieldKey = $fieldKey == 'all' ? '' : $fieldKey;
$status = $where['status'] ?? '';
unset($where['status']);
return parent::search($where, $search)->when($isDel, function ($query) use ($where) {
$query->where('is_del', $where['is_del']);
})->when(isset($where['is_system_del']), function ($query) {
$query->where('is_system_del', 0);
})->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {
switch ((int)$where['status']) {
})->when($status !== '', function ($query) use ($where, $status) {
switch ((int)$status) {
case 0://未支付
$query->where('paid', 0)->where('status', 0)->where('refund_status', 0)->where('is_del', 0);
break;
case 1://已支付 未发货
$query->where('paid', 1)->whereIn('status', [0, 4])->whereIn('refund_status', [0, 3])->when(isset($where['shipping_type']), function ($query) {
$query->where('paid', 1)->where('status', 0)->whereIn('refund_status', [0, 3])->when(isset($where['shipping_type']), function ($query) {
$query->where('shipping_type', 1);
})->where('is_del', 0);
break;
@ -95,7 +97,7 @@ class StoreOrderDao extends BaseDao
$query->where('is_del', 1);
break;
case 9://全部用户未删除的订单
$query->where('is_del', 0);
$query->whereIn('refund_status', [0, 3])->where('is_del', 0);
break;
}
})->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {

3
crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
View File

@ -363,6 +363,9 @@ class StoreCouponIssueServices extends BaseServices
public function issueUserCoupon($id, $user, bool $is_receive = false)
{
$issueCouponInfo = $this->dao->getInfo((int)$id);
if ($user->is_money_level <= 0 && $issueCouponInfo['receive_type'] == 4) {
throw new ApiException(400097);
}
$uid = $user->uid;
if (!$issueCouponInfo) throw new ApiException(400516);
/** @var StoreCouponIssueUserServices $issueUserService */

2
crmeb/app/services/order/StoreOrderServices.php
View File

@ -93,7 +93,7 @@ class StoreOrderServices extends BaseServices
{
[$page, $limit] = $this->getPageValue();
$data = $this->dao->getOrderList($where, $field, $page, $limit, $with);
$count = $this->dao->count($where);
$count = $this->dao->count($where, false);
$data = $this->tidyOrderList($data);
foreach ($data as &$item) {
$refund_num = array_sum(array_column($item['refund'], 'refund_num'));

2
template/admin/src/pages/order/orderList/handle/orderDetails.vue
View File

@ -18,7 +18,7 @@
<Col span="12" class="fontColor1"
>订单状态：{{ orderDatalist.orderInfo._status._title }}
{{
orderDatalist.orderInfo.refund && orderDatalist.orderInfo.refund.length
orderDatalist.orderInfo.refund && orderDatalist.orderInfo.refund.length && orderDatalist.orderInfo.refund_status < 2
? orderDatalist.orderInfo.is_all_refund
? '退款中'
: '部分退款中'