Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into data_rules-m

# Conflicts:
#	app/adminapi/lists/property/PropertyHeadLists.php

app/adminapi/lists/master_commission/MasterWorkerCommissionNoticeLists.php

@@ -108,7 +108,7 @@ class MasterWorkerCommissionNoticeLists extends BaseAdminDataLists implements Li
             ->leftJoin('service_work sw', 'n.master_worker_id = sw.master_worker_id AND sw.create_time >= n.signing_date AND sw.create_time <= n.signing_date_end')
             ->field([
                 'n.id', 'n.commission_config_id', 'n.master_worker_id', 'n.day_num', 'n.order_num', 'n.signing_date', 'n.signing_date_end',
-                'mw.real_name', 'mw.nickname', 'mw.worker_number', 'mw.mobile','mw.labels',
+                'mw.real_name', 'mw.nickname', 'mw.worker_number', 'mw.mobile','mw.labels','mw.remark',
                 Db::raw("COUNT(CASE WHEN sw.service_status = 3 THEN sw.id ELSE null END) AS order_count"),
                 Db::raw("MAX(CASE WHEN sw.service_status = 3 THEN sw.finished_time ELSE null END) max_time")
             ])

app/adminapi/lists/master_worker/MasterWorkerServiceOrderLists.php

@@ -121,7 +121,7 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
     {
         $queryWhere = $this->queryWhere();
         $lists = Db::name('master_worker')->alias('a')->field([
-                'a.id','a.real_name','a.nickname','a.worker_number','a.recruiting_behalf','a.mobile','a.cooperation','a.category_ids','a.labels',
+                'a.id','a.real_name','a.nickname','a.worker_number','a.recruiting_behalf','a.mobile','a.cooperation','a.category_ids','a.labels','a.remark',
                 Db::raw("COUNT(b.id) AS all_count"),
                 Db::raw("SUM(CASE WHEN b.service_status = 3 THEN 1 ELSE 0 END) AS success_count"),
                 Db::raw("SUM(CASE WHEN b.service_status = 4 OR b.service_status = 5 THEN 1 ELSE 0 END) AS fail_count"),

app/adminapi/lists/property/PropertyHeadLists.php

@@ -82,7 +82,7 @@ class PropertyHeadLists extends BaseAdminDataLists implements ListsSearchInterfa
     public function lists(): array
     {
         return PropertyHead::where($this->searchWhere)->where($this->queryDataWhere())
-            ->field(['id', 'property_name', 'village_name', 'address', 'head_name', 'head_mobile', 'ratio', 'head_bank_card', 'remark', 'user_id', 'all_profit_amount', 'surplus_profit_amount', 'extract_profit_amount','lon', 'lat','bind_date','sale_type','sale_id','is_cooperate'])
+            ->field(['head_corporate_bank','id', 'property_name', 'village_name', 'address', 'head_name', 'head_mobile', 'ratio', 'head_bank_card', 'remark', 'user_id', 'all_profit_amount', 'surplus_profit_amount', 'extract_profit_amount','lon', 'lat','bind_date','sale_type','sale_id','is_cooperate'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()

app/adminapi/lists/sale/PropertyHeadAnalysisLists.php

@@ -95,7 +95,7 @@ class PropertyHeadAnalysisLists extends BaseAdminDataLists implements ListsSearc
             ->leftJoin('property_head c', 'a.property_head_id = c.id')
             ->leftJoin('sale d', 'a.sale_id = d.id')
             ->field([
-                'a.property_head_id','c.property_name','c.village_name','c.address','c.head_name','c.head_mobile','c.ratio','c.remark','d.sale_name',
+                'a.property_head_id','c.property_name','c.village_name','c.address','c.head_name','c.head_mobile','c.ratio','c.remark','c.head_bank_card','c.head_corporate_bank','d.sale_name',
                 Db::raw("COUNT(a.work_id) AS work_count,SUM(b.work_amount) AS total_sales_amount")
             ])
             ->where('a.sale_type', 'in', [1, 2])
@@ -134,9 +134,9 @@ class PropertyHeadAnalysisLists extends BaseAdminDataLists implements ListsSearc
     public function setExcelComplexFields(): array
     {
         $zh_cn_fields = [
-            '所属代理','所属小区', '所属销售','单数','总金额','分成比例','分成金额'
+            '所属代理','备注','银行卡信息','对公银行信息','所属小区', '所属销售','单数','总金额','分成比例','分成金额'
         ];
-        $data_fields = ['property_name','village_name','sale_name','work_count','total_sales_amount','ratio',function($row){
+        $data_fields = ['property_name','remark','head_bank_card','head_corporate_bank','village_name','sale_name','work_count','total_sales_amount','ratio',function($row){
             return bcmul($row['total_sales_amount'], bcdiv($row['ratio'], 100, 4),2);
         }];
         return [

app/adminapi/logic/master_worker/MasterWorkerLogic.php

@@ -74,6 +74,7 @@ class MasterWorkerLogic extends BaseLogic
                 'recruiting_behalf' => $params['recruiting_behalf']??'',
                 'settlement_type' => $params['settlement_type']??2,
                 'labels' => (isset($params['labels']) && $params['labels'])?implode(',',$params['labels']):'',
+                'remark' => $params['remark']??'',
             ]);
 
             Db::commit();
@@ -142,6 +143,7 @@ class MasterWorkerLogic extends BaseLogic
                 'recruiting_behalf' => $params['recruiting_behalf']??'',
                 'settlement_type' => $params['settlement_type']??2,
                 'labels' => (isset($params['labels']) && $params['labels'])?implode(',',$params['labels']):'',
+                'remark' => $params['remark']??'',
             ]);
             Db::commit();
             return true;

app/adminapi/logic/property/PropertyHeadLogic.php

@@ -53,6 +53,7 @@ class PropertyHeadLogic extends BaseLogic
                 'head_mobile' => $params['head_mobile'],
                 'ratio' => $params['ratio'],
                 'head_bank_card' => $params['head_bank_card'],
+                'head_corporate_bank' => $params['head_corporate_bank']??'',
                 'lon' => $params['lon'],
                 'lat' => $params['lat'],
                 'remark' => $params['remark'],
@@ -101,6 +102,7 @@ class PropertyHeadLogic extends BaseLogic
                 'head_mobile' => $params['head_mobile'],
                 'ratio' => $params['ratio'],
                 'head_bank_card' => $params['head_bank_card'],
+                'head_corporate_bank' => $params['head_corporate_bank']??'',
                 'lon' => $params['lon'],
                 'lat' => $params['lat'],
                 'remark' => $params['remark'],