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

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev

Browse Source
This commit is contained in:
luofei 2024-01-24 11:19:56 +08:00
commit dfa4e51762
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@ class StoreOrderDao extends BaseDao
});
if (isset($where['source']) && $where['source'] == 103) {
$wheres['activity_type'] = [0,98];
$wheres['source'] = [0,2,103];
$wheres['source'] = [0,2,103,105];
$query->where($wheres);
unset($where['source']);
} else {

3
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -730,7 +730,7 @@ class StoreOrderRepository extends BaseRepository
$where['activity_type'] = $product_type;
if ($source == 103) {
$where['activity_type'] = [0, 98];
$where['source'] = [0, 2, 103];
$where['source'] = [0, 2, 103,105];
}
$noComment = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(4))->where($where)->where('StoreOrder.is_del', 0)->count();
$noPay = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(1))->whereRaw("(StoreOrder.paid=0 and StoreOrder.pay_type!=8) or (StoreOrder.paid=1 and StoreOrder.pay_type=8 and StoreOrder.status=2)")->where($where)->where('StoreOrder.is_del', 0)->count();
@ -1882,7 +1882,6 @@ class StoreOrderRepository extends BaseRepository
return $query->field('order_id,order_receipt_id');
},
])->page($page, $limit)->order('pay_time DESC')->append(['refund_status'])->select();
foreach ($list as $order) {
if ($order->activity_type == 2) {
if ($order->presellOrder) {

4
app/controller/api/Demo.php
View File

@ -32,10 +32,6 @@ class Demo extends BaseController
{
public function index()
{
$merchant = Db::name('merchant')->where('mer_id','>=',39)->where('long','<>','')->where('status',1)->select();
foreach($merchant as $k=>$v){
Db::name('store_spu')->where('mer_id',$v['mer_id'])->update(['long'=>$v['long'],'lat'=>$v['lat']]);
}
return app('json')->success('修改成功');
//[31,32,118,39,167,236,237,238,239]
// return app('json')->success('修改成功');>whereIn('mer_id',[110,116,149,227,226,35,117,148,156,104,137,151,136,183,140,229,79,133,235])->

12
app/controller/api/store/order/StoreCart.php
View File

@ -123,11 +123,15 @@ class StoreCart extends BaseController
//更新购物车
$cart_id = $cart['cart_id'];
$cart_num = ['cart_num' => ($cart['cart_num'] + $data['cart_num'])];
if ($entryMerId && $entryMerId != $result['product']['mer_id']) {
$cart_num['source_id'] = $entryMerId;
$cart_num['source'] = StoreCartDao::SOURCE_STORE_CLOUD;
if($data['source'] !=105){
if ($entryMerId && $entryMerId != $result['product']['mer_id']) {
$cart_num['source_id'] = $entryMerId;
$cart_num['source'] = StoreCartDao::SOURCE_STORE_CLOUD;
}
$storeCart = $this->repository->update($cart_id,$cart_num);
}else{
return app('json')->success(['cart_id' => $cart['cart_id']]);
}
$storeCart = $this->repository->update($cart_id,$cart_num);
} else {
//添加购物车
$data['uid'] = $this->request->uid();