mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/purchase_record' into dev

Browse Source
This commit is contained in:
luofei 2023-07-07 16:23:42 +08:00
commit eea968cff9
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/common/dao/store/order/StoreOrderDao.php
View File

@ -15,6 +15,7 @@ namespace app\common\dao\store\order;
use app\common\dao\BaseDao; use app\common\dao\BaseDao;
use app\common\model\store\order\StoreGroupOrder;
use app\common\model\store\order\StoreOrder; use app\common\model\store\order\StoreOrder;
use app\common\model\store\order\StoreOrderProduct; use app\common\model\store\order\StoreOrderProduct;
use app\common\model\store\order\StoreOrderStatus; use app\common\model\store\order\StoreOrderStatus;
@ -105,6 +106,12 @@ class StoreOrderDao extends BaseDao
case 10 : case 10 :
$query->where('paid', 1)->whereIn('StoreOrder.status', [10, 11]); $query->where('paid', 1)->whereIn('StoreOrder.status', [10, 11]);
break; break;
case 2 :
$query->where('StoreOrder.status', $where['status'])->where('pay_type', '!=', StoreGroupOrder::PAY_TYPE_CREDIT_BUY);
break;
case 20 :
$query->whereRaw('paid=0 or (StoreOrder.status=' . StoreOrder::STATUS_WAIT_COMMENT . ' and pay_type=' . StoreGroupOrder::PAY_TYPE_CREDIT_BUY . ')');
break;
default: default:
$query->where('StoreOrder.status', $where['status']); $query->where('StoreOrder.status', $where['status']);
break; break;
@ -506,7 +513,7 @@ class StoreOrderDao extends BaseDao
{ {
return StoreOrderStatus::getDB()->alias('A')->leftJoin('StoreOrder B', 'A.order_id = B.order_id') return StoreOrderStatus::getDB()->alias('A')->leftJoin('StoreOrder B', 'A.order_id = B.order_id')
->where('A.change_type', 'take') ->where('A.change_type', 'take')
->where('A.change_time', '<', $end)->where('B.paid', 1)->where('B.status', 2) ->where('A.change_time', '<', $end)->where('B.paid', 1)->where('B.status', 2)->where('B.pay_type', '!=', StoreGroupOrder::PAY_TYPE_CREDIT_BUY)
->column('A.order_id'); ->column('A.order_id');
} }

4
app/controller/api/store/order/StoreOrder.php
View File

@ -135,7 +135,9 @@ class StoreOrder extends BaseController
$where['product_type'] = $this->request->param('product_type',0); $where['product_type'] = $this->request->param('product_type',0);
$where['search'] = $this->request->param('store_name'); $where['search'] = $this->request->param('store_name');
$where['uid'] = $this->request->uid(); $where['uid'] = $this->request->uid();
$where['paid'] = 1; if ($where['status'] != 20) {
$where['paid'] = 1;
}
$where['is_user'] = 1; $where['is_user'] = 1;
return app('json')->success($this->repository->getList($where, $page, $limit)); return app('json')->success($this->repository->getList($where, $page, $limit));
} }