开始查找没有金额原因

biz-ghs/clear/classes/ClearClass.php

@@ -169,7 +169,7 @@ class ClearClass extends BaseClass
         $customShop->save();
     }
 
-    //完整信息 shish 20210625
+    //供应商的采购信息 shish 20210625
     public static function getGhsCgInfo($id)
     {
         $info = self::getById($id);
@@ -181,16 +181,16 @@ class ClearClass extends BaseClass
         $cgList = CgClass::getAllByCondition(['id' => ['in', $cgArr]], null, 'id,orderSn,bigNum,smallNum,realPrice', null);
         $info['orderList'] = $cgList;
         $info['orderNum'] = count($cgArr);
-        $type = $info['type'] ?? 1;
+        $clearStyle = $info['clearStyle'] ?? dict::getDict('clearStyle', 'gys2KmGys');
         $operator = $info['customShopAdminName'] ?? '';
-        if ($type == 2) {
+        if ($clearStyle == dict::getDict('clearStyle', 'kmGys2gys')) {
             $operator = '商家';
         }
         $info['operator'] = $operator;
         return $info;
     }
 
-    //完整信息 shish 20210625
+    //零售的采购信息 shish 20210625
     public static function getCgInfo($id)
     {
         $info = self::getById($id);
@@ -202,9 +202,9 @@ class ClearClass extends BaseClass
         $cgList = PurchaseClass::getAllByCondition(['id' => ['in', $cgArr]], null, 'id,orderSn,bigNum,smallNum,realPrice', null);
         $info['orderList'] = $cgList;
         $info['orderNum'] = count($cgArr);
-        $type = $info['type'] ?? 1;
+        $clearStyle = $info['clearStyle'] ?? dict::getDict('clearStyle', 'hd2Gys');
         $operator = $info['customShopAdminName'] ?? '';
-        if ($type == 2) {
+        if ($clearStyle == dict::getDict('clearStyle', 'gys2Hd')) {
             $operator = '商家';
         }
         $info['operator'] = $operator;

biz-ghs/clear/services/ClearService.php

@@ -41,7 +41,7 @@ class ClearService extends BaseService
                 }
                 if ($clearStyle == dict::getDict('clearStyle', 'gys2KmGys')) {
                     $data['list'][$key]['ghsAvatar'] = imgUtil::groupImg($val['ghsAvatar']);
-                    $operator = $val['ghsShopAdminName'] ?? '';
+                    $operator = $val['customShopAdminName'] ?? '';
                 }
             }
             $data['list'][$key]['operator'] = $operator;

common/components/dict.php

@@ -71,6 +71,7 @@ class dict
             'hd2Gys' => 1,//零售向供应商结帐
             'gys2Hd' => 2,//供应商给花店结帐
             'gys2KmGys' => 3,//供应商向昆明供应商结帐
+            'kmGys2gys' => 4,//昆明供应商向供应商结账
         ],
 
         'merchantStatus' => ['checking' => 0, 'pass' => 1, 'noPass' => 2, 'freeze' => 3, 'unfreeze' => 4, 'shut' => 5],