充值要加城市字段

application/api/controller/Notifynew.php

@@ -75,7 +75,10 @@ class Notifynew extends Api
         //逻辑开始
         //加钱
         $args = json_decode($orderInfo['args'],true);
-        $result = model('Wallet')->lockChangeAccountRemain($orderInfo['user_id'],$args['jewel'],'+',0,'金币充值',1,'jewel');
+        $extend = [
+            'cityname' => $args['cityname']
+        ];
+        $result = model('Wallet')->lockChangeAccountRemain($orderInfo['user_id'],$args['jewel'],'+',0,'金币充值',1,'jewel',$extend);
         if($result['status']===false)
         {
             Db::rollback();

application/api/controller/Pay.php

@@ -31,6 +31,7 @@ class Pay extends Api
         $pay_type  = input('pay_type','wechat');
         $platform  = 'app';
         $freemoney = input('freemoney',0);
+        $cityname = input('cityname','','trim');
         $uid = $this->auth->id;
 
         if(!$rc_id && !$freemoney){
@@ -77,7 +78,7 @@ class Pay extends Api
         $data['order_status'] = 0;
         $data['table_name'] = 'jewel_recharge';
         $data['table_id'] = 0;
-        $data['args'] = json_encode(['jewel'=>$jewel]);
+        $data['args'] = json_encode(['jewel'=>$jewel,'cityname'=>$cityname]);
 
         $orderid = Db::name('pay_order')->insertGetId($data);
 

application/common/model/Wallet.php

@@ -68,7 +68,7 @@ class Wallet extends Model
      * @return array[log_table]
      * @return array[log_id]
      */
-    public function lockChangeAccountRemain($user_id,$money,$mode,$before = 0,$remark='',$logtype,$accountType='money',$inviteId=0)
+    public function lockChangeAccountRemain($user_id,$money,$mode,$before = 0,$remark='',$logtype,$accountType='money',$extend = [])
     {
         //初始化
         $result = array(
@@ -142,8 +142,8 @@ class Wallet extends Model
             $data['detail'] = $remark;
             $data['createtime'] = time();
             $data['type'] = $logtype;
-            if ($accountType == 'money') {//用户邀请充值赠送上级金额，绑定赠送的用户ID
-                $data['invite_user_id'] = $inviteId;
+            if ($accountType == 'jewel') {
+                $data['cityname'] = isset($extend['cityname']) ? $extend['cityname'] : '';
             }
             //新的方式
             $rs1 = Db::name('user_wallet')->where(['user_id'=>$user_id])->update([$accountType => $data['balance']]);