zhongyuanhaiju
/
admin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【增加】转赠

This commit is contained in:
liqianjin 2023-03-15 09:30:22 +08:00
parent 51ea818372
commit c661f82c16
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/api/controller/Memberwithdraw.php
View File

@ -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();

1
app/model/stock/GoodsStock.php
View File

@ -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();

2
app/shop/controller/Member.php
View File

@ -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 : '商家调整');
}
/**

2
app/shop/view/member/member_list.html
View File

@ -370,7 +370,7 @@
<div class="layui-form">
<div class="layui-form-item">
<label class="layui-form-label">当前储值消费券：</label>
<div class="layui-input-block account-value">{{ d.balance }}</div>
<div class="layui-input-block account-value">{{ d.balance_money }}</div>
</div>
<div class="layui-form-item">