shish 1 anno fa
parent
commit
425d1d4458
2 ha cambiato i file con 15 aggiunte e 2 eliminazioni
  1. 8 1
      biz-ghs/custom/classes/CustomClass.php
  2. 7 1
      common/components/dict.php

+ 8 - 1
biz-ghs/custom/classes/CustomClass.php

@@ -213,7 +213,6 @@ class CustomClass extends BaseClass
             'staffName' => $staffName,
             'payStatus' => 1,
             'status' => 1,
-            'remark' => '',
             'ghsId' => $ghsId,
             'ghsShopId' => $ghsShopId,
             'ghsName' => $ghsName,
@@ -228,6 +227,10 @@ class CustomClass extends BaseClass
         $cRechargeId = $cRecharge->id ?? 0;
 
         $capitalType = dict::getDict('capitalType', 'ghsHelpCustomRecharge', 'id');
+        if($rechargeType == 1){
+            //售后返充
+            $capitalType = dict::getDict('capitalType', 'ghsHelpCustomRechargeReturn', 'id');
+        }
         $fromType = dict::getDict('fromType', 'shop');
         $cbData = [
             'customId' => $customId,
@@ -282,6 +285,10 @@ class CustomClass extends BaseClass
         $gRecharge = GhsRechargeClass::add($gData, true);
         $gRechargeId = $gRecharge->id ?? 0;
         $capitalType = dict::getDict('capitalType', 'customAskGhsRecharge', 'id');
+        if($rechargeType == 1){
+            //售后返充
+            $capitalType = dict::getDict('capitalType', 'customAskGhsRechargeReturn', 'id');
+        }
         $gbData = [
             'ghsId' => $ghsId,
             'ghsName' => $ghsName,

+ 7 - 1
common/components/dict.php

@@ -353,7 +353,7 @@ class dict
             'ghsClearExpend' => ['id' => 61, 'name' => 'ghsClearExpend'],
             //供货商帮客户充值
             'ghsHelpCustomRecharge' => ['id' => 62, 'name' => 'ghsHelpCustomRecharge'],
-            //客户让供货商帮忙充值
+            //客户叫供货商充值
             'customAskGhsRecharge' => ['id' => 63, 'name' => 'customAskGhsRecharge'],
             //供货商帮客户用余额结账
             'ghsHelpCustomUseBalanceClear' => ['id' => 64, 'name' => 'ghsHelpCustomUseBalanceClear'],
@@ -375,6 +375,10 @@ class dict
             'delBook' => ['id' => 73, 'name' => 'delBook'],
             //供货商采购退款
             'ghsCgRefund' => ['id' => 74, 'name' => 'ghsCgRefund'],
+            //供货商帮客户充值(售后返充)
+            'ghsHelpCustomRechargeReturn' => ['id' => 75, 'name' => 'ghsHelpCustomRechargeReturn'],
+            //客户叫供货商充值(售后返充)
+            'customAskGhsRechargeReturn' => ['id' => 76, 'name' => 'customAskGhsRechargeReturn'],
         ],
         "capitalTypeList" => [//流水类型的对应链接,后台收支明细查看时跳转的链接
             0 => ['link' => '/capital/order-detail', 'name' => '网店', 'orderLink' => '/order/detail', 'id' => 0,],
@@ -421,6 +425,8 @@ class dict
             72 => ['link' => '', 'name' => '新增预订', 'id' => 72,],
             73 => ['link' => '', 'name' => '减少预订', 'id' => 73,],
             74 => ['link' => '', 'name' => '采购退款', 'id' => 74,],
+            75 => ['link' => '', 'name' => '售后返充', 'id' => 75,],
+            76 => ['link' => '', 'name' => '售后返充', 'id' => 76,],
         ],
 
         //用户来源