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

Merge pull request 'feat: 增加查询已支付订单的条件' (#93) from dev into rose

Browse Source 
Reviewed-on: #93
This commit is contained in:
mkm 2024-08-03 11:37:33 +08:00
commit bc385e3c2f
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php
View File

@ -52,6 +52,8 @@ class StoreOrderCartInfoGroupLists extends BaseAdminDataLists implements ListsSe
if($this->request->get('start_time')==''){ if($this->request->get('start_time')==''){
$this->searchWhere[]=['create_time','between',[strtotime(date('Y-m-d 00:00:00')),strtotime(date('Y-m-d 23:59:59'))]]; $this->searchWhere[]=['create_time','between',[strtotime(date('Y-m-d 00:00:00')),strtotime(date('Y-m-d 23:59:59'))]];
} }
$this->searchWhere[]=['is_pay','=',1];
$this->searchWhere[]=['status','>=',0];
return StoreOrderCartInfo::where($this->searchWhere) return StoreOrderCartInfo::where($this->searchWhere)
->field('product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num')->group('product_id') ->field('product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num')->group('product_id')
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)

2
app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php
View File

@ -52,6 +52,8 @@ class StoreOrderCartInfoTwoLists extends BaseAdminDataLists implements ListsSear
if ($this->request->get('start_time') == '') { if ($this->request->get('start_time') == '') {
$this->searchWhere[] = ['create_time', 'between', [strtotime(date('Y-m-d 00:00:00')), strtotime(date('Y-m-d 23:59:59'))]]; $this->searchWhere[] = ['create_time', 'between', [strtotime(date('Y-m-d 00:00:00')), strtotime(date('Y-m-d 23:59:59'))]];
} }
$this->searchWhere[]=['is_pay','=',1];
$this->searchWhere[]=['status','>=',0];
$query = StoreOrderCartInfo::where($this->searchWhere); $query = StoreOrderCartInfo::where($this->searchWhere);
if ($this->request->get('is_group') == 1) { if ($this->request->get('is_group') == 1) {
$query->field('store_id,product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num')->group(['store_id', 'product_id']); $query->field('store_id,product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num')->group(['store_id', 'product_id']);

1
app/common/logic/PayNotifyLogic.php
View File

@ -563,6 +563,7 @@ class PayNotifyLogic extends BaseLogic
*/ */
public static function afterPay($order, $transaction_id = 0) public static function afterPay($order, $transaction_id = 0)
{ {
StoreOrderCartInfo::where('oid', $order['id'])->update(['is_pay' => 1]);
$financeLogic = new StoreFinanceFlowLogic(); $financeLogic = new StoreFinanceFlowLogic();
$off_activity = Config::where('name', 'off_activity')->value('value'); $off_activity = Config::where('name', 'off_activity')->value('value');
$village_uid = 0; $village_uid = 0;