Merge branch 'develop'

app/crm/controller/ApprovalFlowsController.php

@@ -0,0 +1,33 @@
+<?php
+namespace app\crm\controller;
+
+use app\common\controller\BaseController;
+use app\common\traits\crud\CrudControllerTrait;
+use app\crm\service\ApprovalFlowsService;
+
+class ApprovalFlowsController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new ApprovalFlowsService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    // protected function indexFormat($data)
+    // {
+    //     if (isset($data['created_at']))
+    //         $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+    //     if (isset($data['updated_at']))
+    //         $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+    //     return $data;
+    // }
+}

app/crm/controller/ApprovalInstancesController.php

@@ -0,0 +1,33 @@
+<?php
+namespace app\crm\controller;
+
+use app\common\controller\BaseController;
+use app\common\traits\crud\CrudControllerTrait;
+use app\crm\service\ApprovalInstancesService;
+
+class ApprovalInstancesController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new ApprovalInstancesService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    // protected function indexFormat($data)
+    // {
+    //     if (isset($data['created_at']))
+    //         $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+    //     if (isset($data['updated_at']))
+    //         $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+    //     return $data;
+    // }
+}

app/crm/controller/ApprovalRecordsController.php

@@ -0,0 +1,89 @@
+<?php
+namespace app\crm\controller;
+
+use app\common\controller\BaseController;
+use app\common\traits\crud\CrudControllerTrait;
+use app\crm\service\ApprovalRecordsService;
+use app\common\model\SysDictItem;
+use support\Request;
+
+class ApprovalRecordsController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new ApprovalRecordsService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function indexFormat($data)
+    {
+        if (isset($data['records']) && count($data['records']) > 0) {
+            foreach ($data['records'] as $key => &$record) {
+                $result = [
+                    'id' => $record['id'],
+                    'flows_name' => $record['approvalInstance']['flows']['name'],
+
+                    'instance_id' => $record['instance_id'],
+
+                    'biz_id' => $record['approvalInstance']['biz_id'],
+                    'biz_desc' => '备货单【'.$record['approvalInstance']['bizInfo']['order_no'].'】',
+                    'biz_type' => $record['approvalInstance']['flow_type'],
+
+                    'initiator_name' => $record['approvalInstance']['initiator']['name'],
+                    'initiator_avatar' => $record['approvalInstance']['initiator']['avatar'],
+
+                    'approver_name' => $record['approver']['name'],
+                    'approver_avatar' => $record['approver']['avatar'],
+                    
+                    'step_index' => $record['step_index'],
+                    'action' => $record['action'],
+                    'action_desc' => SysDictItem::where('item_value', $record['action'])->where('status', 1)->value('item_label'),
+                    'status' => $record['status'],
+                    'status_desc' => SysDictItem::where('item_value', $record['status'])->where('status', 1)->value('item_label'),
+                    'comment' => $record['comment'],
+                    'approved_at' => $record['approved_at'],
+
+                    'finished_at' => $record['approvalInstance']['finished_at'],
+                    'deadline_at' => $record['approvalInstance']['deadline_at'],
+
+                    'created_at' => $record['created_at']
+                ];
+                $record = $result;
+            }
+        }
+        return $data;
+    }
+
+
+    public function approve(Request $request)
+    {
+         try {
+            $res = $this->service->serviceApprove($request);
+            return $this->success([], $res['msg']);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+
+    public function logs(Request $request)
+    {
+        try {
+            $instanceId = $request->get('instance_id');
+            $appro = new \app\common\utils\approval\service\ApprovalFlowService();
+            $res = $appro->getSimpleTimeline($instanceId, 'name', 'prepend');
+            return $this->success($res);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+}

app/crm/controller/CustomerController.php

@@ -205,6 +205,25 @@ class CustomerController extends BaseController
         }
     }
 
+    /**
+     * 客户下拉
+     * @param Request $request
+     * @return \support\Response
+     */
+    public function preset(Request $request)
+    {
+        try {
+            $param = $request->all();
+            $param['user_id'] = $request->user->uid;
+            $param['corp_abbr'] = $request->basic_data['corp_abbr'];
+            $result = (new CustomerService())->preset($param);
+
+            return $this->success($result);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
     /**
      * 客户恢复
      * @param Request $request
@@ -295,14 +314,10 @@ class CustomerController extends BaseController
         if (Util::isEmpty($channel_id)) {
             return $this->error(trans('channel_not_null'));
         }
-        $country_id = Util::getParam($request, 'country_id', 0);
-        if (Util::isEmpty($country_id)) {
-//            return $this->error('country_id'.trans('not_null'));
+        $country_id = Util::getParam($request, 'country_id', 245);
+        if(empty($country_id)){
+            $country_id = 245;
         }
-//        $car_type_id = Util::getParam($request, 'car_type_id');
-//        if (Util::isEmpty($car_type_id)) {
-//            return $this->error(trans('car_type_not_null'));
-//        }
         $contacts = Util::getParam($request, 'contacts');
         $email = Util::getParam($request, 'email');
         $phone = Util::getParam($request, 'phone');

app/crm/controller/StockOrderAccountsController.php

@@ -0,0 +1,33 @@
+<?php
+namespace app\crm\controller;
+
+use app\common\controller\BaseController;
+use app\common\traits\crud\CrudControllerTrait;
+use app\common\service\StockOrderAccountsService;
+
+class StockOrderAccountsController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new StockOrderAccountsService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    // protected function indexFormat($data)
+    // {
+    //     if (isset($data['created_at']))
+    //         $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+    //     if (isset($data['updated_at']))
+    //         $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+    //     return $data;
+    // }
+}

app/crm/controller/StockOrderItemOptionsController.php

@@ -0,0 +1,33 @@
+<?php
+namespace app\crm\controller;
+
+use app\common\controller\BaseController;
+use app\common\traits\crud\CrudControllerTrait;
+use app\common\service\StockOrderItemOptionsService;
+
+class StockOrderItemOptionsController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new StockOrderItemOptionsService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    // protected function indexFormat($data)
+    // {
+    //     if (isset($data['created_at']))
+    //         $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+    //     if (isset($data['updated_at']))
+    //         $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+    //     return $data;
+    // }
+}

app/crm/controller/StockOrderItemsController.php

@@ -0,0 +1,33 @@
+<?php
+namespace app\crm\controller;
+
+use app\common\controller\BaseController;
+use app\common\traits\crud\CrudControllerTrait;
+use app\common\service\StockOrderItemsService;
+
+class StockOrderItemsController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new StockOrderItemsService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    // protected function indexFormat($data)
+    // {
+    //     if (isset($data['created_at']))
+    //         $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+    //     if (isset($data['updated_at']))
+    //         $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+    //     return $data;
+    // }
+}

app/crm/controller/StockOrdersController.php

@@ -0,0 +1,295 @@
+<?php
+namespace app\crm\controller;
+
+use app\common\controller\BaseController;
+use app\common\traits\crud\CrudControllerTrait;
+use app\crm\service\StockOrdersService;
+use support\Request;
+
+class StockOrdersController extends BaseController
+{
+    protected $noNeedLogin = ['print'];
+
+    protected $noNeedHeaderData = ['print'];
+
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new StockOrdersService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function indexFormat($data)
+    {
+        if (isset($data['created_at'])) $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+        if (isset($data['updated_at'])) $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+        if (isset($data['eta_ship_date'])) $data['eta_ship_date'] = date('Y-m-d', $data['eta_ship_date']);
+        if (isset($data['biz_date'])) $data['biz_date'] = date('Y-m-d', $data['biz_date']);
+        if (isset($data['latest_arrival_date'])) $data['latest_arrival_date'] = date('Y-m-d', $data['latest_arrival_date']);
+
+        if (isset($data['id'])) {
+            $appro = new \app\common\utils\approval\service\ApprovalFlowService();
+            $appro = $appro->getBriefStatusByBiz($data['id'], null, 'name');
+            $map = ['processing'=>'审批中','pending'=>'审批中','approved'=>'已通过','rejected'=>'已拒绝','revoked'=>'已撤回'];
+            if ($appro) {
+                $data['appro_status'] = [
+                    'status' => $appro['status'],
+                    'status_desc' => $map[$appro['status']],
+                    'name' => isset($appro['step'])?$appro['step']['name']:''
+                ];
+            }
+        }
+        return $data;
+    }
+
+
+    protected function showFormat($data)
+    {
+        if (isset($data['created_at'])) $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+        if (isset($data['updated_at'])) $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+        if (isset($data['eta_ship_date'])) $data['eta_ship_date'] = date('Y-m-d', $data['eta_ship_date']);
+        if (isset($data['biz_date']) && $data['biz_date'] > 0) $data['biz_date'] = date('Y-m-d', $data['biz_date']);
+        if (isset($data['latest_arrival_date']) && $data['latest_arrival_date'] > 0) $data['latest_arrival_date'] = date('Y-m-d', $data['latest_arrival_date']);
+        if (isset($data['pick_up_date']) && $data['pick_up_date'] > 0) $data['pick_up_date'] = date('Y-m-d', $data['pick_up_date']);
+        if (isset($data['collect_all_date']) && $data['collect_all_date'] > 0) $data['collect_all_date'] = date('Y-m-d', $data['collect_all_date']);
+
+        if (!empty($data['contract'])) {
+            $data['contract_url'] = (new \app\common\service\OssService)->generatePrivateUrl($data['contract']);
+        }
+
+        if (count($data['moneyValues']) > 0) {
+            foreach ($data['moneyValues'] as $mvs) {
+                $data[$mvs['field']] = [
+                    'exchange_rate' => $mvs['exchange_rate'],
+                    'amount' => $mvs['amount'],
+                    'currency' => $mvs['currency'],
+                    'id' => $mvs['id']
+                ];
+            }
+        }
+
+        foreach ($data['items'] as &$item) {
+            foreach ($item['moneyValues'] as $mv) {
+                $item[$mv['field']] = [
+                    'exchange_rate' => $mv['exchange_rate'],
+                    'amount' => $mv['amount'],
+                    'currency' => $mv['currency'],
+                    'id' => $mv['id']
+                ];
+            }
+            unset($item['moneyValues']);
+
+            foreach ($item['options'] as $opt) {
+                $item['modify_list'][] = [
+                    "id" => $opt['id'],
+                    "order_item_id" => $opt['order_item_id'],
+                    "option_id" => $opt['option_id'],
+                    "option_name_snapshot" => $opt['option_name_snapshot'],
+                    "option_price" => $opt['option_price']
+                ];
+            }
+            unset($item['options']);
+        }
+        unset($item);
+        
+
+        foreach ($data['accounts'] as $acc) {
+            $data['account_list'][] = [
+                "id" => $acc['id'],
+                "order_id" => $acc['order_id'],
+                "seq_no" => $acc['seq_no'],
+                "remit_country_id" => $acc['remit_country_id'],
+                "remit_country_name_snapshot" => $acc['remit_country_name_snapshot'],
+                "remit_date" => date('Y-m-d', $acc['remit_date']),
+                "currency_code" =>  $acc['currency_code'],
+                "currency_name_snapshot" => $acc['currency_name_snapshot'],
+                "account_id" => $acc['account_id'],
+                "account_name_snapshot" => $acc['account_name_snapshot'],
+                "remitter_name" => $acc['remitter_name'],
+                "amount" => $acc['amount']
+            ];
+        }
+        unset($data['accounts']);
+
+        $data['veh_list'] = $data['items'];
+        unset($data['items']);
+        return $data;
+    }
+
+
+    protected function printFormat($data)
+    {
+        $data['file_url_full'] = (!empty($data['file_url'])) ? (new \app\common\service\OssService)->generatePrivateUrl($data['file_url']) : '';
+        return $data;
+    }
+    
+    /**
+     * 获取打印数据
+     */
+    public function print(Request $request)
+    {
+         try {
+            $raw = $this->service->servicePrint($request);
+            $data = $this->transformData($raw, method_exists($this, 'printFormat')
+                                    ? [$this, 'printFormat']
+                                    : null);
+            return $this->success($data);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+    public function detail(Request $request)
+    {
+         try {
+            $raw = $this->service->serviceDetail($request);
+            $data = $this->transformData($raw, method_exists($this, 'detailFormat')
+                                    ? [$this, 'detailFormat']
+                                    : null);
+            return $this->success($data);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+    protected function detailFormat($data)
+    {
+        // if (!isset($data['profit_total'])) $data['profit_total'] = 0.00;
+        return $data;
+    }
+    
+    /**
+     * 启动审批
+     */
+    public function approval(Request $request)
+    {
+         try {
+            $raw = $this->service->serviceApproval($request);
+            $data = $this->transformData($raw, method_exists($this, 'approvalFormat')
+                                    ? [$this, 'approvalFormat']
+                                    : null);
+            return $this->success($data);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+    /**
+     * 最终审批
+     */
+    public function ultimateApproval(Request $request)
+    {
+         try {
+            $raw = $this->service->serviceUltimateApproval($request);
+            $data = $this->transformData($raw, method_exists($this, 'approvalFormat')
+                                    ? [$this, 'approvalFormat']
+                                    : null);
+            return $this->success($data);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+    public function desc(Request $request)
+    {
+        
+        $data = [
+            'id' => '',    //'主键',
+            'order_no' => '',    //'备货单编号（业务唯一）',
+            'pi_no' => '',    //'PI号'/'阿里订单号',
+            'biz_date' => '',    //'单据日期(时间戳)',
+            'salesperson_id' => '',    //'业务员ID（关联数据）',
+            'salesperson_snapshot' => '',    //'业务员姓名快照',
+            'clearance_country_id' => '',    //'清关目的国ID（关联数据）',
+            'clearance_country_snapshot' => '',    //'清关目的国名称快照',
+            // 'ali_order_no' => '',    //'阿里订单号',
+            'customer_source_id' => '',    //'客户来源ID（关联数据）',
+            'customer_source_snapshot' => '',    //'客户来源名称快照',
+            'customer_id' => '',    //'客户ID（关联数据）',
+            'customer_snapshot' => '',    //'客户名称快照',
+            'customer_country_id' => '',    //'客户所在国ID（关联数据）',
+            'customer_country_snapshot' => '',    //'客户所在国名称快照',
+            'declarant_name' => '',    //'清关人（文本）',
+            'eta_ship_date' => '',    //'预计发运日(时间戳)',
+            'shipping_method' => '',    //'出运方式（如海运/空运/铁路等）',
+            'cif_total_amount' => '',    //'0.00' COMMENT '合计到岸价(CIF)',
+            'domestic_port_id' => '',    //'国内收货港ID（关联数据）',
+            'domestic_port_snapshot' => '',    //'国内收货港名称快照',
+            'trade_term_id' => '',    //'贸易条款ID（关联数据，EXW/FOB/CIF等）',
+            'trade_term_snapshot' => '',    //'贸易条款名称快照',
+            'clearance_port_id' => '',    //'清关目的港ID（关联数据）',
+            'clearance_port_snapshot' => '',    //'清关目的港名称快照',
+            'latest_arrival_date' => '',    //'最迟到港时间(时间戳)',
+            'contract_exchange_rate' => '',    //'合同汇率（下单锁定）',
+            'settlement_currency' => '',    //'CNY' COMMENT '结算币种',
+            'remark' => '',    //'备注',
+            // 'real_veh' => '',    //'0' COMMENT '实车ID',
+            'is_final' => '',    //'0' COMMENT '是否终版1是0否',
+            'status' => '',    //'draft' COMMENT '单据状态：draft/submitted/approved/void/reversed等',
+        ];
+
+        // (?<=\x60 )[^\r\n']*(?=')
+
+        $items = [
+            // 'id' => '', // '主键',
+            // 'order_id' => '', // '所属备货单ID',
+            // 'product_code' => '', // '商品编号（可作外部编码）',
+            // 'sku_snapshot' => '', // '商品/车型名称快照',
+            // 'unit_price_value_id' => '', // '单价',
+            // 'handling_fee_value_id' => '', // '操作费',
+            // 'fob_transport_fee_value_id' => '', // 'FOB内陆运费',
+            // 'port_misc_fee_value_id' => '', // '港杂费',
+            // 'retrofit_fee_value_id' => '', // '改装费',
+            // 'total_price_value_id' => '', // '合计（按订单结算币计算）',
+
+            'vin' => '', // '车架号',
+            'sku_id' => '', // '商品/车型ID（关联数据）',
+            'model_snapshot' => '', // '车型（若与sku一致可复用；此处为显示快照）',
+            'quantity' => '', // '1.000000' COMMENT '数量',
+            'color_interior_id' => '', // '颜色内饰ID（关联数据）',
+            'color_interior_snapshot' => '', // '颜色内饰名称快照',
+            'color_exterior_id' => '', // '颜色外饰ID（关联数据）',
+            'color_exterior_snapshot' => '', // '颜色外饰名称快照',
+            'remark' => '', // '备注',
+            'unit_price' => '', // '0.000000' COMMENT '单价（含/不含税按业务口径约定）',
+            'handling_fee' => '', // '0.000000' COMMENT '手续费（按单车）',
+            'fob_transport_fee' => '', // '0.000000' COMMENT 'FOB运输费（按单车）',
+            'port_misc_fee' => '', // '0.000000' COMMENT '港杂（按单车）',
+            'retrofit_fee' => '', // '0.000000' COMMENT '改装费（按单车）',
+            'total_price' => '', // '0.000000' COMMENT '总价（quantity*unit_price，写时落地）',
+            'official_price' => '', // 官方指导价
+            'discount_price' => '', // 优惠价
+
+
+            'modify_list' => [
+                // 'order_item_id' => '', // '所属明细ID',
+                'option_id' => '', // '配置项ID（关联数据）',
+                'option_name_snapshot' => '', // '配置项名称快照',
+                'option_price' => '', // '配置项价格（可选，写时快照）',
+            ]
+        ];
+
+
+        $account = [
+            'order_id' => '', // '所属备货单ID',
+            // 'seq_no' => '', // '1' COMMENT '账户序号（行号）',
+            'remit_country_id' => '', // '汇款国ID（关联数据）',
+            'remit_country_name_snapshot' => '', // '汇款国名称快照',
+            'remit_date' => '', // '汇款日期(时间戳)',
+            'currency_code' => '', // 'USD' COMMENT '币种代码（如USD/CNY/AED等）',
+            'currency_name_snapshot' => '', // '币种名称快照（可选）',
+            'account_id' => '', // '账户ID（关联数据）',
+            'account_name_snapshot' => '', // '账户名称/开户名快照',
+            'remitter_name' => '', // '汇款人',
+            'amount' => '', // '0.00' COMMENT '金额',
+        ];
+    }
+}