app 记欠款和已付款的走付款后流程

biz-ghs/order/classes/OrderClass.php

@@ -732,9 +732,6 @@ class OrderClass extends BaseClass
         $content .= '订单编号：' . $respond['orderSn'] . '<BR>';
         $content .= '门店名称：' . $currentName . '<BR>';
         $content .= "<BR>";
-        //$content .= "<C>扫码采购</C><BR>";
-        //$url = Yii::$app->params['ghsDomain'] . '/#/pagesPurchase/ghsProduct';
-        //$content .= '<QR>' . $url . '</QR>';//把二维码字符串用标签套上即可自动生成二维码
 
         $ext = ShopExtClass::getByCondition(['shopId' => $shopId]);
         $printSn = $ext['printSn'] ?? '';

biz-ghs/order/services/OrderService.php

@@ -115,7 +115,8 @@ class OrderService extends BaseService
         $returnOrder->purchaseId = $purchaseId;
         $returnOrder->save();
 
-        if ($hasPay == 1) {
+        //记欠款和已付款的走付款后流程
+        if (in_array($hasPay, [dict::getDict('hasPay', 'payed'), dict::getDict('hasPay', 'debt')])) {
             PurchaseService::payAfter($purchase, $payWay);
             self::payAfter($returnOrder, $payWay);
         }
@@ -687,6 +688,9 @@ class OrderService extends BaseService
 
         //订单生成时唤起在线打印
         if (isset($order->needPrint) && $order->needPrint == dict::getDict('needPrint', 'need')) {
+            echo 'ok';
+            print_r($order);
+            die;
             OrderClass::onlinePrint($order);
             $order->printNum += 1;
             $order->save();