From f96022ec367504e778c3fe75929cf346544cec37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Mon, 9 Aug 2021 10:29:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E8=AE=A4=E9=A2=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/order/controller/ChargeOrder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/order/controller/ChargeOrder.php b/app/order/controller/ChargeOrder.php
index ea339ff..984ac54 100644
--- a/app/order/controller/ChargeOrder.php
+++ b/app/order/controller/ChargeOrder.php
@@ -21,7 +21,7 @@ class ChargeOrder extends Controller
             $date2 = date("Y-m-d 23:59:59", strtotime($get['Etime']));
         }
         $charge_model = new UserChargeOrder;
-        $list = $charge_model->field('Channel,sum(PaymentAmount) Amount')->where($where)->where("Channel IS NOT NULL AND CreateTime>'".$date1."' AND CreateTime<'".$date2."'")->group(['Channel'])->fetchAll();
+        $list = $charge_model->field('Channel,sum(PaymentAmount) Amount')->where($where)->where("Channel IS NOT NULL AND TradeNo IS NOT NULL AND CreateTime>'".$date1."' AND CreateTime<'".$date2."'")->group(['Channel'])->fetchAll();
         $data = [
             'Code' => 10000,
             'TotalCount' => count($list),
@@ -34,7 +34,7 @@ class ChargeOrder extends Controller
     {
         $charge_model = new UserChargeOrder;
         $get = $_GET;
-        if($charge_model->updateTake(['UserName'=>$get['phone'],'PaymentAmount'=>$get['amount']],"CreateTime>'".date('Y-m-d H:i:s',time()-3600)."' AND Channel IS NULL AND CreateTime<'".date("Y-m-d H:i:s", time())."'",['Channel'=>$this->userinfo['LoginName']])){
+        if($charge_model->updateTake(['UserName'=>$get['phone'],'PaymentAmount'=>$get['amount']],"CreateTime>'".date('Y-m-d H:i:s',time()-3600)."' AND Channel IS NULL AND TradeNo IS NOT NULL AND CreateTime<'".date("Y-m-d H:i:s", time())."'",['Channel'=>$this->userinfo['LoginName']])){
             $data = [
                 'Code' => 20000,
                 'Message' => '认领成功'