update

application/common/server/cosserver.php

@@ -17,10 +17,13 @@ class cosserver
              * SecretId: AKIDra9VetxqUwBCyRjqlU1LQIzVxGRQDmkX
              * SecretKey: gDWjjXAj7IPL8nlcHl4C8qOjsoZCsNdh
              */
-            'secretId' => 'AKID2uVrwjGXWEfpjMjqhJejY6ML2TdV6SXL',
-            'secretKey' => 'Yqrb3EH4ZnlSs2xaw1qOffNoyrSnrfCU',
+            //'secretId' => 'AKID2uVrwjGXWEfpjMjqhJejY6ML2TdV6SXL',
+            //'secretKey' => 'Yqrb3EH4ZnlSs2xaw1qOffNoyrSnrfCU',
             //use ap-beijing
-            'region' => "ap-nanjing",
+            //'region' => "ap-nanjing",
+            'secretId' => 'AKIDra9VetxqUwBCyRjqlU1LQIzVxGRQDmkX',
+            'secretKey' => 'gDWjjXAj7IPL8nlcHl4C8qOjsoZCsNdh',
+            'region' => "ap-beijing",
         ];
         return $data;
     }

application/index/controller/Fileoper.php

@@ -108,7 +108,13 @@ class Fileoper extends Controller
             $this->error($file->getError());
         }
     }
-
+    /**
+     * 保存图片到cos上
+     *
+     * @return void
+     * @author wj
+     * @date 2022-08-05
+     */
     public function savephoto()
     {
         Log::info($_FILES);
@@ -129,7 +135,8 @@ class Fileoper extends Controller
         $dir = "workercard/" . date('Ymd') . "/";
         $filename = uniqid() . '.' . $ext;
         //use ntyu-1313172967
-        $bucket = "backup-1306866048";
+        //$bucket = "backup-1306866048";
+        $bucket = "ntyu-1313172967";
         $s_cos = new cosserver();
         $result = $s_cos->uploadfiles($path, $dir, $filename, $bucket);
         if (1 != $result['status']) {

application/index/logic/paylogic.php

@@ -109,7 +109,20 @@ class paylogic extends baselogic
                 throw new \Exception($msg);
             }
             if (3 == $orderInfo['orderstatus'] && 1 == $orderInfo['ispay']) {
-                Db::rollback();
+                if (empty($orderInfo['transaction_id'])) {
+                    $updateData = ['is_reat_back' => 1];
+                    if (isset($arr['transaction_id']) && !empty($arr['transaction_id'])) {
+                        $updateData['transaction_id'] = $arr['transaction_id'];
+                    }
+                    $row = $l_p->updateinfobyid($orderInfo['id'], $updateData);
+                    if (empty($row)) {
+                        $msg = "orderNo:[" . $outorderno . "]修改失败";
+                        throw new \Exception($msg);
+                    }
+                    Db::commit();
+                } else {
+                    Db::rollback();
+                }
                 $msg = "orderNo:[" . $outorderno . "]" . "已缴费";
                 return backarr(1, $msg);
             }
@@ -120,6 +133,7 @@ class paylogic extends baselogic
                 'orderstatus' => $orderstatus,
                 'ispay' => $ispay,
                 'is_reat_back' => 1,
+                'paytime' => date('Y-m-d H:i:s'),
             ];
             if (isset($arr['transaction_id']) && !empty($arr['transaction_id'])) {
                 $updateData['transaction_id'] = $arr['transaction_id'];
@@ -138,6 +152,11 @@ class paylogic extends baselogic
                     }
                     break;
             }
+            if (3 == $orderInfo['orderstatus'] && 1 == $orderInfo['ispay']) {
+                Db::rollback();
+                $msg = "orderNo:[" . $outorderno . "]" . "已缴费";
+                return backarr(1, $msg);
+            }
             Db::commit();
             Log::info("commit");
             return backarr(1, "处理完成", ['id' => $orderInfo['id']]);