From 4585d22a500e96730b201b2989bbd30015b58be1 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 26 Oct 2023 15:08:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91=E6=94=B9=E6=8A=BC?= =?UTF-8?q?=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/system/merchant/MerchantTypeDao.php | 2 +- .../store/order/StoreOrderRepository.php | 2 +- .../system/financial/FinancialRepository.php | 14 ++++---- .../merchant/FinancialRecordRepository.php | 10 +++--- .../merchant/MerchantIntentionRepository.php | 2 +- .../system/merchant/MerchantRepository.php | 34 +++++++++---------- .../merchant/MerchantTypeRepository.php | 2 +- .../system/serve/ServeOrderRepository.php | 6 ++-- .../admin/system/merchant/MerchantMargin.php | 4 +-- .../admin/system/merchant/MerchantType.php | 2 +- app/controller/api/Auth.php | 2 +- .../api/store/merchant/Merchant.php | 2 +- app/controller/merchant/system/Merchant.php | 2 +- app/listener/AfterRefund.php | 6 ++-- app/listener/paySuccessMargin.php | 6 ++-- app/validate/admin/MerchantTypeValidate.php | 4 +-- app/validate/admin/MerchantValidate.php | 4 +-- config/notice.php | 4 +-- config/sms.php | 8 ++--- crmeb/services/ExcelService.php | 4 +-- crmeb/services/SmsService.php | 4 +-- route/admin/merchant.php | 8 ++--- route/api.php | 2 +- route/merchant/accounts.php | 2 +- 24 files changed, 68 insertions(+), 68 deletions(-) diff --git a/app/common/dao/system/merchant/MerchantTypeDao.php b/app/common/dao/system/merchant/MerchantTypeDao.php index 8d69652c..bf5d2149 100644 --- a/app/common/dao/system/merchant/MerchantTypeDao.php +++ b/app/common/dao/system/merchant/MerchantTypeDao.php @@ -55,7 +55,7 @@ class MerchantTypeDao extends BaseDao [ 'type' => 'div', 'children' => [ - '保证金：' . $item['margin']. ' 元' + '押金：' . $item['margin']. ' 元' ], 'style' => [ 'paddingTop' => '100px', diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index e822e3a3..c1af5c51 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -375,7 +375,7 @@ class StoreOrderRepository extends BaseRepository 'financial_record_sn' => $financeSn . ($i++) ]; } - //保证金计算 + //押金计算 if ($_payPrice > 0) { /** @var MerchantRepository $merchantRepo */ $merchantRepo = app()->make(MerchantRepository::class); diff --git a/app/common/repositories/system/financial/FinancialRepository.php b/app/common/repositories/system/financial/FinancialRepository.php index ae192965..db7f41d3 100644 --- a/app/common/repositories/system/financial/FinancialRepository.php +++ b/app/common/repositories/system/financial/FinancialRepository.php @@ -318,7 +318,7 @@ class FinancialRepository extends BaseRepository if ($res['is_margin'] == -1) throw new ValidateException('请勿重复申请'); if (!in_array($res['is_margin'],[10,-10]) || $res['paid_margin'] <= 0) - throw new ValidateException('无可退保证金'); + throw new ValidateException('无可退押金'); $order = app()->make(ServeOrderRepository::class)->getWhere([ 'mer_id' => $res['mer_id'], @@ -327,7 +327,7 @@ class FinancialRepository extends BaseRepository ]); if (!$order) throw new ValidateException('未查询到支付订单'); $financial_account = [ - 'name' => '保证金退款', + 'name' => '押金退款', 'order_id' => $order['order_id'], 'order_sn' => $order['order_sn'], 'pay_price'=> $order['pay_price'], @@ -471,7 +471,7 @@ class FinancialRepository extends BaseRepository Elm::input('mer_name','商户名称', $data['merchant']->mer_name)->disabled(true), Elm::input('mer_id','商户ID', $data['mer_id'])->disabled(true), Elm::input('type_name','店铺类型', $data['merchant']->merchantType->type_name)->disabled(true), - Elm::input('pay_price','保证金额度', $data['merchant']->marginOrder->pay_price)->disabled(true), + Elm::input('pay_price','押金额度', $data['merchant']->marginOrder->pay_price)->disabled(true), Elm::input('sub','扣费金额', bcsub($data['merchant']->marginOrder->pay_price, $data['extract_money'], 2))->disabled(true), Elm::input('refund','退回金额', $data['extract_money'])->disabled(true), Elm::radio('status', '审核', -1)->setOptions([ @@ -485,7 +485,7 @@ class FinancialRepository extends BaseRepository ] ],]) ]); - return $form->setTitle('退保证金审核'); + return $form->setTitle('退押金审核'); } /** @@ -647,7 +647,7 @@ class FinancialRepository extends BaseRepository } /** - * TODO 同意退保证金 + * TODO 同意退押金 * @param $res * @author Qinii * @day 1/27/22 @@ -657,10 +657,10 @@ class FinancialRepository extends BaseRepository //验证 $comp = bccomp($res['financial_account']->pay_price, $res['extract_money'], 2); if ($comp == -1) - throw new ValidateException('申请退款金额：'.$res['extract_money'].',大于支付保证金：'.$res['financial_account']->pay_price); + throw new ValidateException('申请退款金额：'.$res['extract_money'].',大于支付押金：'.$res['financial_account']->pay_price); // if (bccomp($res['merchant']['margin'], $res['extract_money'],2) == -1) -// throw new ValidateException('申请退款金额：'.$res['extract_money'].',大于剩余保证金：'.$res['merchant']['margin']); +// throw new ValidateException('申请退款金额：'.$res['extract_money'].',大于剩余押金：'.$res['merchant']['margin']); Db::transaction(function () use ($res){ //退款 diff --git a/app/common/repositories/system/merchant/FinancialRecordRepository.php b/app/common/repositories/system/merchant/FinancialRecordRepository.php index e5fc2bc4..d8e9c534 100644 --- a/app/common/repositories/system/merchant/FinancialRecordRepository.php +++ b/app/common/repositories/system/merchant/FinancialRecordRepository.php @@ -254,7 +254,7 @@ class FinancialRecordRepository extends BaseRepository { //商户收入 $count = $this->dao->search($where)->where('financial_type', 'in', ['order', 'mer_presell'])->sum('number'); - //保证金 + //押金 $auto_margin = $this->dao->search($where)->where('financial_type', 'auto_margin')->sum('number'); $auto_margin_refund = $this->dao->search($where)->where('financial_type', 'auto_margin_refund')->sum('number'); //平台优惠券 @@ -330,7 +330,7 @@ class FinancialRecordRepository extends BaseRepository 'className' => 'el-icon-s-cooperation', 'count' => bcsub($auto_margin,$auto_margin_refund,2), 'field' => '元', - 'name' => '商户保证金金额' + 'name' => '商户押金金额' ], ]; return compact('stat'); @@ -490,7 +490,7 @@ class FinancialRecordRepository extends BaseRepository bcsub($expend['count_order_charge'], $expend['count_charge']). '笔', ], [ - '店铺保证金', + '店铺押金', $expend['number_auto_margin'] . '元', $expend['count_auto_margin'] . '笔' @@ -674,10 +674,10 @@ class FinancialRecordRepository extends BaseRepository $financialType = ['order_charge', 'presell_charge']; [$data['count_order_charge'], $data['number_order_charge']] = $this->dao->getDataByType($type, $where, $date, $financialType); - //商户保证金 + //商户押金 $financialType = ['auto_margin']; [$data['count_auto_margin'], $data['number_auto_margin']] = $this->dao->getDataByType($type, $where, $date, $financialType); - //商户保证金退回 + //商户押金退回 $financialType = ['auto_margin_refund']; [$data['count_auto_margin_refund'], $data['number_auto_margin_refund']] = $this->dao->getDataByType($type, $where, $date, $financialType); $number3 = bcsub($data['number_auto_margin'], $data['number_auto_margin_refund'], 2); diff --git a/app/common/repositories/system/merchant/MerchantIntentionRepository.php b/app/common/repositories/system/merchant/MerchantIntentionRepository.php index c4f5c0a6..56b33a80 100644 --- a/app/common/repositories/system/merchant/MerchantIntentionRepository.php +++ b/app/common/repositories/system/merchant/MerchantIntentionRepository.php @@ -137,7 +137,7 @@ class MerchantIntentionRepository extends BaseRepository 'is_bro_goods' => $config['broadcast_goods_type'] == 1 ? 0 : 1, 'mer_password' => $password, 'is_margin' => $margin['is_margin'] ?? -1, - // 用户需缴纳保证金 + // 用户需缴纳押金 'margin' => $margin['margin'] ?? 0, 'uid' => $intention['uid'], 'reg_admin_id' => $autoCreate ? 0: request()->adminId(), diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php index fe25a159..4060b1ca 100644 --- a/app/common/repositories/system/merchant/MerchantRepository.php +++ b/app/common/repositories/system/merchant/MerchantRepository.php @@ -66,14 +66,14 @@ use think\Model; class MerchantRepository extends BaseRepository { - const WithoutMargin = 0; //不需要保证金 - const NeedMargin = 1; //需要保证金 - const PaidMargin = 10; //已支付保证金 - const RefundMargin = -1; //申请退还保证金 - const RefuseMargin = -10; //拒绝退还保证金 + const WithoutMargin = 0; //不需要押金 + const NeedMargin = 1; //需要押金 + const PaidMargin = 10; //已支付押金 + const RefundMargin = -1; //申请退还押金 + const RefuseMargin = -10; //拒绝退还押金 public $merId; - public $forceMargin = false; //强制扣除保证金 + public $forceMargin = false; //强制扣除押金 /** * MerchantRepository constructor. @@ -622,17 +622,17 @@ class MerchantRepository extends BaseRepository { $merchant = $this->dao->get($id); if ($merchant->is_margin !== 10) { - throw new ValidateException('商户无保证金可扣'); + throw new ValidateException('商户无押金可扣'); } $form = Elm::createForm(Route::buildUrl('systemMarginSet')->build()); $form->setRule([ Elm::input('mer_name', '商户名称', $merchant->mer_name)->disabled(true), Elm::input('mer_id', '商户ID', $merchant->mer_id)->disabled(true), - Elm::input('margin', '商户剩余保证金', $merchant->paid_margin)->disabled(true), - Elm::number('number', '保证金扣除金额', 0)->max($merchant->paid_margin)->precision(2)->required(), - Elm::text('mark', '保证金扣除原因')->required(), + Elm::input('margin', '商户剩余押金', $merchant->paid_margin)->disabled(true), + Elm::number('number', '押金扣除金额', 0)->max($merchant->paid_margin)->precision(2)->required(), + Elm::text('mark', '押金扣除原因')->required(), ]); - return $form->setTitle('扣除保证金'); + return $form->setTitle('扣除押金'); } /** @@ -646,14 +646,14 @@ class MerchantRepository extends BaseRepository { $merechant = $this->dao->get($data['mer_id']); if ($merechant->is_margin !== 10) { - throw new ValidateException('商户未支付保证金或已申请退款'); + throw new ValidateException('商户未支付押金或已申请退款'); } if ($data['number'] < 0) { - throw new ValidateException('扣除保证金额不能小于0'); + throw new ValidateException('扣除押金额不能小于0'); } if (bccomp($merechant->paid_margin, $data['number'], 2) == -1) { - throw new ValidateException('扣除保证金额不足'); + throw new ValidateException('扣除押金额不足'); } $data['balance'] = bcsub($merechant->paid_margin, $data['number'], 2); @@ -679,7 +679,7 @@ class MerchantRepository extends BaseRepository } /** - * 自动扣除保证金 + * 自动扣除押金 * @param $income * @param $order * @param $finance @@ -691,12 +691,12 @@ class MerchantRepository extends BaseRepository { $merchant = Merchant::find($this->merId); $margin_type = Db::name('MerchantType')->where('mer_type_id', $merchant['type_id'])->value('margin'); - //商户保证金大于支付保证金 或者forceMargin==false 直接返回 不计算保证金 + //商户押金大于支付押金 或者forceMargin==false 直接返回 不计算押金 if ($merchant['paid_margin']>= $margin_type|| ($this->forceMargin === false && $merchant['auto_margin_rate'] == 0)) { return [$income, $finance, false]; } $rate = $this->forceMargin ? 100 : $merchant['auto_margin_rate']; - // //商户保证金未完全缴纳且设置了自动扣除比例 + // //商户押金未完全缴纳且设置了自动扣除比例 $margin= bcmul($income, bcdiv($rate, 100,2), 2); // $margin = min(bcsub($margin, $merchant['paid_margin'], 2), $margin); // $income = max(bcsub($income, $margin, 2), 0); diff --git a/app/common/repositories/system/merchant/MerchantTypeRepository.php b/app/common/repositories/system/merchant/MerchantTypeRepository.php index 3f8cd45c..bbf1c2a5 100644 --- a/app/common/repositories/system/merchant/MerchantTypeRepository.php +++ b/app/common/repositories/system/merchant/MerchantTypeRepository.php @@ -124,7 +124,7 @@ class MerchantTypeRepository extends BaseRepository $make = app()->make(RelevanceRepository::class); $make->batchDelete($id, RelevanceRepository::TYPE_MERCHANT_AUTH); $make->insertAll($inserts); - //更新未交保证金的商户 + //更新未交押金的商户 app()->make(MerchantRepository::class)->updateMargin($id, $data['margin'], $data['is_margin']); }); } diff --git a/app/common/repositories/system/serve/ServeOrderRepository.php b/app/common/repositories/system/serve/ServeOrderRepository.php index be43a534..93d3d497 100644 --- a/app/common/repositories/system/serve/ServeOrderRepository.php +++ b/app/common/repositories/system/serve/ServeOrderRepository.php @@ -38,7 +38,7 @@ class ServeOrderRepository extends BaseRepository const TYPE_COPY_PRODUCT = 1; //电子面单 const TYPE_DUMP = 2; - //保证金 margin + //押金 margin const TYPE_MARGIN = 10; //同城配送delivery const TYPE_DELIVERY = 20; @@ -83,7 +83,7 @@ class ServeOrderRepository extends BaseRepository } /** - * TODO 商户保证金 支付 + * TODO 商户押金 支付 * @param $merId * @param $data * @return array @@ -93,7 +93,7 @@ class ServeOrderRepository extends BaseRepository public function margin($merId, $data) { $ret = app()->make(MerchantRepository::class)->get($merId); - if ($ret['is_margin'] !== 1) throw new ValidateException('此商户无需支付保证金'); + if ($ret['is_margin'] !== 1) throw new ValidateException('此商户无需支付押金'); $key = 'Margin_'.$merId.'_'.date('YmdH',time()); $arr = [ 'type_id' => $ret['type_id'], diff --git a/app/controller/admin/system/merchant/MerchantMargin.php b/app/controller/admin/system/merchant/MerchantMargin.php index f10a0fb6..f3db825b 100644 --- a/app/controller/admin/system/merchant/MerchantMargin.php +++ b/app/controller/admin/system/merchant/MerchantMargin.php @@ -67,11 +67,11 @@ class MerchantMargin extends BaseController public function setMargin() { $data = $this->request->params(['mer_id','number',['type','mer_margin'],'mark']); - $data['title'] = '保证金扣除'; + $data['title'] = '押金扣除'; if ($data['number'] < 0) return app('json')->fail('扣除金额不能小于0'); app()->make(MerchantRepository::class)->setMargin($data); - return app('json')->success('扣除保证金成功'); + return app('json')->success('扣除押金成功'); } } diff --git a/app/controller/admin/system/merchant/MerchantType.php b/app/controller/admin/system/merchant/MerchantType.php index a1a63080..4ac19bf9 100644 --- a/app/controller/admin/system/merchant/MerchantType.php +++ b/app/controller/admin/system/merchant/MerchantType.php @@ -95,7 +95,7 @@ class MerchantType extends BaseController $validate = app()->make(MerchantTypeValidate::class); $validate->check($data); if ($data['is_margin'] == 1) { - if ($data['margin'] <= 0) throw new ValidateException('保证金必须大于0'); + if ($data['margin'] <= 0) throw new ValidateException('押金必须大于0'); } else { $data['margin'] = 0; } diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index f5f23caf..118bb9e5 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -391,7 +391,7 @@ class Auth extends BaseController return app('json')->fail('没有店铺'); } if ($merchant['is_margin'] == 10) { - return app('json')->fail('保证金已缴纳'); + return app('json')->fail('押金已缴纳'); } if ($merchant['margin'] == 0) { $margin = Db::name('MerchantType')->where('mer_type_id', $merchant['type_id'])->value('margin'); diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php index 4acf62db..8bfa340e 100644 --- a/app/controller/api/store/merchant/Merchant.php +++ b/app/controller/api/store/merchant/Merchant.php @@ -215,7 +215,7 @@ class Merchant extends BaseController $data = $this->request->params(['mer_state']); if ($merchant['is_margin'] == 1 && $data['mer_state'] == 1) - return app('json')->fail('开启店铺前请先支付保证金'); + return app('json')->fail('开启店铺前请先支付押金'); if ($data['mer_state'] && !$merchant['sub_mchid'] && systemConfig('open_wx_combine')) return app('json')->fail('开启店铺前请先完成微信子商户入驻'); diff --git a/app/controller/merchant/system/Merchant.php b/app/controller/merchant/system/Merchant.php index 9d4608ce..f1d02b1e 100644 --- a/app/controller/merchant/system/Merchant.php +++ b/app/controller/merchant/system/Merchant.php @@ -122,7 +122,7 @@ class Merchant extends BaseController $data = $this->request->params(['mer_state']); if ($merchant->is_margin == 1 && $data['mer_state'] == 1) - return app('json')->fail('开启店铺前请先支付保证金'); + return app('json')->fail('开启店铺前请先支付押金'); if ($data['mer_state'] && !$merchant->sub_mchid && systemConfig('open_wx_combine')) return app('json')->fail('开启店铺前请先完成微信子商户入驻'); diff --git a/app/listener/AfterRefund.php b/app/listener/AfterRefund.php index 7dabc617..5c55cc7a 100644 --- a/app/listener/AfterRefund.php +++ b/app/listener/AfterRefund.php @@ -34,7 +34,7 @@ class AfterRefund if (in_array($financialRecord['financial_type'], ['commission_to_cloud_warehouse', 'commission_to_entry_merchant', 'commission_to_service_team', 'commission_to_village', 'commission_to_town', ])) { //佣金类型的退还佣金 if ($financialRecord['financial_type'] == 'commission_to_entry_merchant') { - //入口店铺的佣金，如果有保证金，不退佣金 + //入口店铺的佣金，如果有押金，不退佣金 $isMargin = $this->isMargin($financialRecords, $financialRecord['mer_id']); if (!$isMargin) { $this->subMoney($financialRecord); @@ -49,7 +49,7 @@ class AfterRefund } if ($financialRecord['financial_type'] == 'auto_margin') { Log::info("refundMargin, mer_id: {$financialRecord['mer_id']}, money: {$financialRecord['number']}"); - //保证金类型的扣除保证金 + //押金类型的扣除押金 ServeOrder::getInstance()->where('store_order_id', $financialRecord['order_id'])->update(['is_del' => 1]); $merchant = app()->make(MerchantDao::class)->get($financialRecord['mer_id']); $merchant->paid_margin = max(bcsub($merchant['paid_margin'], $financialRecord['number'], 2), 0); @@ -65,7 +65,7 @@ class AfterRefund } /** - * 是否有保证金 + * 是否有押金 * @param $financialRecords * @param $merId * @return bool diff --git a/app/listener/paySuccessMargin.php b/app/listener/paySuccessMargin.php index cb4bb2a4..79f068e1 100644 --- a/app/listener/paySuccessMargin.php +++ b/app/listener/paySuccessMargin.php @@ -14,7 +14,7 @@ class paySuccessMargin public $event; public function handle($event) { - Log::info('微信支付保证金成功回调' . json_encode($event)); + Log::info('微信支付押金成功回调' . json_encode($event)); Db::startTrans(); try { $order_sn = $event['order_sn']; @@ -27,7 +27,7 @@ class paySuccessMargin $merchantInfo = Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->find(); $merchant_type = Db::name('merchant_type')->where('mer_type_id', $merchantInfo['type_id'])->find(); - //已支付的保证金 + //已支付的押金 $paidMarginAmount = bcadd($merchantInfo['paid_margin'], $marginInfo['total_price'], 2); Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->update([ 'paid_margin' => $paidMarginAmount,'ot_margin'=>$paidMarginAmount @@ -45,7 +45,7 @@ class paySuccessMargin // 提交事务 Db::commit(); } catch (\Exception $e) { - Log::error('微信支付保证金失败' . $e->getMessage()); + Log::error('微信支付押金失败' . $e->getMessage()); // 回滚事务 Db::rollback(); } diff --git a/app/validate/admin/MerchantTypeValidate.php b/app/validate/admin/MerchantTypeValidate.php index e02bd476..dd78b6d9 100644 --- a/app/validate/admin/MerchantTypeValidate.php +++ b/app/validate/admin/MerchantTypeValidate.php @@ -22,9 +22,9 @@ class MerchantTypeValidate extends Validate protected $rule = [ 'type_name|店铺类型名称' => 'require|max:5', 'type_info|店铺类型要求' => 'max:256', - 'is_margin|是否有保证金' => 'require|in:0,1', + 'is_margin|是否有押金' => 'require|in:0,1', 'auth|权限' => 'require|array|min:1', - 'margin|保证金(¥)' => 'requireIf:is_margin,1', + 'margin|押金(¥)' => 'requireIf:is_margin,1', 'description|其他说明' => 'max:256', ]; } diff --git a/app/validate/admin/MerchantValidate.php b/app/validate/admin/MerchantValidate.php index 3bc6da5c..82260cc7 100644 --- a/app/validate/admin/MerchantValidate.php +++ b/app/validate/admin/MerchantValidate.php @@ -51,8 +51,8 @@ class MerchantValidate extends Validate 'is_bro_room|直播间状态' => 'require|in:0,1', 'is_trader|自营状态' => 'require|in:0,1', 'commission_rate|提成比例' => '>=:0', - 'auto_margin_rate|自动扣除保证金比例' => '>=:0', - 'paid_margin|已支付的保证金' => '>=:0', + 'auto_margin_rate|自动扣除押金比例' => '>=:0', + 'paid_margin|已支付的押金' => '>=:0', ]; /** diff --git a/config/notice.php b/config/notice.php index 12032058..fef55578 100644 --- a/config/notice.php +++ b/config/notice.php @@ -62,9 +62,9 @@ return [ 'APPLYMENTS_FAIL' => 550523, //商户申请分账待验证 'APPLYMENTS_SIGN' => 550525, - //商户申请退回保证金通过 + //商户申请退回押金通过 'REFUND_MARGIN_SUCCESS' => 710327, - //商户申请退回保证金未通过 + //商户申请退回押金未通过 'REFUND_MARGIN_FAIL' => 710328, ], //微信 diff --git a/config/sms.php b/config/sms.php index c263063e..bbd24134 100644 --- a/config/sms.php +++ b/config/sms.php @@ -72,9 +72,9 @@ return [ 'APPLYMENTS_SIGN' => 550525, //商户申请分账未通过 2.1 'APPLYMENTS_FAIL' => 550523, - //商户申请退回保证金通过 2.1 + //商户申请退回押金通过 2.1 'REFUND_MARGIN_SUCCESS' => 710327, - //商户申请退回保证金未通过 2.1 + //商户申请退回押金未通过 2.1 'REFUND_MARGIN_FAIL' => 710328, //付费会员充值成功提醒 2.1 'SVIP_PAY_SUCCESS' => 856046 @@ -130,9 +130,9 @@ return [ 'APPLYMENTS_FAIL' => '', //商户申请分账待验证 'APPLYMENTS_SIGN' => '', - //商户申请退回保证金通过 + //商户申请退回押金通过 'REFUND_MARGIN_SUCCESS' => '', - //商户申请退回保证金未通过 + //商户申请退回押金未通过 'REFUND_MARGIN_FAIL' => '', ], ] diff --git a/crmeb/services/ExcelService.php b/crmeb/services/ExcelService.php index af286481..49863f0f 100644 --- a/crmeb/services/ExcelService.php +++ b/crmeb/services/ExcelService.php @@ -354,7 +354,7 @@ class ExcelService 'order_presell' => '预售订单（定金）', 'refund_platform_coupon' => '退回优惠券补贴', 'order_platform_coupon' => '优惠券补贴', - 'auto_margin' => '保证金', + 'auto_margin' => '押金', 'commission_to_service_team' => '订单平台佣金', 'commission_to_platform' => '订单剩余平台手续费', 'commission_to_village' => '订单平台佣金', @@ -363,7 +363,7 @@ class ExcelService 'commission_to_platform_refund' => '退回剩余平台手续费', 'commission_to_village_refund' => '退回平台佣金', 'commission_to_town_refund' => '退回平台佣金', - 'auto_margin_refund' => '退回保证金', + 'auto_margin_refund' => '退回押金', 'commission_to_entry_merchant' => '订单平台佣金', 'commission_to_cloud_warehouse' => '订单平台佣金', 'commission_to_entry_merchant_refund' => '退回平台佣金', diff --git a/crmeb/services/SmsService.php b/crmeb/services/SmsService.php index b40079b2..b2c421ff 100644 --- a/crmeb/services/SmsService.php +++ b/crmeb/services/SmsService.php @@ -261,10 +261,10 @@ class SmsService 'site' => systemConfig('site_name'), ]); break; - //保证金退回申请通过通知 2.1 + //押金退回申请通过通知 2.1 case 'REFUND_MARGIN_SUCCESS': //nobreak; - //保证金退回申请未通过通知 2.1 + //押金退回申请未通过通知 2.1 case 'REFUND_MARGIN_FAIL': self::create()->send($id['phone'], $tempId, ['name' => $id['name'], 'time' => $id['time'],]); break; diff --git a/route/admin/merchant.php b/route/admin/merchant.php index aca5917c..931e4a7b 100644 --- a/route/admin/merchant.php +++ b/route/admin/merchant.php @@ -193,7 +193,7 @@ Route::group(function () { '_auth' => true, ]); - //保证金 + //押金 Route::group('margin', function () { //缴纳记录 Route::get('lst', 'merchant.MerchantMargin/lst')->name('systemMerchantMarginLst')->option([ @@ -204,14 +204,14 @@ Route::group(function () { '_alias' => '扣费记录', ]); - //扣除保证金 + //扣除押金 Route::get('set/:id/form', 'merchant.MerchantMargin/setMarginForm')->name('systemMarginSetForm')->option([ - '_alias' => '扣除保证金表单', + '_alias' => '扣除押金表单', '_auth' => false, '_form' => 'systemMarginSet', ]); Route::post('set', 'merchant.MerchantMargin/setMargin')->name('systemMarginSet')->option([ - '_alias' => '扣除保证金', + '_alias' => '扣除押金', ]); //退款申请 diff --git a/route/api.php b/route/api.php index ff9c030b..55b0a923 100644 --- a/route/api.php +++ b/route/api.php @@ -73,7 +73,7 @@ Route::group('api/', function () { //绑定推荐人 Route::post('user/spread', 'api.Auth/spread'); - //用户缴纳保证金 + //用户缴纳押金 Route::post('user/margin', 'api.Auth/doMargin'); Route::get('user/margin/list', 'api.Auth/marginList'); diff --git a/route/merchant/accounts.php b/route/merchant/accounts.php index 6614aa6e..56e1083b 100644 --- a/route/merchant/accounts.php +++ b/route/merchant/accounts.php @@ -19,7 +19,7 @@ Route::group(function () { Route::group('financial', function () { Route::post('refund/margin', 'Financial/refundMargin')->name('merchantFinancialRefundMargin')->option([ - '_alias' => '退保证金申请', + '_alias' => '退押金申请', ]); })->prefix('merchant.system.financial.')->option([ '_path' => 'merchant/margin',