Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Report.php

@@ -92,7 +92,7 @@ class Report extends Base
         $where_good = [['g.is_del', '=', 0]];
         if (!empty($param['start_date']) && !empty($param['end_date'])) {
             $where_ladder[] = ['gp.online_time', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
-            $where_good[] = ['g.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
+            $where_good[] = ['gp.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
         }
         if (!empty($param['platform_id'])) {
             $where_ladder[] = ['gp.platform_code', '=', $param['platform_id']];

app/admin/controller/Sale.php

@@ -2168,6 +2168,9 @@ class Sale extends Base
         $einfo['good_num']-=$einfo['th_num'];
         $einfo['send_num']-=$einfo['th_num'];
         $einfo['total_price']=round($einfo['total_price']-$einfo['th_fee'],2);
+        $einfo['proof_type']=isset($goon['proof_type'])?$goon['proof_type']:'';
+        $einfo['proof_url']=isset($goon['proof_url'])?$goon['proof_url']:'';
+
         if (empty($einfo)) {
             return error_show(1002, "未找到销售订单数据");
         } else {