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

修复订单已结算查询

Browse Source
This commit is contained in:
mkm 2023-11-27 11:36:28 +08:00
parent cab9448700
commit af3c2bae70
2 changed files with 157 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ class StoreOrderDao extends BaseDao
if (isset($where['is_trader']) && $where['is_trader'] !== '') { if (isset($where['is_trader']) && $where['is_trader'] !== '') {
$query->where('is_trader', $where['is_trader']); $query->where('is_trader', $where['is_trader']);
} }
$query->where('is_del',0); $query->where('is_del', 0);
}); });
$query->when(($sysDel !== null), function ($query) use ($sysDel) { $query->when(($sysDel !== null), function ($query) use ($sysDel) {
@ -81,9 +81,9 @@ class StoreOrderDao extends BaseDao
->when(isset($where['order_type']) && $where['order_type'] >= 0 && $where['order_type'] !== '', function ($query) use ($where) { ->when(isset($where['order_type']) && $where['order_type'] >= 0 && $where['order_type'] !== '', function ($query) use ($where) {
if ($where['order_type'] == 2) { if ($where['order_type'] == 2) {
$query->where('is_virtual', 1); $query->where('is_virtual', 1);
} else if($where['order_type'] == 0){ //实体发货订单 } else if ($where['order_type'] == 0) { //实体发货订单
$query->where('order_type', 0)->where('is_virtual',0); $query->where('order_type', 0)->where('is_virtual', 0);
} else if($where['order_type'] == 3) { //发货订单 } else if ($where['order_type'] == 3) { //发货订单
$query->where('order_type', 0); $query->where('order_type', 0);
} else { } else {
$query->where('order_type', $where['order_type']); $query->where('order_type', $where['order_type']);
@ -98,19 +98,19 @@ class StoreOrderDao extends BaseDao
->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) { ->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {
// 12表示信用购 先货后款 // 12表示信用购 先货后款
switch ($where['status']) { switch ($where['status']) {
case 0 : case 0:
$query->whereIn('StoreOrder.status', [0, 9, 12]); $query->whereIn('StoreOrder.status', [0, 9, 12]);
break; break;
case -2 : case -2:
$query->where('StoreOrder.paid', 1)->whereNotIn('StoreOrder.status', [10, 11]); $query->where('StoreOrder.paid', 1)->whereNotIn('StoreOrder.status', [10, 11]);
break; break;
case 10 : case 10:
$query->where('StoreOrder.paid', 1)->whereIn('StoreOrder.status', [10, 11]); $query->where('StoreOrder.paid', 1)->whereIn('StoreOrder.status', [10, 11]);
break; break;
case 2 : case 2:
$query->where('StoreOrder.paid', 1)->where('StoreOrder.status', $where['status'])->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY); $query->where('StoreOrder.paid', 1)->where('StoreOrder.status', $where['status'])->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY);
break; break;
case 20 : case 20:
$query->where('StoreOrder.paid', 1)->whereIn('StoreOrder.status', [2, 3]); $query->where('StoreOrder.paid', 1)->whereIn('StoreOrder.status', [2, 3]);
break; break;
default: default:
@ -122,15 +122,15 @@ class StoreOrderDao extends BaseDao
$query->where('StoreOrder.uid', $where['uid']); $query->where('StoreOrder.uid', $where['uid']);
}) })
->when(isset($where['is_user']) && $where['is_user'] !== 0, function ($query) use ($where) { ->when(isset($where['is_user']) && $where['is_user'] !== 0, function ($query) use ($where) {
$query->where(function($query) { $query->where(function ($query) {
$query->where('order_type',0)->whereOr(function($query){ $query->where('order_type', 0)->whereOr(function ($query) {
$query->where('order_type',1)->where('main_id',0); $query->where('order_type', 1)->where('main_id', 0);
}); });
}); });
}) })
//待核销订单 //待核销订单
->when(isset($where['is_verify']) && $where['is_verify'], function ($query) use ($where) { ->when(isset($where['is_verify']) && $where['is_verify'], function ($query) use ($where) {
$query->where('StoreOrder.order_type', 1)->where('StoreOrder.status',0); $query->where('StoreOrder.order_type', 1)->where('StoreOrder.status', 0);
}) })
->when(isset($where['pay_type']) && $where['pay_type'] !== '', function ($query) use ($where) { ->when(isset($where['pay_type']) && $where['pay_type'] !== '', function ($query) use ($where) {
$query->where('StoreOrder.pay_type', $where['pay_type']); $query->where('StoreOrder.pay_type', $where['pay_type']);
@ -139,9 +139,9 @@ class StoreOrderDao extends BaseDao
$query->whereIn('order_id', $where['order_ids']); $query->whereIn('order_id', $where['order_ids']);
}) })
->when(isset($where['order_id']) && $where['order_id'] !== '', function ($query) use ($where) { ->when(isset($where['order_id']) && $where['order_id'] !== '', function ($query) use ($where) {
if(is_array($where['order_id'])){ if (is_array($where['order_id'])) {
$query->whereIn('order_id',$where['order_id']); $query->whereIn('order_id', $where['order_id']);
}else{ } else {
$query->where('order_id', $where['order_id']); $query->where('order_id', $where['order_id']);
} }
}) })
@ -170,40 +170,40 @@ class StoreOrderDao extends BaseDao
$query->where('service_id', $where['service_id']); $query->where('service_id', $where['service_id']);
}) })
->when(isset($where['username']) && $where['username'] !== '', function ($query) use ($where) { ->when(isset($where['username']) && $where['username'] !== '', function ($query) use ($where) {
$query->join('User U','StoreOrder.uid = U.uid') $query->join('User U', 'StoreOrder.uid = U.uid')
->where(function($query) use($where) { ->where(function ($query) use ($where) {
$query->where('nickname', 'like', "%{$where['username']}%") $query->where('nickname', 'like', "%{$where['username']}%")
->whereOr('phone', 'like', "%{$where['username']}%") ->whereOr('phone', 'like', "%{$where['username']}%")
->whereOr('user_phone', 'like', "%{$where['username']}%"); ->whereOr('user_phone', 'like', "%{$where['username']}%");
}); });
}) })
->when(isset($where['store_name']) && $where['store_name'] !== '', function ($query) use ($where) { ->when(isset($where['store_name']) && $where['store_name'] !== '', function ($query) use ($where) {
$orderId = StoreOrderProduct::alias('op') $orderId = StoreOrderProduct::alias('op')
->join('storeProduct sp','op.product_id = sp.product_id') ->join('storeProduct sp', 'op.product_id = sp.product_id')
->whereLike('store_name',"%{$where['store_name']}%") ->whereLike('store_name', "%{$where['store_name']}%")
->when((isset($where['sp.mer_id']) && $where['mer_id'] !== ''),function($query) use($where){ ->when((isset($where['sp.mer_id']) && $where['mer_id'] !== ''), function ($query) use ($where) {
$query->where('mer_id',$where['mer_id']); $query->where('mer_id', $where['mer_id']);
})->column('order_id'); })->column('order_id');
$query->whereIn('order_id',$orderId ?: '' ); $query->whereIn('order_id', $orderId ?: '');
}) })
->when(isset($where['search']) && $where['search'] !== '', function ($query) use ($where) { ->when(isset($where['search']) && $where['search'] !== '', function ($query) use ($where) {
$orderId = StoreOrderProduct::alias('op') $orderId = StoreOrderProduct::alias('op')
->join('storeProduct sp','op.product_id = sp.product_id') ->join('storeProduct sp', 'op.product_id = sp.product_id')
->whereLike('store_name',"%{$where['search']}%") ->whereLike('store_name', "%{$where['search']}%")
->when((isset($where['sp.mer_id']) && $where['mer_id'] !== ''),function($query) use($where){ ->when((isset($where['sp.mer_id']) && $where['mer_id'] !== ''), function ($query) use ($where) {
$query->where('mer_id',$where['mer_id']); $query->where('mer_id', $where['mer_id']);
})->column('order_id'); })->column('order_id');
$query->where(function($query) use($orderId,$where){ $query->where(function ($query) use ($orderId, $where) {
$query->whereIn('order_id',$orderId ? $orderId : '') $query->whereIn('order_id', $orderId ? $orderId : '')
->whereOr('order_sn','like',"%{$where['search']}%") ->whereOr('order_sn', 'like', "%{$where['search']}%")
->whereOr('user_phone','like',"%{$where['search']}%"); ->whereOr('user_phone', 'like', "%{$where['search']}%");
}); });
}) })
->when(isset($where['order_search']) && $where['order_search'] !== '', function ($query) use ($where) { ->when(isset($where['order_search']) && $where['order_search'] !== '', function ($query) use ($where) {
$query->where('order_sn', 'like', '%' . $where['order_search'] . '%')->whereOr('user_phone', $where['order_search']); $query->where('order_sn', 'like', '%' . $where['order_search'] . '%')->whereOr('user_phone', $where['order_search']);
}) })
->when(isset($where['group_order_sn']) && $where['group_order_sn'] !== '', function ($query) use ($where) { ->when(isset($where['group_order_sn']) && $where['group_order_sn'] !== '', function ($query) use ($where) {
$query->join('StoreGroupOrder GO','StoreOrder.group_order_id = GO.group_order_id')->where('group_order_sn',$where['group_order_sn']); $query->join('StoreGroupOrder GO', 'StoreOrder.group_order_id = GO.group_order_id')->where('group_order_sn', $where['group_order_sn']);
}) })
->when(isset($where['keywords']) && $where['keywords'] !== '', function ($query) use ($where) { ->when(isset($where['keywords']) && $where['keywords'] !== '', function ($query) use ($where) {
$query->where(function ($query) use ($where) { $query->where(function ($query) use ($where) {
@ -270,8 +270,8 @@ class StoreOrderDao extends BaseDao
public function fieldExists($field, $value, ?int $except = null): bool public function fieldExists($field, $value, ?int $except = null): bool
{ {
return ($this->getModel()::getDB())->when($except, function ($query) use ($field, $except) { return ($this->getModel()::getDB())->when($except, function ($query) use ($field, $except) {
$query->where($field, '<>', $except); $query->where($field, '<>', $except);
})->where($field, $value)->count() > 0; })->where($field, $value)->count() > 0;
} }
/** /**
@ -360,15 +360,15 @@ class StoreOrderDao extends BaseDao
})->when($date, function ($query, $date) use ($paid) { })->when($date, function ($query, $date) use ($paid) {
if (!$paid) { if (!$paid) {
getModelTime($query, $date); getModelTime($query, $date);
// $query->where(function ($query) use ($date) { // $query->where(function ($query) use ($date) {
// $query->where(function ($query) use ($date) { // $query->where(function ($query) use ($date) {
// $query->where('paid', 1); // $query->where('paid', 1);
// getModelTime($query, $date, 'pay_time'); // getModelTime($query, $date, 'pay_time');
// })->whereOr(function ($query) use ($date) { // })->whereOr(function ($query) use ($date) {
// $query->where('paid', 0); // $query->where('paid', 0);
// getModelTime($query, $date); // getModelTime($query, $date);
// }); // });
// }); // });
} else } else
getModelTime($query, $date, 'pay_time'); getModelTime($query, $date, 'pay_time');
})->group('uid')->count(); })->group('uid')->count();
@ -424,7 +424,7 @@ class StoreOrderDao extends BaseDao
public function orderGroupNum($date, $merId = null) public function orderGroupNum($date, $merId = null)
{ {
$field = Db::raw('sum(pay_price) as pay_price,count(*) as total,count(distinct uid) as user,pay_time,from_unixtime(unix_timestamp(pay_time),\'%m-%d\') as `day`'); $field = Db::raw('sum(pay_price) as pay_price,count(*) as total,count(distinct uid) as user,pay_time,from_unixtime(unix_timestamp(pay_time),\'%m-%d\') as `day`');
if ($date == 'year'){ if ($date == 'year') {
$field = Db::raw('sum(pay_price) as pay_price,count(*) as total,count(distinct uid) as user,pay_time,from_unixtime(unix_timestamp(pay_time),\'%m\') as `day`'); $field = Db::raw('sum(pay_price) as pay_price,count(*) as total,count(distinct uid) as user,pay_time,from_unixtime(unix_timestamp(pay_time),\'%m\') as `day`');
} }
$query = StoreOrder::getDB()->field($field) $query = StoreOrder::getDB()->field($field)
@ -440,10 +440,19 @@ class StoreOrderDao extends BaseDao
{ {
return StoreOrder::getDB()->when(isset($where['dateRange']), function ($query) use ($where) { return StoreOrder::getDB()->when(isset($where['dateRange']), function ($query) use ($where) {
getModelTime($query, date('Y/m/d 00:00:00', $where['dateRange']['start']) . '-' . date('Y/m/d 00:00:00', $where['dateRange']['stop']), 'pay_time'); getModelTime($query, date('Y/m/d 00:00:00', $where['dateRange']['start']) . '-' . date('Y/m/d 00:00:00', $where['dateRange']['stop']), 'pay_time');
})->field(Db::raw('sum(pay_price) as pay_price,count(*) as total,count(distinct uid) as user,pay_time,from_unixtime(unix_timestamp(pay_time),\'%m-%d\') as `day`')) })->field(
Db::raw('status,sum(pay_price) as pay_price,count(*) as total,count(distinct uid) as user,pay_time,from_unixtime(unix_timestamp(pay_time),\'%m-%d\') as `day`')
)
->where('paid', 1)->when($merId, function ($query, $merId) { ->where('paid', 1)->when($merId, function ($query, $merId) {
$query->where('mer_id', $merId); $query->where('mer_id', $merId);
})->order('pay_time DESC')->page($page, $limit)->group('day')->select(); })->order('pay_time DESC')->page($page, $limit)->group('day')->select()->each(function ($item) use ($merId) {
$pay_time = explode(' ', $item['pay_time']);
$item->settlement_price = Db::name('store_order')
->whereIn('status', [2, 3])
->where('mer_id', $merId)
->whereDay('pay_time', $pay_time[0])
->sum('pay_price');
});
} }
public function dayOrderPriceGroup($date, $merId = null) public function dayOrderPriceGroup($date, $merId = null)
@ -534,20 +543,20 @@ class StoreOrderDao extends BaseDao
* @author Qinii * @author Qinii
* @day 2020-11-11 * @day 2020-11-11
*/ */
public function getTattendCount(array $data,?int $uid) public function getTattendCount(array $data, ?int $uid)
{ {
$query = StoreOrder::hasWhere('orderProduct',function($query)use($data,$uid){ $query = StoreOrder::hasWhere('orderProduct', function ($query) use ($data, $uid) {
$query->when(isset($data['activity_id']),function ($query)use($data){ $query->when(isset($data['activity_id']), function ($query) use ($data) {
$query->where('activity_id',$data['activity_id']); $query->where('activity_id', $data['activity_id']);
})
->when(isset($data['product_sku']), function ($query) use ($data) {
$query->where('product_sku', $data['product_sku']);
}) })
->when(isset($data['product_sku']),function ($query)use($data){ ->when(isset($data['product_id']), function ($query) use ($data) {
$query->where('product_sku',$data['product_sku']); $query->where('product_id', $data['product_id']);
}) })
->when(isset($data['product_id']),function ($query)use($data){ ->when(isset($data['exsits_id']), function ($query) use ($data) {
$query->where('product_id',$data['product_id']); switch ($data['product_type']) {
})
->when(isset($data['exsits_id']),function ($query)use ($data){
switch ($data['product_type']){
case 3: case 3:
$make = app()->make(ProductAssistSetRepository::class); $make = app()->make(ProductAssistSetRepository::class);
$id = 'product_assist_id'; $id = 'product_assist_id';
@ -559,34 +568,33 @@ class StoreOrderDao extends BaseDao
} }
$where = [$id => $data['exsits_id']]; $where = [$id => $data['exsits_id']];
$activity_id = $make->getSearch($where)->column($make->getPk()); $activity_id = $make->getSearch($where)->column($make->getPk());
if($activity_id) { if ($activity_id) {
$id = array_unique($activity_id); $id = array_unique($activity_id);
$query->where('activity_id','in',$id); $query->where('activity_id', 'in', $id);
}else{ } else {
$query->where('activity_id','<',0); $query->where('activity_id', '<', 0);
} }
}) })
->where('product_type',$data['product_type']); ->where('product_type', $data['product_type']);
if($uid) $query->where('uid',$uid); if ($uid) $query->where('uid', $uid);
}); });
$query->where('activity_type',$data['product_type']); $query->where('activity_type', $data['product_type']);
switch($data['product_type']) switch ($data['product_type']) {
{
case 0: case 0:
$query->where(function($query){ $query->where(function ($query) {
$query->where(function($query){ $query->where(function ($query) {
$query->where('paid',1); $query->where('paid', 1);
})->whereOr(function($query){ })->whereOr(function ($query) {
$query->where('paid',0)->where('is_del',0); $query->where('paid', 0)->where('is_del', 0);
}); });
}); });
break; break;
case 1: //秒杀 case 1: //秒杀
$query->where(function($query){ $query->where(function ($query) {
$query->where(function($query){ $query->where(function ($query) {
$query->where('paid',1); $query->where('paid', 1);
})->whereOr(function($query){ })->whereOr(function ($query) {
$query->where('paid',0)->where('is_del',0); $query->where('paid', 0)->where('is_del', 0);
}); });
})->when(isset($data['day']), function ($query) use ($data) { })->when(isset($data['day']), function ($query) use ($data) {
$query->whereDay('StoreOrder.create_time', $data['day']); $query->whereDay('StoreOrder.create_time', $data['day']);
@ -599,28 +607,28 @@ class StoreOrderDao extends BaseDao
* 第二阶段参与人数：支付了第一阶段 * 第二阶段参与人数：支付了第一阶段
*/ */
//第二阶段 //第二阶段
if($data['type'] == 1){ if ($data['type'] == 1) {
$query->where(function($query){ $query->where(function ($query) {
$query->where('paid',1)->whereOr(function($query){ $query->where('paid', 1)->whereOr(function ($query) {
$query->where('paid',0)->where('is_del',0); $query->where('paid', 0)->where('is_del', 0);
}); });
}); });
} }
if($data['type'] == 2) $query->where('paid',1)->where('status','in',[0,1,2,3,-1]); if ($data['type'] == 2) $query->where('paid', 1)->where('status', 'in', [0, 1, 2, 3, -1]);
break; break;
case 3: //助力 case 3: //助力
$query->where(function($query){ $query->where(function ($query) {
$query->where('paid',1)->whereOr(function($query){ $query->where('paid', 1)->whereOr(function ($query) {
$query->where('paid',0)->where('is_del',0); $query->where('paid', 0)->where('is_del', 0);
}); });
}); });
break; break;
case 4: // case 4: //
$query->where(function($query){ $query->where(function ($query) {
$query->where('paid',1)->whereOr(function($query){ $query->where('paid', 1)->whereOr(function ($query) {
$query->where('paid',0)->where('is_del',0); $query->where('paid', 0)->where('is_del', 0);
}) })
->where('status','>',-1); ->where('status', '>', -1);
}); });
break; break;
} }
@ -637,20 +645,20 @@ class StoreOrderDao extends BaseDao
* @author Qinii * @author Qinii
* @day 2020-10-30 * @day 2020-10-30
*/ */
public function getTattendSuccessCount($data,?int $uid) public function getTattendSuccessCount($data, ?int $uid)
{ {
$query = StoreOrder::hasWhere('orderProduct',function($query)use($data,$uid){ $query = StoreOrder::hasWhere('orderProduct', function ($query) use ($data, $uid) {
$query->when(isset($data['activity_id']),function ($query)use($data){ $query->when(isset($data['activity_id']), function ($query) use ($data) {
$query->where('activity_id',$data['activity_id']); $query->where('activity_id', $data['activity_id']);
})
->when(isset($data['product_sku']), function ($query) use ($data) {
$query->where('product_sku', $data['product_sku']);
}) })
->when(isset($data['product_sku']),function ($query)use($data){ ->when(isset($data['product_id']), function ($query) use ($data) {
$query->where('product_sku',$data['product_sku']); $query->where('product_id', $data['product_id']);
}) })
->when(isset($data['product_id']),function ($query)use($data){ ->when(isset($data['exsits_id']), function ($query) use ($data) {
$query->where('product_id',$data['product_id']); switch ($data['product_type']) {
})
->when(isset($data['exsits_id']),function ($query)use ($data){
switch ($data['product_type']){
case 3: case 3:
$make = app()->make(ProductAssistSetRepository::class); $make = app()->make(ProductAssistSetRepository::class);
$id = 'product_assist_id'; $id = 'product_assist_id';
@ -662,34 +670,33 @@ class StoreOrderDao extends BaseDao
} }
$where = [$id => $data['exsits_id']]; $where = [$id => $data['exsits_id']];
$activity_id = $make->getSearch($where)->column($make->getPk()); $activity_id = $make->getSearch($where)->column($make->getPk());
if($activity_id) { if ($activity_id) {
$id = array_unique($activity_id); $id = array_unique($activity_id);
$query->where('activity_id','in',$id); $query->where('activity_id', 'in', $id);
}else{ } else {
$query->where('activity_id','<',0); $query->where('activity_id', '<', 0);
} }
}) })
->where('product_type',$data['product_type']); ->where('product_type', $data['product_type']);
if($uid) $query->where('uid',$uid); if ($uid) $query->where('uid', $uid);
}); });
$query->where('activity_type',$data['product_type'])->where('paid',1); $query->where('activity_type', $data['product_type'])->where('paid', 1);
switch($data['product_type']) switch ($data['product_type']) {
{
case 1: //秒杀 case 1: //秒杀
$query->where(function($query){ $query->where(function ($query) {
$query->where(function($query){ $query->where(function ($query) {
$query->where('paid',1); $query->where('paid', 1);
}); });
})->when(isset($data['day']), function ($query) use ($data) { })->when(isset($data['day']), function ($query) use ($data) {
$query->whereDay('StoreOrder.create_time', $data['day']); $query->whereDay('StoreOrder.create_time', $data['day']);
}); });
break; break;
case 2: //预售 case 2: //预售
if($data['type'] == 1){ //第一阶段 if ($data['type'] == 1) { //第一阶段
$query->where('status','in',[0,1,2,3,10]); $query->where('status', 'in', [0, 1, 2, 3, 10]);
} else { //第二阶段 } else { //第二阶段
$query->where('status','in',[0,1,2,3]); $query->where('status', 'in', [0, 1, 2, 3]);
} }
break; break;
case 3: //助力 case 3: //助力
@ -708,26 +715,26 @@ class StoreOrderDao extends BaseDao
* @author Qinii * @author Qinii
* @day 1/4/21 * @day 1/4/21
*/ */
public function getSeckillRefundCount($where,$type = 1) public function getSeckillRefundCount($where, $type = 1)
{ {
$query = StoreOrderProduct::getDB()->alias('P')->join('StoreRefundOrder R','P.order_id = R.order_id'); $query = StoreOrderProduct::getDB()->alias('P')->join('StoreRefundOrder R', 'P.order_id = R.order_id');
$query->join('StoreOrder O','O.order_id = P.order_id'); $query->join('StoreOrder O', 'O.order_id = P.order_id');
$query $query
->when(isset($where['activity_id']),function ($query)use($where){ ->when(isset($where['activity_id']), function ($query) use ($where) {
$query->where('P.activity_id',$where['activity_id']); $query->where('P.activity_id', $where['activity_id']);
}) })
->when(isset($where['product_sku']),function ($query)use($where){ ->when(isset($where['product_sku']), function ($query) use ($where) {
$query->where('P.product_sku',$where['product_sku']); $query->where('P.product_sku', $where['product_sku']);
}) })
->when(isset($where['day']), function ($query) use ($where) { ->when(isset($where['day']), function ($query) use ($where) {
$query->whereDay('P.create_time', $where['day']); $query->whereDay('P.create_time', $where['day']);
}) })
->when($type == 1, function ($query) use ($where) { ->when($type == 1, function ($query) use ($where) {
$query->where('O.verify_time',null)->where('O.delivery_type',null); $query->where('O.verify_time', null)->where('O.delivery_type', null);
},function ($query){ }, function ($query) {
$query ->where('R.refund_type',2); $query->where('R.refund_type', 2);
}) })
->where('P.product_type',1)->where('R.status',3); ->where('P.product_type', 1)->where('R.status', 3);
return $query->count(); return $query->count();
} }
@ -742,14 +749,13 @@ class StoreOrderDao extends BaseDao
*/ */
public function getMaxCountNumber(int $uid, int $productId) public function getMaxCountNumber(int $uid, int $productId)
{ {
return StoreOrder::hasWhere('orderProduct',function($query) use($productId){ return StoreOrder::hasWhere('orderProduct', function ($query) use ($productId) {
$query->where('product_id', $productId); $query->where('product_id', $productId);
}) })
->where(function($query) { ->where(function ($query) {
$query->where('is_del',0)->whereOr(function($query){ $query->where('is_del', 0)->whereOr(function ($query) {
$query->where('is_del',1)->where('paid',1); $query->where('is_del', 1)->where('paid', 1);
}); });
})->where('StoreOrder.uid',$uid)->count() })->where('StoreOrder.uid', $uid)->count();
;
} }
} }

29
app/listener/ProductCreate.php
View File

@ -23,7 +23,7 @@ class ProductCreate
if (empty($merchant)) { if (empty($merchant)) {
return false; return false;
} }
if($merchant['type_id']!=Merchant::TypeTownSupplyChain){ if ($merchant['type_id'] != Merchant::TypeTownSupplyChain) {
return false; return false;
} }
// 根据支持同步到云商的商户进行同步操作 // 根据支持同步到云商的商户进行同步操作
@ -49,17 +49,20 @@ class ProductCreate
return false; return false;
} }
//添加到云仓 //添加到云仓
$datas=[ $find = Db::name('cloud_product')->where('product_id', $product_id)->find();
'product_id'=>$product_id, if (!$find) {
'mer_id'=>$merchant['mer_id'], $datas = [
'source_mer_id'=>$cityMerchant['mer_id'], 'product_id' => $product_id,
'street_code'=>$merchant['street_id'], 'mer_id' => $merchant['mer_id'],
'type_id'=>$merchant['type_id'], 'source_mer_id' => $cityMerchant['mer_id'],
'category_id'=>$merchant['category_id'], 'street_code' => $merchant['street_id'],
'weight'=>1, 'type_id' => $merchant['type_id'],
'status'=>1, 'category_id' => $merchant['category_id'],
'create_time'=>date('Y-m-d H:i:s'), 'weight' => 1,
]; 'status' => 1,
Db::name('cloud_product')->insert($datas); 'create_time' => date('Y-m-d H:i:s'),
];
Db::name('cloud_product')->insert($datas);
}
} }
} }