app 支付方式

app-ghs/controllers/OrderController.php

@@ -69,6 +69,14 @@ class OrderController extends BaseController
         $totalAmount = $totalFee;
         $body = "到店订单";
 
+        //标记为扫码支付 和 自取订单
+        $order->codePay = 2;
+        $order->sendType = OrderClass::SEND_TYPE_NO;
+        $order->save();
+        $cg->getType = PurchaseClass::GET_TYPE_SELF_GET;
+        $cg->codePay = 2;
+        $cg->save();
+
         $wxPayWay = dict::getDict('payWay', 'wxPay');
         $aliPayWay = dict::getDict('payWay', 'alipay');
         $payWay = Yii::$app->request->get('payWay', $wxPayWay);
@@ -351,7 +359,7 @@ class OrderController extends BaseController
                 PurchaseService::codePay($payWay, $orderSn, $transactionId, $openId, $aliUserId);
                 util::success(['returnStatus' => 'SUCCESS']);
             }
-            util::complete('');
+            util::success(['returnStatus' => 'FAILURE']);
 
         } else {
 
@@ -412,7 +420,9 @@ class OrderController extends BaseController
                 $aliUserId = $respond->buyer_user_id ?? '';
                 $transactionId = $respond->trade_no ?? '';
                 PurchaseService::codePay($aliPayWay, $orderSn, $transactionId, $openId, $aliUserId);
+                util::success(['returnStatus' => 'SUCCESS']);
             }
+            util::success(['returnStatus' => 'FAILURE']);
         }
     }
 

biz-hd/purchase/services/PurchaseService.php

@@ -304,13 +304,14 @@ class PurchaseService extends BaseService
         }
         OrderService::payAfter($order, $payWay, true);
 
-        //由供应商帮零售发起的采购，零售付款了则直接完成。实际场景是：供应商送货给客户让客户付款。所以直接完成即可。
-        if ($info->cgStyle == dict::getDict('cgStyle', 'ghs')) {
-            $order = OrderClass::getLockById($saleId);
-            OrderClass::selfSend($order);
-            $order = OrderClass::getLockById($saleId);
-            OrderService::reach($order);
-        }
+        //由供应商帮零售发起的采购，零售付款了则直接完成。实际场景是：供应商送货给客户让客户付款。所以直接完成即可。 ssh 20220103之前
+        //现在默认都没有配送流程了 ssh 20220103
+//        if ($info->cgStyle == dict::getDict('cgStyle', 'ghs')) {
+//            $order = OrderClass::getLockById($saleId);
+//            OrderClass::selfSend($order);
+//            $order = OrderClass::getLockById($saleId);
+//            OrderService::reach($order);
+//        }
     }
 
     //第三方支付、余额支付和欠款支付后调用的流程 shish 2021.4.27