|
|
@@ -242,9 +242,9 @@ class dict
|
|
|
'riseTypeName' => [0 => '不涨价', 1 => '按百分比', 2 => '按金额'],
|
|
|
|
|
|
//支付方式
|
|
|
- 'payWay' => ['wxPay' => 0, 'alipay' => 1, 'balancePay' => 2, 'debtPay' => 3, 'cash' => 4, 'bankCard' => 5, 'unknown' => 9, 'unPay' => 10,],
|
|
|
- 'payWayName' => [0 => '微信', 1 => '支付宝', 2 => '余额', 3 => '欠款', 4 => '现金', 5 => '银行卡', 9 => '其它', 10 => '待付款'],
|
|
|
- 'payWayFullName' => [0 => '微信支付', 1 => '支付宝', 2 => '余额支付', 3 => '欠款支付', 4 => '现金', 5 => '银行卡', 9 => '其它', 10 => '待付款'],
|
|
|
+ 'payWay' => ['wxPay' => 0, 'alipay' => 1, 'balancePay' => 2, 'debtPay' => 3, 'cash' => 4, 'bankCard' => 5, 'unknown' => 9, 'unPay' => 10, 'deduction' => 11,],
|
|
|
+ 'payWayName' => [0 => '微信', 1 => '支付宝', 2 => '余额', 3 => '欠款', 4 => '现金', 5 => '银行卡', 9 => '其它', 10 => '待付款', 11 => '抵扣'],
|
|
|
+ 'payWayFullName' => [0 => '微信支付', 1 => '支付宝', 2 => '余额支付', 3 => '欠款支付', 4 => '现金', 5 => '银行卡', 9 => '其它', 10 => '待付款', 11 => '抵扣'],
|
|
|
//后台支付方式选项
|
|
|
'htPayWayOption' => [
|
|
|
['name' => '微信', 'id' => 0],
|
|
|
@@ -582,7 +582,7 @@ class dict
|
|
|
if (getenv('YII_ENV') == 'production') {
|
|
|
//老油云漫梦金鹏、徐记花卉、康多鲜、旭海不需要收运费,搜索关键词dbNoFee
|
|
|
|
|
|
- if (in_array($mainId, [20528, 10866, 38657,41121])) {
|
|
|
+ if (in_array($mainId, [20528, 10866, 38657, 41121])) {
|
|
|
$respond['transCost'] = [
|
|
|
['sign' => 0, 'perKiloCost' => 0],
|
|
|
['sign' => 1, 'perKiloCost' => 0],
|