采购模块

app-hd/controllers/GhsProductController.php

@@ -14,15 +14,16 @@ use bizGhs\product\services\ProductService;
 use bizGhs\item\services\ItemService;
 use common\components\util;
 use Yii;
+
 class GhsProductController extends BaseController
 {
+
     //从零售端采购入库，查看供货商的某个门店的product
     public function actionIndex()
     {
         $get = Yii::$app->request->get();
         $shopId = $get['shopId']??0;
         $sjId = $get['sjId']??0;
-        $py = $get['py']??'';
         AdminClass::addRecentShop($shopId,$this->admin);
         //获取所有当前供应商的分类 （全部、常用）
         //根据分类组装分类下的花材信息
@@ -44,4 +45,5 @@ class GhsProductController extends BaseController
         util::success($data);
 
     }
+
 }

app-hd/controllers/PurchaseController.php

@@ -29,12 +29,11 @@ class PurchaseController extends BaseController
         $ghsSjId = $supplier['ghsSjId'] ?? 0;
         $post['ghsShopId'] = $ghsShopId;
         $post['ghsSjId'] = $ghsSjId;
-
         $post['shopId'] = $this->shopId;
         $product = $post['product'] ?? '';
         $productList = json_decode($product, true);
         //判断product数据是不是同个供货商的
-        //ProductClass::valid($productList, $ghsShopId);
+        ProductClass::valid($productList, $ghsShopId);
         $post['product'] = $productList;
         $respond = PurchaseClass::addPurchase($post);
         $orderSn = $respond['orderSn'] ?? '';

biz-ghs/order/classes/OrderClass.php

@@ -24,7 +24,6 @@ class OrderClass extends BaseClass
 
     public static $baseFile = '\bizGhs\order\models\Order';
 
-
     //已退款
     const ORDER_STATUS_REFUND = 6;
     //已取消
@@ -71,7 +70,7 @@ class OrderClass extends BaseClass
     const CLEAR_HAS_GATHERING = 2;
 
     //添加订单 ssh 2019.12.5
-    public static function addOrder($data, $shop)
+    public static function addOrder($data, $shop,$customOrder=false)
     {
         $sjId = $data['merchantId'] ?? 0;
         $shopId = $shop['id'] ?? 0;
@@ -115,23 +114,26 @@ class OrderClass extends BaseClass
         $sjAsset['unPayOrder']++;
         MerchantAssetClass::updateByCondition(['merchantId' => $sjId], ['totalOrder' => $sjAsset['totalOrder'], 'unPayOrder' => $sjAsset['unPayOrder']]);
 
-        $debt = 2;
-        if ($debt == 1) {
-            //欠款
-            self::payOk($return, 1, $shop);
-        } else {
-            //已收款
-            self::payOk($return, 2, $shop);
-        }
+        if($customOrder == false){
 
-        //扣库存 2021.2.23 linqh
-        foreach ($product as $key => $val) {
-            ProductClass::decreaseStock($val['productId'], $val['bigNum'], $val['smallNum']);
-        }
-        $data['sendType'] = 1;
-        //自取订单直接完成
-        if ($data['sendType'] == self::SEND_TYPE_NO) {
-            OrderClass::withoutSend($return);
+            //0正常订单 1欠款
+            $debt = $data['debt'] ?? 0;
+            if ($debt == 1) {
+                //欠款
+                self::payOk($return, 1, $shop);
+            } else {
+                //已收款
+                self::payOk($return, 2, $shop);
+            }
+
+            //扣库存 2021.2.23 linqh
+            foreach ($product as $key => $val) {
+                ProductClass::decreaseStock($val['productId'], $val['bigNum'], $val['smallNum']);
+            }
+            //自取订单直接完成
+            if (isset($data['sendType']) && $data['sendType'] == self::SEND_TYPE_NO) {
+                OrderClass::withoutSend($return);
+            }
         }
 
         return $return;

biz-hd/order/services/OrderSendService.php

@@ -78,8 +78,8 @@ class OrderSendService extends BaseService
 			util::fail('即将开通...');
 			
 			$side = $data['expressId'];
-			$sendTime = strtotime(date("Y-m-d") . ' ' . $data['sendTime']);
-			if ($sendTime < ($time + 20 * 60)) {
+			$sendTime = date("Y-m-d") . ' ' . $data['sendTime'];
+			if (strtotime($sendTime) < ($time + 20 * 60)) {
 				util::fail('请选择20分钟之后的时间');
 			}
 			$sendInfo = [
@@ -120,7 +120,6 @@ class OrderSendService extends BaseService
 	//送达 ssh 2019.12.17
 	public static function reach($order, $data)
 	{
-		$id = $order['id'];
 		$orderSn = $data['orderSn'];
 		$actionIdList = OrderSendClass::$actionId;
 		$reachId = $actionIdList['reach'];

biz-hd/purchase/classes/PurchaseClass.php

@@ -38,6 +38,8 @@ class PurchaseClass extends BaseClass
         $data['orderSn'] = $orderSn;
         $data['prePrice'] = 0.01;
         $data['actPrice'] = 0.01;
+        $data['sendTimeWant'] = date("Y-m-d").' '.$data['sendTime'];
+        unset($data['sendTime']);
         $respond = self::add($data);
         if (isset($data['product']) == false || empty($data['product'])) {
             util::fail('请选择花材');
@@ -51,6 +53,7 @@ class PurchaseClass extends BaseClass
         //供货商增加订单
         $ghsSjId = $data['ghsSjId'] ?? 0;
         $ghsShopId = $data['ghsShopId'] ?? 0;
+        $getType = $data['getType'];
         $orderData = [
             'prePrice' => 0.01,
             'actPrice' => 0.01,
@@ -58,9 +61,10 @@ class PurchaseClass extends BaseClass
             'smallNum' => 3,
             'product' => $productList,
             'merchantId' => $ghsSjId,
+            'sendType'=>$getType,
         ];
         $shop = ShopClass::getShopInfo($ghsShopId);
-        \bizGhs\order\classes\OrderClass::addOrder($orderData,$shop);
+        \bizGhs\order\classes\OrderClass::addOrder($orderData, $shop, true);
 
         return $respond;
     }

sql.sql

@@ -2073,3 +2073,14 @@ ALTER TABLE xhGhsProduct ADD classId INT NOT NULL DEFAULT 0 COMMENT '分类id' A
 ========linqh 2021-4-12
 ALTER TABLE `xhGhsProduct`
 ADD COLUMN `inTurn`  int(10) NOT NULL DEFAULT 100 COMMENT '排序' AFTER `smallUnitId`;
+
+====shish 2021-4-13
+ALTER TABLE xhPurchase DROP COLUMN `sendTime`;
+ALTER TABLE xhPurchase ADD `sendTime` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'  COMMENT '实际配送时间' AFTER `getType`;
+ALTER TABLE xhPurchase ADD `sendTimeWant` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'  COMMENT '客户要求的发货时间' AFTER `sendTime`;
+ALTER TABLE xhGhsOrder DROP COLUMN `sendTime`;
+ALTER TABLE xhGhsOrder ADD `sendTime` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'  COMMENT '实际配送时间' AFTER `expressId`;
+ALTER TABLE xhGhsOrder ADD `sendTimeWant` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'  COMMENT '客户要求的发货时间' AFTER `sendTime`;
+ALTER TABLE xhOrderExpress DROP COLUMN `sendTime`;
+ALTER TABLE xhOrderExpress ADD `sendTime` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'  COMMENT '实际配送时间' AFTER `tip`;
+ALTER TABLE xhOrderExpress ADD `sendTimeWant` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'  COMMENT '客户要求的发货时间' AFTER `sendTime`;