折扣

biz-ghs/order/services/OrderService.php

@@ -77,6 +77,8 @@ class OrderService extends BaseService
         $remark = $data['remark'] ?? '';
         $xj = $data['xj'] ?? '';
 
+        $discount = $returnOrder->discount ?? 1;
+
         $purchaseData = [
             'product' => $currentProduct,
             'sendTimeWant' => $sendTimeWant,
@@ -99,17 +101,15 @@ class OrderService extends BaseService
             'getType' => $getType,
             'remark' => $remark,
             'xj' => $xj,
+            'discount' => $discount
         ];
         if (isset($data['deadline']) && !empty($data['deadline'])) {
             $purchaseData['deadline'] = $data['deadline'];
         }
         if (isset($data['modifyPrice']) && is_numeric($data['modifyPrice'])) {
-            if (is_numeric($data['modifyPrice']) == false || $data['modifyPrice'] <= 0) {
-                util::fail('金额填错了哦');
-            }
             $purchaseData['modifyPrice'] = $data['modifyPrice'];
         }
-        $purchase = PurchaseClass::addPurchase($purchaseData,$ghs);
+        $purchase = PurchaseClass::addPurchase($purchaseData, $ghs);
         $purchaseId = $purchase->id ?? 0;
 
         $returnOrder->purchaseId = $purchaseId;

biz-hd/purchase/classes/PurchaseClass.php

@@ -166,6 +166,7 @@ class PurchaseClass extends BaseClass
                 $data['discountAmount'] = $discountAmount;
                 $actPrice = bcsub($prePrice, $discountAmount, 2);
                 $realPrice = $actPrice;
+                $data['discount'] = $ghs['giveDiscount'];
             }
 
             //验证优惠券

biz-hd/purchase/services/PurchaseService.php

@@ -31,7 +31,7 @@ class PurchaseService extends BaseService
     public static function createPurchase($data, $ghs)
     {
         //零售采购单
-        $respond = PurchaseClass::addPurchase($data,$ghs);
+        $respond = PurchaseClass::addPurchase($data, $ghs);
 
         //供应商销售单
         $ghsId = $data['ghsId'] ?? 0;
@@ -59,6 +59,7 @@ class PurchaseService extends BaseService
         $couponId = $data['couponId'] ?? 0;
         $discountType = $respond->discountType ?? dict::getDict('discountType', 'noDiscount');
         $discountAmount = $respond->discountAmount ?? 0;
+        $discount = $respond->discount ?? 0;
         $remark = $data['remark'] ?? '';
         $xj = $data['xj'] ?? '';
         $sendTimeWant = isset($data['sendTimeWant']) && !empty($data['sendTimeWant']) ? $data['sendTimeWant'] : date("Y-m-d");
@@ -89,6 +90,7 @@ class PurchaseService extends BaseService
             'couponId' => $couponId,
             'discountType' => $discountType,
             'discountAmount' => $discountAmount,
+            'discount' => $discount,
             'remark' => $remark,
             'xj' => $xj,
             'sendTimeWant' => $sendTimeWant,