合并分支 'Branch_liuzhen' 到 'master'

退款调试



查看合并请求 !164

@@ -154,6 +154,9 @@ class Store extends Backend
                             'updatetime' => $time
                             'updatetime' => $time
                         ];
                         ];
                         $refund_result = $this->refund($refund);
                         $refund_result = $this->refund($refund);
+                        if($refund_result['return_code'] != 'SUCCESS' || $refund_result['result_code'] != 'SUCCESS') {
+                            Db::rollback();
+                        }
                         Db::name('refund')->insert($refund);
                         Db::name('refund')->insert($refund);
                     }
                     }
                     Db::commit();
                     Db::commit();
@@ -168,7 +171,7 @@ class Store extends Backend
                     $this->error($e->getMessage());
                     $this->error($e->getMessage());
                 }
                 }
                 if ($result !== false && $result_admin !== false && $result_auth_group !== false) {
                 if ($result !== false && $result_admin !== false && $result_auth_group !== false) {
-                    $this->error('','',$refund_result);
+                    $this->error('','',[$refund,$refund_result]);
                 } else {
                 } else {
                     $this->error(__('No rows were updated'));
                     $this->error(__('No rows were updated'));
                 }
                 }