去掉订金

app-mall/controllers/OrderController.php

@@ -8,6 +8,7 @@ use bizHd\wx\classes\WxOpenClass;
 use bizMall\custom\classes\CustomClass;
 use bizMall\goods\classes\GoodsClass;
 use bizMall\order\classes\OrderClass;
+use bizMall\order\classes\OrderForwardClass;
 use bizMall\order\classes\OrderGoodsClass;
 use bizMall\order\classes\OrderItemClass;
 use bizMall\order\services\OrderService;
@@ -788,6 +789,13 @@ class OrderController extends BaseController
     {
         $id = Yii::$app->request->get('id', 0);
         $detail = OrderClass::getOrderById($id);
+
+        $shOrderMap = [];
+        if ($detail['hasForward'] == 1) {
+            $shOrderMap = OrderForwardClass::getAllByCondition(['orderId' => $id], null, '*');
+        }
+        $detail['shOrderMap'] = $shOrderMap;
+
         util::success($detail);
     }
 

biz-hd/order/classes/OrderClass.php

@@ -778,7 +778,7 @@ class OrderClass extends BaseClass
         if (empty($order)) {
             return false;
         }
-        if ($must == false) {
+        if (!$must) {
             if ($order->needPrint != dict::getDict('needPrint', 'need')) {
                 return false;
             }
@@ -786,6 +786,10 @@ class OrderClass extends BaseClass
                 return false;
             }
         }
+        if ($order->forward == 1) {
+            //售后付款单暂时不能打印
+            return false;
+        }
 
         $shopId = $order->shopId ?? 0;
         $ext = ShopExtClass::getByCondition(['shopId' => $shopId]);

biz-hd/order/services/OrderService.php

@@ -298,17 +298,6 @@ class OrderService extends BaseService
             $data['remainDebtPrice'] = $modifyPrice;
             $data['debt'] = 1;
             $payWay = dict::getDict('payWay', 'debtPay');
-        } else {
-            //如果有订金
-            if (isset($data['dj']) && $data['dj'] > 0) {
-                if ($data['dj'] >= $modifyPrice) {
-                    util::fail('订金要小于总金额');
-                }
-                $currentDebt = bcsub($modifyPrice, $data['dj'], 2);
-                $data['debtPrice'] = $currentDebt;
-                $data['remainDebtPrice'] = $currentDebt;
-                $data['debt'] = 1;
-            }
         }
 
         //hasPay balance 转化成余额支付方式

biz-mall/order/classes/OrderForwardClass.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace bizMall\order\classes;
+
+use Yii;
+use bizMall\base\classes\BaseClass;
+
+class OrderForwardClass extends BaseClass
+{
+
+    public static $baseFile = '\bizMall\order\models\OrderForward';
+
+}

biz-mall/order/models/OrderForward.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace bizMall\order\models;
+
+use bizMall\base\models\Base;
+
+class OrderForward extends Base
+{
+	public static function tableName()
+	{
+		return 'xhOrderForward';
+	}
+}

biz-mall/order/services/OrderForwardService.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace bizMall\order\services;
+
+use bizMall\base\services\BaseService;
+use common\components\util;
+use Yii;
+use linslin\yii2\curl;
+
+class OrderForwardService extends BaseService
+{
+
+    public static $baseFile = '\bizMall\order\classes\OrderForwardClass';
+
+}