Your Name 3 vuotta sitten
vanhempi
commit
3c90e4f876
3 muutettua tiedostoa jossa 22 lisäystä ja 4 poistoa
  1. 1 1
      service/agent/database/order.php
  2. 4 2
      service/agent/lib/Order.php
  3. 17 1
      service/bill/lib/Manage.php

+ 1 - 1
service/agent/database/order.php

@@ -1007,7 +1007,7 @@ return array
                 'state' => 1,
             ),
             'type' => 'one',
-            'col' => 'sum(price) as total',
+            'col' => 'sum(agent_cash) as total',
         ),
         'getVCount' => array
         (

+ 4 - 2
service/agent/lib/Order.php

@@ -1947,11 +1947,13 @@ class Order
                     $shop_stat = '';
                     $g_price = '';#归店业绩
                     if ($v['role'] != 8) {
-                        $g_price = $v['price'];#归店业绩
+                        // $g_price = $v['price'];#归店业绩
+                        $g_price = $v['agent_cash'];
                     } 
                     
                     if ($member['prize_type'] == 1 && $member['role'] == 8) {
-                        $shop_stat = $v['price'];
+                        // $shop_stat = $v['price'];
+                        $shop_stat = $v['agent_cash'];
                     }
                     $fdate = '';
                     if ($v['fdate']) {

+ 17 - 1
service/bill/lib/Manage.php

@@ -325,7 +325,7 @@ class Manage
 
     #归店统计导出
     public function out_shop_stat($data){
-        $header = array('月份', '门店名称','门店编号','所属代理商', '采购金额','归店业绩(除创V外)','创客数','创V数','名额外创V','名额外创V业绩');
+        $header = array('月份', '门店名称','门店编号','门店联系人','联系人手机号','联系人身份证','所属代理商', '采购金额','归店业绩(除创V外)','代理商数','创客数','创V数','名额外创V','名额外创V业绩');
         $body = array();
         foreach($data as $k => $v){
             $month = date('Y-m',$v['month'])."\t";
@@ -340,14 +340,30 @@ class Manage
             }else{
                 $dl_mobile = '-';
             }
+            $shop_truename = '';
+            if ($shop['truename']) {
+                $shop_truename = $shop['truename'];
+            }
+            $shop_mobile = '';
+            if ($shop['mobile']) {
+                $shop_mobile = $shop['mobile'];
+            }
+            $shop_idcard = '';
+            if ($shop['idcard']) {
+                $shop_idcard = $shop['idcard'];
+            }
             $d = array
             (
                 $month,
                 $shop['name'],
                 $shop['sid'],
+                $shop_truename,
+                $shop_mobile,
+                $shop_idcard,
                 $dl_mobile,
                 $v['c_money'],
                 $v['dl_money'],
+                $v['dl_num'],
                 $v['ck_num'],
                 $v['v_num'],
                 $v['out_num'],