From d88aeb6621f769449e51811c7ede6d8216341635 Mon Sep 17 00:00:00 2001 From: qinzexin <“731344816@qq.com”> Date: Thu, 7 Aug 2025 17:49:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E5=8D=A1=E6=8B=89=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BC=98=E5=8C=96=EF=BC=8C=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8B=89=E5=8D=A1=E6=8B=89=E6=94=AF=E4=BB=98?= =?UTF-8?q?=EF=BC=88=E8=BF=9B=E8=A1=8C=E4=B8=AD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Demo.php | 19 +++++++++--------- .../api/controller/school/NewActivity.php | 6 +++--- .../common/model/school/activity/Activity.php | 2 +- .../model/school/activity/order/Order.php | 2 ++ extend/bw/lakala/LakalaService.php | 20 ++++++++++++++++++- 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/application/api/controller/Demo.php b/application/api/controller/Demo.php index 5259432..cd5992f 100644 --- a/application/api/controller/Demo.php +++ b/application/api/controller/Demo.php @@ -76,10 +76,11 @@ class Demo extends Api // $request->setPnrInsIdCd(''); // 微信主扫场景 - 账户端业务信息 - $acc_busi_fields = new \Lakala\OpenAPISDK\V3\Model\TradePreorderWechaAccBusiFields(); + $acc_busi_fields = $lakala->getTradePreorderWechaAccBusiFields('ohjUL7XWERU9rDfeNdvbxxil8jZY'); + // $acc_busi_fields->setTimeoutExpress(''); - $acc_busi_fields->setSubAppid('wxd7e2deffbaa22254'); - $acc_busi_fields->setUserId('ohjUL7XWERU9rDfeNdvbxxil8jZY'); +// $acc_busi_fields->setSubAppid('wxd7e2deffbaa22254'); +// $acc_busi_fields->setUserId('ohjUL7XWERU9rDfeNdvbxxil8jZY'); // $acc_busi_fields->setDetail(''); // $acc_busi_fields->setGoodsTag(''); // $acc_busi_fields->setAttach(''); @@ -92,12 +93,12 @@ class Demo extends Api // $detail->setCostPrice('1.00'); // $detail->setReceiptId(''); - $goods_detail = new \Lakala\OpenAPISDK\V3\Model\TradePreorderWechaGoodsDetail; - $goods_detail->setGoodsId('3452234'); -// $goods_detail->setWxpayGoodsId(''); -// $goods_detail->setGoodsName('测试商品1'); - $goods_detail->setQuantity(1.0); - $goods_detail->setPrice(1.0); +// $goods_detail = new \Lakala\OpenAPISDK\V3\Model\TradePreorderWechaGoodsDetail; +// $goods_detail->setGoodsId('3452234'); +//// $goods_detail->setWxpayGoodsId(''); +//// $goods_detail->setGoodsName('测试商品1'); +// $goods_detail->setQuantity(1.0); +// $goods_detail->setPrice(1.0); // $detail->setGoodsDetail([$goods_detail]); // diff --git a/application/api/controller/school/NewActivity.php b/application/api/controller/school/NewActivity.php index c86a3e1..32b9adf 100644 --- a/application/api/controller/school/NewActivity.php +++ b/application/api/controller/school/NewActivity.php @@ -204,7 +204,7 @@ class NewActivity extends Base try { $res = $this->model->detail($id,$user_id); - file_put_contents('activity'.date('Y_m_d').'.log',date('Y-m-d H:i:s')." ".json_encode($res).PHP_EOL,FILE_APPEND); +// file_put_contents('activity'.date('Y_m_d').'.log',date('Y-m-d H:i:s')." ".json_encode($res).PHP_EOL,FILE_APPEND); } catch (\Exception $e){ // Log::log($e->getMessage()); @@ -274,7 +274,7 @@ class NewActivity extends Base public function add(){ $this->transactionCheck(); - file_put_contents('activity'.date('Y_m_d').'.log',date('Y-m-d H:i:s')." ".json_encode($this->request->post()).PHP_EOL,FILE_APPEND); +// file_put_contents('activity'.date('Y_m_d').'.log',date('Y-m-d H:i:s')." ".json_encode($this->request->post()).PHP_EOL,FILE_APPEND); //敏感词过滤 @@ -361,7 +361,7 @@ class NewActivity extends Base public function edit($ids = null){ if(!$ids) $ids = $this->request->post('ids/d', 0); - file_put_contents('activity'.date('Y_m_d').'.log',date('Y-m-d H:i:s')." ".json_encode($this->request->post()).PHP_EOL,FILE_APPEND); +// file_put_contents('activity'.date('Y_m_d').'.log',date('Y-m-d H:i:s')." ".json_encode($this->request->post()).PHP_EOL,FILE_APPEND); $this->transactionCheck(); diff --git a/application/common/model/school/activity/Activity.php b/application/common/model/school/activity/Activity.php index 676e029..973175a 100644 --- a/application/common/model/school/activity/Activity.php +++ b/application/common/model/school/activity/Activity.php @@ -1249,7 +1249,7 @@ class Activity extends BaseModel } } - + $self["activity_pay_process"] = config("site.activity_pay_process"); $self["return_50"] = $return_50; $self["last_time"] = $self["after_sales_time"] ?: $self["end_time"] + config("site.activity_end_sales"); diff --git a/application/common/model/school/activity/order/Order.php b/application/common/model/school/activity/order/Order.php index f8456a8..024386e 100644 --- a/application/common/model/school/activity/order/Order.php +++ b/application/common/model/school/activity/order/Order.php @@ -545,6 +545,8 @@ class Order extends BaseModel $data['refund_desc'] = (new Activity)->refund_desc(0,$data["id"]); + $data["activity_pay_process"] = config("site.activity_pay_process"); + //开票信息 $data->invoiceaplpy; diff --git a/extend/bw/lakala/LakalaService.php b/extend/bw/lakala/LakalaService.php index fa3536b..b19f97c 100644 --- a/extend/bw/lakala/LakalaService.php +++ b/extend/bw/lakala/LakalaService.php @@ -19,7 +19,7 @@ class LakalaService private $host_test = 'https://test.wsmsd.cn/sit'; - + private $v3_acc_busi_fields = null; public function getClientIp() @@ -53,6 +53,8 @@ class LakalaService $this->plantform_data["lakala_apply_name"] = $site["lakala_apply_name"]; + $this->plantform_data["wx_miniapp_id"] = config("site.wx_miniapp_id"); + if(config("site.lakala_test_switch")){ $this->plantform_data["lakala_partner_id"] = $site["test_lakala_partner_id"]; @@ -119,4 +121,20 @@ class LakalaService return $api; } + public function setTradePreorderWechaAccBusiFields($open_id=""){ + $this->v3_acc_busi_fields = new \Lakala\OpenAPISDK\V3\Model\TradePreorderWechaAccBusiFields(); +// $acc_busi_fields->setTimeoutExpress(''); + + + $this->v3_acc_busi_fields->setSubAppid($this->plantform_data["wx_miniapp_id"]); + if($open_id)$this->v3_acc_busi_fields->setUserId($open_id); + return $this; + } + public function getTradePreorderWechaAccBusiFields($open_id=""){ + $this->setTradePreorderWechaAccBusiFields($open_id); + return $this->v3_acc_busi_fields; + } + + + } \ No newline at end of file