1

application/api_broker/controller/Amercement.php

@@ -107,13 +107,11 @@ class Amercement extends Basic
     {
         $params = $this->params;
         /*    $params = array(
-                "amercement_id"        => 11,
-                "trade_no"        => "12323123123",
-                "pay_type"          => 1,//支付类型 1支付宝  2微信
-                "status" => 0,
-                "remark" => "qweqweqweqwe",
-                "pay_money" => 111,
-                "pay_time" => 111,
+                "amercement_id"        => 11,//主表的id
+                "trade_no"        => "12323123123",//赵坤返回的fc开头的no
+                "pay_type"          => 1,//支付类型 1支付宝  2微信 目前都是支付宝
+                "pay_money" => 111,  //金额
+                "pay_time" => 111,//时间
             );*/
         $checkResult = $this->validate($params, "AmercementValidate.savePayAmercement");
         if (true !== $checkResult) {
@@ -122,12 +120,10 @@ class Amercement extends Basic
         $amercement_id = $params["amercement_id"];
         $trade_no      = $params["trade_no"];
         $pay_type      = $params["pay_type"];//支付类型 1支付宝  2微信
-        $status        = $params["status"];
-        $remark        = $params["remark"];
         $pay_money     = $params["pay_money"];
         $pay_time      = $params["pay_time"];
 
-        $result = $this->s_amercement->savePayAmercement($amercement_id, $trade_no, $pay_type, $status, $remark, $pay_money, $pay_time);
+        $result = $this->s_amercement->savePayAmercement($amercement_id, $trade_no, $pay_type, $pay_money, $pay_time);
         if ($result) {
             return $this->response("200", "成功", $result);
         } else {

application/index/service/AmercementService.php

@@ -17,6 +17,7 @@ use app\index\untils\ExportExcelUntil;
 use app\model\AAgents;
 use app\model\OAmercementImgModel;
 use app\model\OAmercementModel;
+use app\model\OAmercementPayModel;
 use app\model\UserAgentModel;
 
 class AmercementService
@@ -611,19 +612,42 @@ class AmercementService
         return $res;
     }
 
-    public function savePayAmercement($amercement_id, $trade_no, $pay_type, $status, $remark, $pay_money, $pay_time)
+
+    /**
+     * @param $amercement_id
+     * @param $trade_no
+     * @param $pay_type
+     * @param $pay_money
+     * @param $pay_time
+     * @return array
+     */
+    public function savePayAmercement($amercement_id, $trade_no, $pay_type, $pay_money, $pay_time)
     {
         //todo 判断是否有支付过
+        $amercementPayModel     = new OAmercementPayModel();
+        $where["amercement_id"] = $amercement_id;
+        $where["status"]        = 0;
+        $payInfo1                = $amercementPayModel->getAmercementPayInfo($where, "id,status,trade_no");
+        if ($payInfo1) {
+            return ["code" => '101', "msg" => "订单已支付"];
+        }
+        $where["amercement_id"] = $amercement_id;
+        $where["trade_no"]      = $trade_no;
+        $payInfo2               = $amercementPayModel->getAmercementPayInfo($where, "id,status,trade_no");
+
+         if ($payInfo2) {
+            return ["code" => '101', "msg" => "订单等待支付中"];
+        }else {
+            $arr["amercement_id"] = $amercement_id;
+            $arr["trade_no"]      = $trade_no;
+            $arr["pay_type"]      = $pay_type;
+            $arr["pay_money"]     = $pay_money;
+            $arr["pay_time"]      = $pay_time;
+            $id                   = $amercementPayModel->saveAmercementPay($arr);
+            return ["code" => '200', ["id" => $id]];
+        }
 
 
-        $arr["amercement_id"] = $amercement_id;
-        $arr["trade_no"]      = $trade_no;
-        $arr["pay_type"]      = $pay_type;
-        $arr["status"]        = $status;
-        $arr["remark"]        = $remark;
-        $arr["pay_money"]     = $pay_money;
-        $arr["pay_time"]      = $pay_time;
-
     }
 
 

application/model/OAmercementModel.php

@@ -30,7 +30,6 @@ class OAmercementModel extends Model
         $result = $this->db_
             ->field($field)
             ->where($params)
-            ->order('id desc')
             ->find();
         return $result;
     }

application/model/OAmercementPayModel.php

+<?php
+
+namespace app\model;
+
+use think\Db;
+use think\Model;
+
+class OAmercementPayModel extends Model
+{
+    // 设置当前模型对应的完整数据表名称
+    protected $table = 'o_amercement_pay';
+    private $db_;
+
+    public function __construct($data = [])
+    {
+        parent::__construct($data);
+        $this->db_ = Db::name($this->table);
+    }
+
+    public function saveAmercementPay($data) {
+        $time = date("Y-m-d H:i:s", time());
+        $data['create_time'] = $time;
+        $data['update_time'] = $time;
+        $data['is_del'] = 0;
+        Db::startTrans();
+        try {
+            $id = $this->db_->insertGetId($data);
+            Db::commit();
+            return $id;
+        } catch (\Exception $e) {
+            Db::rollback();
+            return 0;
+        }
+    }
+
+    public function getAmercementPayInfo($params, $field)
+    {
+        $result = $this->db_
+            ->field($field)
+            ->where($params)
+            ->find();
+        return $result;
+    }
+
+    public function getAmercementList($params, $field, $page_no, $page_size)
+    {
+        $result = $this->db_
+            ->field($field)
+            ->where($params)
+            ->limit($page_size)
+            ->page($page_no)
+            ->order('id desc')
+            ->select();
+        return $result;
+    }
+
+    public function getAmercementTotal($params, $field)
+    {
+        $result = $this->db_
+            ->field($field)
+            ->where($params)
+            ->count();
+        return $result;
+    }
+
+    public function getAmercementListExcel($params, $field)
+    {
+        $result = $this->db_
+            ->field($field)
+            ->where($params)
+            ->order('id desc')
+            ->select();
+        return $result;
+    }
+
+
+    /**更新数据
+     * @param $params
+     * @return int|string
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function updateAmercementData($params)
+    {
+        $return  = $this->db_->update($params);
+        // big_log($this->getLastSql());
+        return $return;
+    }
+
+}

application/route.php

@@ -1102,6 +1102,7 @@ Route::group('broker', [
     'addAmercement'     => ['api_broker/Amercement/addAmercement', ['method' => 'GET|POST']],
     'getAmercementType' => ['api_broker/Amercement/getAmercementType', ['method' => 'GET|POST']],
     'getAmercementList' => ['api_broker/Amercement/getAmercementList', ['method' => 'GET|POST']],
+    'savePayAmercement' => ['api_broker/Amercement/savePayAmercement', ['method' => 'GET|POST']],
 
 ]);