coupon.xp.yn.cn / coupon_backend · 提交

转到一个项目

作者 郭文星
提交 d66005a763421ff5964d5efa274a65712d41e993 2 个父辈 92e3d8c4 09c93f49

Merge branch 'master' of http://47.108.67.251:8099/coupon.xp.yn.cn/coupon_backend

内嵌 并排对比
正在显示 2 个修改的文件 包含 4 行增加 和 0 行删除
@@ -192,6 +192,7 @@ class Client extends Api @@ -192,6 +192,7 @@ class Client extends Api
192 $order_no=$time.rand(10000,99999); 192 $order_no=$time.rand(10000,99999);
193 $verification_store_id=$this->store_id; 193 $verification_store_id=$this->store_id;
194 $user_id=$this->auth->id; 194 $user_id=$this->auth->id;
  195 +
195 $createtime=$time; 196 $createtime=$time;
196 $type=0; 197 $type=0;
197 //整理数组 198 //整理数组
@@ -178,6 +178,7 @@ class Wechat extends Api @@ -178,6 +178,7 @@ class Wechat extends Api
178 $save['nickname'] = $nickname; 178 $save['nickname'] = $nickname;
179 $save['openid'] = $openid; 179 $save['openid'] = $openid;
180 $save['avatar'] = $avatar; 180 $save['avatar'] = $avatar;
  181 + $save['status'] = 'normal';
181 $save['jointime'] = $save['prevtime'] = $save['logintime'] = time(); 182 $save['jointime'] = $save['prevtime'] = $save['logintime'] = time();
182 $save['loginip'] = $save['joinip'] = request()->ip(); 183 $save['loginip'] = $save['joinip'] = request()->ip();
183 $w['openid'] = $openid; 184 $w['openid'] = $openid;
@@ -454,6 +455,8 @@ class Wechat extends Api @@ -454,6 +455,8 @@ class Wechat extends Api
454 'act_name' => '测试活动', 455 'act_name' => '测试活动',
455 'remark' => '测试备注', 456 'remark' => '测试备注',
456 ]); 457 ]);
  458 + return json($result);
  459 + die;
457 if($result['return_code'] == 'SUCCESS' && $result['result_code'] == 'SUCCESS'){ 460 if($result['return_code'] == 'SUCCESS' && $result['result_code'] == 'SUCCESS'){
458 //记录佣金表 461 //记录佣金表
459 }else{ 462 }else{