diff --git a/crmeb/app/dao/activity/combination/StorePinkDao.php b/crmeb/app/dao/activity/combination/StorePinkDao.php index 6f3ad7cf0..b47ed69d1 100644 --- a/crmeb/app/dao/activity/combination/StorePinkDao.php +++ b/crmeb/app/dao/activity/combination/StorePinkDao.php @@ -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(); } diff --git a/crmeb/app/services/activity/combination/StoreCombinationServices.php b/crmeb/app/services/activity/combination/StoreCombinationServices.php index 6a01a7456..242ef304c 100644 --- a/crmeb/app/services/activity/combination/StoreCombinationServices.php +++ b/crmeb/app/services/activity/combination/StoreCombinationServices.php @@ -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); diff --git a/crmeb/app/services/activity/combination/StorePinkServices.php b/crmeb/app/services/activity/combination/StorePinkServices.php index 9715a4f06..933e3630f 100644 --- a/crmeb/app/services/activity/combination/StorePinkServices.php +++ b/crmeb/app/services/activity/combination/StorePinkServices.php @@ -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'); diff --git a/template/uni-app/pages/activity/goods_combination_details/index.vue b/template/uni-app/pages/activity/goods_combination_details/index.vue index 0b204114e..37bf4c431 100644 --- a/template/uni-app/pages/activity/goods_combination_details/index.vue +++ b/template/uni-app/pages/activity/goods_combination_details/index.vue @@ -618,7 +618,7 @@ '