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

拼团问题优化

Browse Source
This commit is contained in:
evoxwht 2023-06-19 14:59:26 +08:00
parent 927d993419
commit 049ceb4fbc
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crmeb/app/dao/activity/combination/StorePinkDao.php
View File

@ -132,7 +132,7 @@ class StorePinkDao extends BaseDao
public function successList(int $uid)
{
return $this->search(['status' => 2, 'is_refund' => 0])
->where('uid', '<>', $uid)
// ->where('uid', '<>', $uid)
->select()->toArray();
}

4
crmeb/app/services/activity/combination/StoreCombinationServices.php
View File

@ -393,11 +393,11 @@ class StoreCombinationServices extends BaseServices
/** @var StorePinkServices $pinkService */
$pinkService = app()->make(StorePinkServices::class);
list($pink, $pindAll) = $pinkService->getPinkList($id, true);//拼团列表
list($pink, $pinkAll) = $pinkService->getPinkList($id, true);//拼团列表
$data['pink_ok_list'] = $pinkService->getPinkOkList($uid);
$data['pink_ok_sum'] = $pinkService->getPinkOkSumTotalNum();
$data['pink'] = $pink;
$data['pindAll'] = $pindAll;
$data['pinkAll'] = $pinkAll;
/** @var StoreOrderServices $storeOrderServices */
$storeOrderServices = app()->make(StoreOrderServices::class);

1
crmeb/app/services/activity/combination/StorePinkServices.php
View File

@ -157,6 +157,7 @@ class StorePinkServices extends BaseServices
$where['cid'] = $id;
$where['k_id'] = 0;
$where['is_refund'] = 0;
$where['status'] = 1;
$pinkList = $this->dao->pinkList($where);
$ids = array_column($pinkList, 'id');
$orderIdKey = array_column($pinkList, 'order_id_key');

2
template/uni-app/pages/activity/goods_combination_details/index.vue
View File

@ -618,7 +618,7 @@
'<img style="max-width:100%;height:auto;float:left;display:block" ');
that.attribute.productSelect.num = res.data.storeInfo.num;
that.pink = res.data.pink;
that.pindAll = res.data.pindAll;
that.pinkAll = res.data.pinkAll;
that.reply = res.data.reply ? [res.data.reply] : [];
that.replyCount = res.data.replyCount;
that.itemNew = res.data.pink_ok_list;