Merge branch 'order' into test

app/Libs/Pay/Palmpay.php

@@ -134,7 +134,7 @@ class Palmpay  implements PayMerchantInterface {
             'money' =>  bcmul($data['price'] ,100,0),
             'outRefundNo' => $data['refund_no'],
             'refundMoney' => bcmul($data['refund_price'],100,0) ,
-            "refundReason" => $data['remark'] ?? "",
+            "refundReason" => $data['remark'] ?? "用户要求退款",
         ];
         $data['sign'] = $this->makeRefundSign($data);
         $pay_url = "sdkServer/thirdpays/refund?".http_build_query($data);

modules/OrderRefund/Services/RefundOrderService.php

@@ -255,7 +255,7 @@ class RefundOrderService extends BaseServices
                 self::throwErrMsg($resut['msg']);
             }
             $param = [
-                'status' => 1,
+                'refund_status' => 1,
                 'pay_at' => get_date(),
                 'pay_op_user' => $option,
             ];