diff --git a/app/common/models/weightValue/WeightValue.php b/app/common/models/weightValue/WeightValue.php index 9adec3c3..9192c954 100644 --- a/app/common/models/weightValue/WeightValue.php +++ b/app/common/models/weightValue/WeightValue.php @@ -142,7 +142,7 @@ class WeightValue extends BaseModel{ $agents = []; foreach($parents as $memberInfo){ $teamDividendInfo = $teamDividend[$memberInfo['parent_id']] ?? []; - if($teamDividendInfo) $teamDividendInfo['ranking'] = $allTeamDividend[$memberInfo['parent_id']]; + if($teamDividendInfo) $teamDividendInfo['ranking'] = ((int)$allTeamDividend[$memberInfo['parent_id']] + 1); $agents[] = [ 'uid' => $memberInfo['parent_id'], diff --git a/database/config.php b/database/config.php index c774ecdd..e5f69b12 100644 --- a/database/config.php +++ b/database/config.php @@ -2,10 +2,10 @@ $config = array(); $config['db']['master']['host'] = '127.0.0.1'; -$config['db']['master']['username'] = 'bztang_cdlfjy_co'; -$config['db']['master']['password'] = 'aRFkTGY5mbcY7A8Y'; +$config['db']['master']['username'] = 'testbzt_cdlfjy_c'; +$config['db']['master']['password'] = 'CTyRGMfzarFtspbC'; $config['db']['master']['port'] = '3306'; -$config['db']['master']['database'] = 'bztang_cdlfjy_co'; +$config['db']['master']['database'] = 'testbzt_cdlfjy_c'; $config['db']['master']['tablepre'] = 'ims_'; $config['db']['slave_status'] = false; diff --git a/plugins/collection-room/src/admin/IndexController.php b/plugins/collection-room/src/admin/IndexController.php index 556fc6db..36f92f17 100644 --- a/plugins/collection-room/src/admin/IndexController.php +++ b/plugins/collection-room/src/admin/IndexController.php @@ -6,6 +6,8 @@ use app\common\components\BaseController; use app\common\facades\Setting; use app\common\helpers\PaginationHelper; use app\common\helpers\Url; +use app\common\models\Order; +use app\common\models\weightValue\WeightValue; use Yunshop\CollectionRoom\models\CollectionRoomModel; class IndexController extends BaseController{ diff --git a/plugins/collection-room/src/models/CollectionRoomModel.php b/plugins/collection-room/src/models/CollectionRoomModel.php index a62ac83e..850d330d 100644 --- a/plugins/collection-room/src/models/CollectionRoomModel.php +++ b/plugins/collection-room/src/models/CollectionRoomModel.php @@ -38,6 +38,7 @@ class CollectionRoomModel extends BaseModel{ // 条件生成 $where = []; if($search['member_id'] > 0) $where[] = ['member_id','=',$search['member_id']]; + if($search['unique_number'] > 0) $where[] = ['unique_number','=',$search['unique_number']]; // 列表获取 $model = self::uniacid() ->select($field) @@ -71,6 +72,7 @@ class CollectionRoomModel extends BaseModel{ public static function addInfo($memberId){ // 判断:当前用户是否已经持有 未持有赠送 持有则不管 $isHas = (int)self::uniacid()->where('member_id',$memberId)->value('id'); + \Log::debug('给指定用户添加一幅画 - 查询结果 - 典藏室id:',$isHas); if($isHas <= 0){ self::insert([ 'uniacid' => \YunShop::app()->uniacid, @@ -78,6 +80,8 @@ class CollectionRoomModel extends BaseModel{ 'created_at' => time() ]); } + + return; } diff --git a/plugins/collection-room/views/index/index.blade.php b/plugins/collection-room/views/index/index.blade.php index 47483e11..8e47de19 100644 --- a/plugins/collection-room/views/index/index.blade.php +++ b/plugins/collection-room/views/index/index.blade.php @@ -46,17 +46,19 @@
- +
+
+ +
-
diff --git a/plugins/team-dividend/src/jobs/NewUpgrateJob.php b/plugins/team-dividend/src/jobs/NewUpgrateJob.php index f50a1995..f02dad90 100644 --- a/plugins/team-dividend/src/jobs/NewUpgrateJob.php +++ b/plugins/team-dividend/src/jobs/NewUpgrateJob.php @@ -19,6 +19,7 @@ use Illuminate\Queue\SerializesModels; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Support\Facades\Redis; use Illuminate\Support\Str; +use Yunshop\CollectionRoom\models\CollectionRoomModel; use Yunshop\Love\Common\Services\LoveChangeService; use Yunshop\TeamDividend\models\Log; use Yunshop\TeamDividend\models\TeamDividendAgencyModel; @@ -507,5 +508,7 @@ class NewUpgrateJob implements ShouldQueue 'relation' => $member->yzMember->relation, 'upgrade_at' => time(), ]); + // 会员升级经销商 赠送一幅画 + CollectionRoomModel::addInfo($member->uid); } } \ No newline at end of file diff --git a/plugins/team-dividend/src/observers/DealerObserver.php b/plugins/team-dividend/src/observers/DealerObserver.php index c21179fa..dd0e56aa 100644 --- a/plugins/team-dividend/src/observers/DealerObserver.php +++ b/plugins/team-dividend/src/observers/DealerObserver.php @@ -13,15 +13,17 @@ use Yunshop\TeamDividend\models\TeamDividendAgencyModel; class DealerObserver extends BaseObserver { - public function saving(Model $model){ - \Log::debug('新增经销商',$model->uid); - if($model->uid > 0){ + + public function created(Model $model){ + \Log::debug('新增经销商 - created - 用户uid:',$model->toArray()); + if((int)$model->uid > 0){ // 会员升级经销商 赠送一幅画 - CollectionRoomModel::addInfo($model->uid); + CollectionRoomModel::addInfo((int)$model->uid); } - } + + public function updating(Model $model) { /**