转换

app-ghs/controllers/OrderController.php

@@ -139,6 +139,11 @@ class OrderController extends BaseController
             }
         }
 
+        //商家开非自取订单，默认订单是待收款的，debt字段为非欠款
+        if (isset($post['sendType']) && $post['sendType'] != OrderClass::SEND_TYPE_NO) {
+            $post['debt'] = OrderClass::DEBT_NO;
+        }
+
         $productJson = $post['product'] ?? '';
         if (empty($productJson)) {
             util::fail('请选择花材');

biz-ghs/order/classes/OrderClass.php

@@ -161,10 +161,6 @@ class OrderClass extends BaseClass
             $w = ProductClass::getWeight($val['productId'], $val['bigNum'], $val['smallNum']);
             $productId = $val['productId'];
             $weight = bcadd($w, $weight, 2);
-            //减库存
-            $cgStyle = $data['cgStyle'] ?? 1;
-
-            // $checkStock = $cgStyle == dict::getDict('cgStyle', 'hd') ? true : false;
             $checkStock = true;
             $stockInfo = ProductClass::decreaseStock($val['productId'], $val['bigNum'], $val['smallNum'], $checkStock);
             //记录库存流水

biz-ghs/order/services/OrderService.php

@@ -52,14 +52,13 @@ class OrderService extends BaseService
         $ghsFullAddress = $ghs['fullAddress'] ?? '';
         $payWay = $data['payWay'] ?? dict::getDict('payWay', 'wxPay');
 
-        //欠款状态跟踪
-        //xhGhsOrder debt 0未欠款 1欠款
+        //销售单欠款字段与采购单欠款字段转换
         $debt = $data['debt'] ?? 0;
         $purchaseDebt = $debt == 1 ? PurchaseClass::DEBT_YES : PurchaseClass::DEBT_NO;
         if ($debt == 1) {
             $payWay = dict::getDict('payWay', 'debtPay');
         }
-        //判断自取还是配送订单
+        //销售单的自取还是配送字段 与 采购单的转换
         $sendType = $data['sendType'] ?? OrderClass::SEND_TYPE_MYSELF;
         $getType = $sendType == OrderClass::SEND_TYPE_NO ? PurchaseClass::GET_TYPE_SELF_GET : PurchaseClass::GET_TYPE_SEND;