清算

app-hd/controllers/PurchaseClearController.php

@@ -36,7 +36,7 @@ class PurchaseClearController extends BaseController
         }
         $post['sjId'] = $this->sjId;
         $post['shopId'] = $this->shopId;
-        $post['type'] = 1;
+        $post['type'] = dict::getDict('cleatStyle', 'hd');
         $post['customShopAdminId'] = $this->shopAdminId;
         $shopAdmin = $this->shopAdmin;
         $shopAdminName = $shopAdmin['name'] ?? '';

biz-ghs/clear/services/ClearService.php

@@ -24,11 +24,11 @@ class ClearService extends BaseService
         $ptStyle = Yii::$app->params['ptStyle'];
         foreach ($data['list'] as $key => $val) {
             //操作人
-            $type = $val['type'] ?? 1;
+            $clearStyle = $val['clearStyle'] ?? dict::getDict('clearStyle', 'hd');
             $operator = '';
             if ($ptStyle == dict::getDict('ptStyle', 'hd')) {
                 $data['list'][$key]['ghsAvatar'] = imgUtil::groupImg($val['ghsAvatar']);
-                if ($type == 2) {
+                if ($clearStyle == dict::getDict('clearStyle', 'ghs')) {
                     $operator = '商家';
                 } else {
                     $operator = $val['customShopAdminName'] ?? '';
@@ -36,7 +36,7 @@ class ClearService extends BaseService
             }
             if ($ptStyle == dict::getDict('ptStyle', 'ghs')) {
                 $data['list'][$key]['customAvatar'] = imgUtil::groupImg($val['customAvatar']);
-                if ($type == 1) {
+                if ($clearStyle == dict::getDict('clearStyle', 'hd')) {
                     $operator = '客户';
                 } else {
                     $operator = $val['ghsShopAdminName'] ?? '';

biz-ghs/order/classes/OrderClearClass.php

@@ -110,7 +110,7 @@ class OrderClearClass extends BaseClass
             'orderSn' => $orderSn,
             'saleIds' => implode(',', $ids),
             'status' => 2,
-            'type' => 2,
+            'type' => dict::getDict('clearStyle', 'ghs'),
             'customId' => $customId,
             'customName' => $custom['name'] ?? '',
             'customAvatar' => $custom['avatar'] ?? '',