是否有支付过

application/index/service/AmercementService.php

@@ -402,9 +402,9 @@ class AmercementService
     public function cancelAmercement($id)
     {
         //判断是否有支付过
-        $payInfo = $this->isPay($id, -1);
-        if ($payInfo) {//有支付订单号 不允许取消
-            return ['code' => 101, 'msg' => '失败！该罚款有支付订单'];
+        $payInfo = $this->isPay($id);
+        if ($payInfo) {//已支付 不允许取消
+            return ['code' => 101, 'msg' => '失败！该罚款已支付'];
         } else {//无支付订单号 允许取消
             $data           = [];
             $data['id']     = $id;
@@ -446,11 +446,11 @@ class AmercementService
      */
     public function isPay($amercement_id, $status = 1)
     {
-        $amercementPayModel     = new OAmercementPayModel();
+        $amercementPayModel = new OAmercementPayModel();
         $where["amercement_id"] = $amercement_id;
-        $where["status"]        = $status;
+        $where["status"] = $status;//支付状态 0待付款  1已支付  2 支付失败 3支付中
         if ($status == -1) {
-            $where["status"] = array('neq', 2);//排除支付失败的
+            $where["status"] = array( 'neq', 2 );//排除支付失败的
         }
         $payInfo = $amercementPayModel->getAmercementPayInfo($where, "id,status,trade_no");
         return $payInfo;