更新

app/Admin/Forms/TransferBillsPlatForm.php

@@ -11,6 +11,7 @@
 use Dcat\Admin\Widgets\Form;
 use Dcat\Admin\Contracts\LazyRenderable;
 use Dcat\Admin\Traits\LazyWidget;
+use App\Models\HfPayconfirm;
 use Exception;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Request;
@@ -73,6 +74,8 @@ public function handle(array $input)
                 $recordObj->um_id = 0;
                 $recordObj->sh_type = 0;
                 $recordObj->save();
+                //写入支付确认信息
+                (new HfPayconfirm())->add($payment_params, $result['fee_amt']);
             }
 
             DB::commit();

app/Http/Controllers/Api/HfOrderController.php

@@ -11,6 +11,7 @@
 use App\Models\OrderInfo as OrderInfoModel;
 use App\Models\MerchantGoodSku;
 use App\Models\PaymentRecord;
+use App\Models\HfPayconfirm;
 use Dcat\Admin\Grid\Displayers\Orderable;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
@@ -64,6 +65,9 @@ public function paymentConfirm(Request $request)
                 $orderObj->freeze_stat = 'UNFREEZE';
                 if ($orderObj->save()) {
                     $result = (new Adapay())->createPaymentConfirm($payment_params);
+                    if ($result['status'] == 'succeeded') {
+                        (new HfPayconfirm())->add($payment_params, $result['fee_amt']);
+                    }
                 }
                 DB::commit();
             } catch (\Exception $e) {

app/Http/Controllers/Api/OrderController.php

@@ -140,7 +140,7 @@ public function CreateBuyOrder(Request $request)
             $orderObj->delivery_type = $delivery_type;
             $orderObj->merchant_id = $merchant_id;
             $orderObj->store_id = $store_id;
-            //$orderObj->is_commission = ($spuid || $merchant_id) ? 1 : 0;
+            $orderObj->is_commission = ($spuid || $merchant_id) ? 1 : 0;
             if ($orderObj->save()) {
                 $order_id = $orderObj->id;
                 foreach ($orderGoods as $key => $item) {
@@ -250,7 +250,7 @@ public function CreateOrder(Request $request)
             $orderObj->delivery_type = $delivery_type;
             $orderObj->merchant_id = $merchant_id;
             $orderObj->store_id = $store_id;
-            //$orderObj->is_commission = ($spuid || $merchant_id) ? 1 : 0;
+            $orderObj->is_commission = ($spuid || $merchant_id) ? 1 : 0;
 
             if ($orderObj->save()) {
                 $order_id = $orderObj->id;
@@ -503,7 +503,7 @@ public function scanCodeVerifi(Request $request)
         //核销员所属门店
         $hx_store = $useObj->store_id ?? 0;
         if ($verObj->role_id != 2 || $orderObj->store_id != $hx_store) {
-            return $this->JsonResponse('', '核销码不匹配门店', 500);
+            //return $this->JsonResponse('', '核销码不匹配门店', 500);
         }
 
         Log::add('核销操作', [$orderObj->verification_at]);
@@ -583,7 +583,7 @@ public function scanCodeDetail(Request $request)
         //核销员所属门店
         $hx_store = $useObj->store_id ?? 0;
         if ($useObj->role_id != 2 || $orderObj->store_id != $hx_store) {
-            return $this->JsonResponse('', '核销码不匹配门店', 500);
+            //return $this->JsonResponse('', '核销码不匹配门店', 500);
         }
         $order_id = $orderObj->id;
         //商品信息

app/Models/Adapay.php

@@ -191,8 +191,9 @@ public function payNotify($params = [])
                     Log::add('支付确认成功', $payment_confirm->result);
                     $result = $payment_confirm->result;
                     if ($result['status'] == 'succeeded') {
-                        //DB::table('li_order_info')->where('order_sn', $order_no)->update(['div_status' => 1]);
                         Log::add('分账成功', ['order_sn' => $order_no]);
+                        //写入支付确认信息
+                        (new HfPayconfirm())->add($payment_params, $result['fee_amt']);
                     }
                 }
 

app/Models/HfPayconfirm.php

+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Model;
+
+class HfPayconfirm extends Model
+{
+    use HasDateTimeFormatter;
+    use SoftDeletes;
+    protected $table = 'hf_payconfirm';
+
+    public function add($params, $fee_amt)
+    {
+        $confirmObj = new self();
+        $confirmObj->payment_id = $params['payment_id'];
+        $confirmObj->order_no = $params['order_no'];
+        $confirmObj->confirm_amt = $params['confirm_amt'];
+        $confirmObj->fee_amt = $fee_amt;
+        $confirmObj->save();
+        return true;
+    }
+}

routes/api.php

@@ -27,6 +27,18 @@
 
     Route::get('test-login', 'LoginController@testLogin');  //测试登录
 
+    Route::get('city-code', 'BaseController@addCityCode');  //导入城市编码(汇付)
+
+    Route::post('hf-company-member-notify', 'HfCompanyMemberController@notify');  //汇付 创建企业用户异步通知
+
+    Route::get('hf-bank-code', 'HfSettleAccountController@getBankCode');  //汇付 银行代码
+
+    Route::get('hf-provarea-code', 'HfProvAreaCodeController@getList');  //汇付 省市编码
+
+    Route::get('hf-query-list', 'HfOrderController@autoQueryList');  //汇付 定时查询支付对象列表
+
+    Route::post('hf-payment-confirm', 'HfOrderController@paymentConfirm');  //汇付 手动创建支付确认
+
     //Route::post('mobile-login', 'LoginController@mobilelogin');  //验证码登录
 
     Route::post('account-login', 'StoreAdminUsersController@login');  //账号密码登录
@@ -43,7 +55,7 @@
 
     Route::get('get-cate-list', 'CategoryController@getList');  //一级分类列表
 
-    Route::post('article-list', 'ArticleController@getList');  //文章列表
+    Route::get('article-list', 'ArticleController@getList');  //文章列表
 
     Route::get('article-detail', 'ArticleController@getDetail');  //文章详情
     // Route::get('get-seccate-list', 'CategoryController@getSecList');  //二级分类列表
@@ -72,6 +84,8 @@
 
     Route::any('pay-notify', 'OrderController@payNotify');  //付款回调
 
+    Route::any('refund-notify', 'HfOrderController@refundNotify');  //退款回调
+
     Route::get('send/config/update', 'SystemController@update');
 
     Route::get('auto-to-commentstatus', 'SystemController@autoChangeReceiveStatus');  //定时任务--待领取状态下七天未领取，自动到待评价状态
@@ -160,6 +174,8 @@
 
         Route::post('add-comment', 'CommentController@add');  //去评价
 
+        /*------------------------------商户端------------------------------------*/
+
         Route::get('commission-list', 'OrderDivideRecordController@getList');  //直推、间推明细
 
         Route::get('income-list', 'IncomeController@getList');  //用户提现明细
@@ -168,10 +184,27 @@
 
         Route::get('my-member', 'MerchantController@getUserList');  //商户端-我的用户
 
+        Route::post('my-member-orderlist', 'MerchantController@getOrderList');  //商户端-我的用户(查看订单)
+
         Route::post('scan-code-detail', 'OrderController@scanCodeDetail');  //扫码核销展示详情
 
         Route::post('scan-code-verifi', 'OrderController@scanCodeVerifi');  //扫码核销确认
 
         Route::get('merchant-order-collect', 'OrderController@orderCollect');  //商户端首页统计
+
+
+        /*------------------------------汇付天下------------------------------------*/
+        Route::post('hf-settle-account-delete', 'HfSettleAccountController@deleteAccount');  //汇付 删除结算账户
+
+        Route::post('hf-settle-account-member', 'HfSettleAccountController@createMemberAccount');  //汇付 创建普通用户结算账户
+
+        Route::post('hf-settle-account-company', 'HfSettleAccountController@createCompanyAccount');  //汇付 创建企业用户结算账户
+
+        Route::get('hf-mycard', 'HfSettleAccountController@myCard');  //查询已绑定结算账户
+
+        Route::post('hf-settle-account-query', 'HfSettleAccountController@queryAccount');  //汇付 查询用户结算账户
+
+        Route::get('hf-account-balance', 'HfSettleAccountController@queryBalance');  //汇付 查询账户余额
+
     });
 });