diff --git a/app/api/controller/Memberwithdraw.php b/app/api/controller/Memberwithdraw.php index b70c35c..b1adfe5 100644 --- a/app/api/controller/Memberwithdraw.php +++ b/app/api/controller/Memberwithdraw.php @@ -166,12 +166,12 @@ class Memberwithdraw extends BaseApi if($to_username){ $member_model = new MemberModel(); // 获取接收者信息 - $to_member_info = $member_model->getMemberInfo($to_where, 'member_id,site_id,balance,balance_withdraw_apply,balance_withdraw,nickname,status,pay_password'); + $to_member_info = $member_model->getMemberInfo($to_where, 'member_id,site_id,balance_money,balance_withdraw_apply,balance_withdraw,nickname,status,pay_password'); if(empty($to_member_info['data'])||$to_member_info['data']['status']!=1) return $this->response($this->error('会员账号不存在')); if($this->member_id==$to_member_info['data']['member_id']) return $this->response($this->error('不能转账给自己')); // 获取转让人信息 - $member_info_result = $member_model->getMemberInfo([['member_id', '=', $token['data']['member_id']]], 'balance,username,nickname,status'); - if($apply_money>$member_info_result['data']['balance']) return $this->response($this->error('账号余额不足')); + $member_info_result = $member_model->getMemberInfo([['member_id', '=', $token['data']['member_id']]], 'balance_money,username,nickname,status'); + if($apply_money>$member_info_result['data']['balance_money']) return $this->response($this->error('账号余额不足')); if($member_info_result['data']['status']!=1) return $this->response($this->error('未知错误')); $withdraw_model = new WithdrawModel(); diff --git a/app/model/stock/GoodsStock.php b/app/model/stock/GoodsStock.php index 5309444..e7de70d 100644 --- a/app/model/stock/GoodsStock.php +++ b/app/model/stock/GoodsStock.php @@ -315,6 +315,7 @@ class GoodsStock extends BaseModel */ public function setCommonGoodsSkuStock($params) { + $params['site_id'] = 1;//TODO 单商户临时解决 $sku_id = $params['sku_id']; $site_id = $params['site_id']; $store_model = new Store(); diff --git a/app/shop/controller/Member.php b/app/shop/controller/Member.php index 1b441f0..93b530a 100644 --- a/app/shop/controller/Member.php +++ b/app/shop/controller/Member.php @@ -488,7 +488,7 @@ class Member extends BaseShop $remark = input('remark', '商家调整'); $this->addLog("会员消费券调整id:" . $member_id . "金额" . $adjust_num); $member_account_model = new MemberAccountModel(); - return $member_account_model->addMemberAccount($this->site_id, $member_id, 'balance', $adjust_num, 'adjust', 0, $remark ? $remark : '商家调整'); + return $member_account_model->addMemberAccount($this->site_id, $member_id, 'balance_money', $adjust_num, 'adjust', 0, $remark ? $remark : '商家调整'); } /** diff --git a/app/shop/view/member/member_list.html b/app/shop/view/member/member_list.html index 89eb5aa..80708a8 100644 --- a/app/shop/view/member/member_list.html +++ b/app/shop/view/member/member_list.html @@ -370,7 +370,7 @@