Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into m--tmp

app/common/controller/InternalApiController.php

@@ -99,6 +99,7 @@ class InternalApiController extends BaseLikeAdminController
             if($order->pay_status == PayEnum::ISPAID) {
                 return $this->success('内部支付已完成', [], 0, 1);
             }
+            if(!empty($params['pay_way']??'')) $params['extra']['pay_way'] = $params['pay_way'];
             $payNotifyLogic = PayNotifyLogic::handle('goods', $params['sn'], $params['extra']??[]);
             if($payNotifyLogic === true){
                 return $this->success('内部支付完成', [], 0, 1);

app/common/logic/PayNotifyLogic.php

@@ -105,7 +105,7 @@ class PayNotifyLogic extends BaseLogic
             $order->pay_status = PayEnum::ISPAID;
             $order->pay_time = time();
             $order->paid_amount = $order->order_amount;
-
+            if(empty($extra['transaction_id']??'') && !empty($extra['pay_way']??'')) $order->pay_way = $extra['pay_way'];
             //判断是否是一口价预支付订单，支付成功后生成尾款订单
             $order_goods = OrderGoods::where('sn',$order->sn)->findOrEmpty();
             if(!$order_goods->isEmpty() and $order_goods->goods_payment_type == 3 and bcsub($order_goods->base_service_fee,$order_goods->service_fee,2)>=0){

app/common/logic/ThirdOrderLogic.php

@@ -319,7 +319,7 @@ class ThirdOrderLogic extends BaseLogic
                 'pay_status' => PayEnum::ISPAID,
                 'coupon_id'=>0,
                 'coupon_price'=>0,
-                'pay_way' => 3,
+                'pay_way' => 4,
                 'order_total' => $message['amount'],
                 'order_amount' => $message['amount'],
                 'paid_amount'=>$message['amount']