Merge branch 'minus' into dev

app-ghs/controllers/TestController.php

@@ -370,8 +370,9 @@ class TestController extends BaseController
             //['name' => '九江伊朵鲜花批发', 'merchantNo' => '82242405992002A', 'wx' => [774681090, 774681246], 'zfb' => '2088470298005142'],
             //['name' => '济南伟伟鲜花批发', 'merchantNo' => '8224510599200EL', 'wx' => [789073494, 789074603], 'zfb' => '2088670850497224'],
             //['name' => '赣州紫荆鲜花批发', 'merchantNo' => '82242805992004J', 'wx' => [790052021, 790051859], 'zfb' => '2088670969143838'],
-            ['name' => '沈阳市云花鲜花批发', 'merchantNo' => '8222210599200BT', 'wx' => [796180053, 796180053], 'zfb' => '2088770820458908'],
-            ['name' => '沈阳市云花鲜花批发2', 'merchantNo' => '8222210599200BS', 'wx' => [796157674, 796157674], 'zfb' => '2088770815918545'],
+            ['name' => '沈阳市云花鲜花批发-专业化扫码', 'merchantNo' => '8222210599200BT', 'wx' => [796180053, 796180053], 'zfb' => '2088770820458908'],
+            ['name' => '沈阳市云花鲜花批发-聚合收银台', 'merchantNo' => '8222210599200BS', 'wx' => [796157674, 796157674], 'zfb' => '2088770815918545'],
+            ['name' => '东莞惠雅鲜花（莞城店）-聚合收银台', 'merchantNo' => '8226020599200GJ', 'wx' => [796953190], 'zfb' => '2088770940104912'],
             //['name' => '日照温暖小筑', 'merchantNo' => '82247705992002F', 'wx' => [781363841, 781362087], 'zfb' => '2088570557754874'],
             //['name' => '昆明建芳基地鲜花直发', 'merchantNo' => '8223970599200AH', 'wx' => [775915046, 775915051], 'zfb' => '2088470558755358'],
             //['name' => '日照月下鲜花批发', 'merchantNo' => '82247705992002D', 'wx' => [759404451, 759404055], 'zfb' => '2088170264295192'],

app-hd/controllers/OrderController.php

@@ -952,13 +952,19 @@ class OrderController extends BaseController
         if ($detail['forward'] == 1) {
             //当前单如果已经是售后付款单，则取出其对应的原单
             $map = OrderForwardClass::getByCondition(['shOrderId' => $id], true);
-            if(!empty($map)){
+            if (!empty($map)) {
                 $originOrderId = $map->orderId ?? 0;
                 $forwardMap['orderId'] = $originOrderId;
             }
         }
         $detail['forwardMap'] = $forwardMap;
 
+        $shOrderMap = [];
+        if ($detail['hasForward'] == 1) {
+            $shOrderMap = OrderForwardClass::getAllByCondition(['orderId' => $id], null, '*');
+        }
+        $detail['shOrderMap'] = $shOrderMap;
+
         $main = $this->main;
         //是否走售后付款单模式判断 ssh
         $ret = OrderClass::ifShPay($detail, $main, 0);

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

@@ -185,7 +185,11 @@ class OrderClass extends BaseClass
             //建立关系
             $originOrder->hasForward = 1;
             $originOrder->save();
-            $map = ['orderId' => $originOrder->id, 'shOrderId' => $order->id];
+            $orderId = $originOrder->id ?? 0;
+            $orderSn = $originOrder->orderSn ?? '';
+            $shOrderId = $order->id ?? 0;
+            $shOrderSn = $order->orderSn ?? '';
+            $map = ['orderId' => $orderId, 'orderSn' => $orderSn, 'shOrderId' => $shOrderId, 'shOrderSn' => $shOrderSn];
             OrderForwardClass::add($map, true);
         }
         return true;
@@ -774,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;
             }
@@ -782,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';
+
+}