shish 5 éve
szülő
commit
a31ec6a7bb

+ 10 - 1
biz-ghs/clear/services/ClearService.php

@@ -4,6 +4,7 @@ namespace bizGhs\clear\services;
 
 use bizGhs\base\services\BaseService;
 use bizGhs\clear\classes\ClearClass;
+use common\components\dict;
 use common\components\imgUtil;
 
 class ClearService extends BaseService
@@ -19,10 +20,18 @@ class ClearService extends BaseService
         if (empty($list)) {
             return $data;
         }
+        $ptStyle = Yii::$appp->params['ptStyle'];
         foreach ($data['list'] as $key => $val) {
             //操作人
             $type = $val['type'] ?? 1;
-            $data['list'][$key]['operator'] = $type == 1 ? '客户' : '';
+            $operator = '';
+            if ($ptStyle == dict::getDict('ptStyle', 'hd')) {
+
+            }
+            if ($type == 1) {
+
+            }
+            $data['list'][$key]['operator'] = $operator;
             $data['list'][$key]['avatar'] = imgUtil::groupImg($val['avatar']);
         }
         return $data;

+ 8 - 0
biz-ghs/order/classes/OrderClass.php

@@ -356,6 +356,11 @@ class OrderClass extends BaseClass
         $adminIds = array_unique(array_filter(array_column($list, 'adminId')));
         $adminInfo = AdminClass::getAdminByIds($adminIds, null, 'id');
 
+
+        $customIds = array_column('customId', $list);
+        $customIds = array_unique(array_filter($customIds));
+        $customInfoList = CustomClass::getByIds($customIds, null, 'id');
+
         foreach ($list as $key => $val) {
             $adminId = $val['adminId'] ?? 0;
             $list[$key]['adminName'] = $adminInfo[$adminId]['name'] ?? '';
@@ -406,6 +411,8 @@ class OrderClass extends BaseClass
             }
 
             $sendNum = $val['sendNum'] ?? '';
+            $customId = $val['customId'] ?? '';
+            $debtAmount = $customInfoList[$customId]['debtAmount'] ?? 0.00;
             $printData = [
                 'address' => '集美区乐海路186-4',
                 'sendCost' => $val['sendCost'] ?? '0.00',
@@ -423,6 +430,7 @@ class OrderClass extends BaseClass
                 ],
                 'product' => $printProduct,
                 'sendNum' => date("d") . $sendNum,
+                'debtAmount' => $debtAmount,
             ];
             $list[$key]['printData'] = json_encode($printData);
         }