shish пре 1 година
родитељ
комит
b366ace834
1 измењених фајлова са 9 додато и 3 уклоњено
  1. 9 3
      biz-ghs/custom/classes/CustomClass.php

+ 9 - 3
biz-ghs/custom/classes/CustomClass.php

@@ -200,7 +200,7 @@ class CustomClass extends BaseClass
         $payMap = dict::getDict('payWayName');
         $payName = $payMap[$payWay] ?? '';
         $rechargeEvent = $payName . '充值';
-        if($rechargeType == 1){
+        if ($rechargeType == 1) {
             $rechargeEvent = '偏后返充';
         }
 
@@ -231,7 +231,7 @@ class CustomClass extends BaseClass
         $cRechargeId = $cRecharge->id ?? 0;
 
         $capitalType = dict::getDict('capitalType', 'ghsHelpCustomRecharge', 'id');
-        if($rechargeType == 1){
+        if ($rechargeType == 1) {
             //售后返充
             $capitalType = dict::getDict('capitalType', 'ghsHelpCustomRechargeReturn', 'id');
         }
@@ -289,7 +289,7 @@ class CustomClass extends BaseClass
         $gRecharge = GhsRechargeClass::add($gData, true);
         $gRechargeId = $gRecharge->id ?? 0;
         $capitalType = dict::getDict('capitalType', 'customAskGhsRecharge', 'id');
-        if($rechargeType == 1){
+        if ($rechargeType == 1) {
             //售后返充
             $capitalType = dict::getDict('capitalType', 'customAskGhsRechargeReturn', 'id');
         }
@@ -495,6 +495,7 @@ class CustomClass extends BaseClass
 
         $relateId = $order->id ?? 0;
         $customId = $custom->id ?? 0;
+        $customName = $custom->name ?? '';
         $orderSn = $order->orderSn ?? '';
         $capitalType = dict::getDict('capitalType', 'xhGhsOrder', 'id');
         $event = '购买花材,单号:' . $orderSn;
@@ -505,6 +506,7 @@ class CustomClass extends BaseClass
         $change = [
             'relateId' => $relateId,
             'customId' => $customId,
+            'customName' => $customName,
             'ptStyle' => dict::getDict('ptStyle', 'ghs'),
             'capitalType' => $capitalType,
             'amount' => $amount,
@@ -556,12 +558,14 @@ class CustomClass extends BaseClass
         $custom->save();
         $relateId = $clear->id ?? 0;
         $customId = $custom->id ?? 0;
+        $customName = $custom->name ?? '';
         $capitalType = dict::getDict('capitalType', 'ghsXsClear', 'id');
         $orderSn = $clear->orderSn ?? '';
 
         $change = [
             'relateId' => $relateId,
             'customId' => $customId,
+            'customName' => $customName,
             'ptStyle' => dict::getDict('ptStyle', 'ghs'),
             'capitalType' => $capitalType,
             'amount' => $amount,
@@ -602,12 +606,14 @@ class CustomClass extends BaseClass
 
         $relateId = $refund->id ?? 0;
         $customId = $custom->id ?? 0;
+        $customName = $custom->name ?? '';
         $saleOrderSn = $order->orderSn ?? '';
         $capitalType = dict::getDict('capitalType', 'saleRefund', 'id');
         $payTime = $order->payTime;
         $change = [
             'relateId' => $relateId,
             'customId' => $customId,
+            'customName' => $customName,
             'ptStyle' => dict::getDict('ptStyle', 'ghs'),
             'capitalType' => $capitalType,
             'amount' => $refundPrice,