采购问题

app-ghs/controllers/ClearController.php

@@ -2,6 +2,7 @@
 
 namespace ghs\controllers;
 
+use biz\ghs\classes\GhsClass;
 use bizGhs\clear\classes\ClearClass;
 use bizGhs\clear\services\ClearService;
 use bizGhs\custom\classes\CustomClass;
@@ -16,10 +17,10 @@ class ClearController extends BaseController
     {
         $get = Yii::$app->request->get();
         $where['status'] = 2;
-        $customId = $get['customId'] ?? 0;
-        $custom = CustomClass::getById($customId, true);
-        CustomClass::valid($custom, $this->shopId);
-        $where['customId'] = $customId;
+        $ghsId = $get['ghsId'] ?? 0;
+        $ghs = GhsClass::getById($ghsId, true);
+        GhsClass::valid($ghs, $this->shopId);
+        $where['ghsId'] = $ghsId;
         $list = ClearService::getClearList($where);
         util::success($list);
     }
@@ -28,7 +29,7 @@ class ClearController extends BaseController
     public function actionGetFullInfo()
     {
         $id = Yii::$app->request->get('id','');
-        $respond = ClearClass::getSaleInfo($id);
+        $respond = ClearClass::getGhsCgInfo($id);
         util::success($respond);
     }
 

biz-ghs/cg/classes/CgClass.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace bizGhs\cg\classes;
+
+use bizGhs\base\classes\BaseClass;
+use common\components\util;
+use Yii;
+
+class CgClass extends BaseClass
+{
+
+    public static $baseFile = '\bizGhs\cg\models\Cg';
+
+}

biz-ghs/cg/models/Cg.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizGhs\cg\models;
+use bizGhs\base\models\Base;
+
+class Cg extends Base
+{
+
+    public static function tableName()
+    {
+        return 'xhGhsCgOrder';
+    }
+
+}

biz-ghs/cg/services/CgService.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace bizGhs\cg\services;
+
+use bizGhs\base\services\BaseService;
+use Yii;
+
+class CgService extends BaseService
+{
+
+    public static $baseFile = '\bizGhs\cg\classes\CgClass';
+
+}

biz-ghs/clear/classes/ClearClass.php

@@ -5,6 +5,7 @@ namespace bizGhs\clear\classes;
 use biz\ghs\classes\GhsClass;
 use biz\shop\classes\ShopClass;
 use bizGhs\base\classes\BaseClass;
+use bizGhs\cg\classes\CgClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\order\classes\OrderClass;
 use bizGhs\order\classes\PurchaseOrderClass;
@@ -147,21 +148,21 @@ class ClearClass extends BaseClass
     }
 
     //完整信息 shish 20210625
-    public static function getSaleInfo($id)
+    public static function getGhsCgInfo($id)
     {
         $info = self::getById($id);
         if (empty($info)) {
             return $info;
         }
-        $saleIds = $info['saleIds'] ?? [];
-        $saleArr = explode(',', $saleIds);
-        $saleList = OrderClass::getAllByCondition(['id' => ['in', $saleArr]], null, 'id,orderSn,bigNum,smallNum,realPrice', null);
-        $info['orderList'] = $saleList;
-        $info['orderNum'] = count($saleArr);
+        $purchaseIds = $info['purchaseIds'] ?? [];
+        $cgArr = explode(',', $purchaseIds);
+        $cgList = CgClass::getAllByCondition(['id' => ['in', $cgArr]], null, 'id,orderSn,bigNum,smallNum,realPrice', null);
+        $info['orderList'] = $cgList;
+        $info['orderNum'] = count($cgArr);
         $type = $info['type'] ?? 1;
-        $operator = $info['ghsShopAdminName'] ?? '';
-        if ($type == 1) {
-            $operator = '客户';
+        $operator = $info['customShopAdminName'] ?? '';
+        if ($type == 2) {
+            $operator = '商家';
         }
         $info['operator'] = $operator;
         return $info;

biz-ghs/order/classes/OrderClass.php

@@ -89,11 +89,6 @@ class OrderClass extends BaseClass
     //欠款
     const DEBT_YES = 1;
 
-    //供应商开单生成
-    const ORDER_TYPE_GHS_ADD = 1;
-    //零售采购生成
-    const ORDER_TYPE_HD_ADD = 2;
-
     //正常订单
     const REFUND_NO = 1;
     //已退款订单
@@ -166,8 +161,9 @@ class OrderClass extends BaseClass
             $productId = $val['productId'];
             $weight = bcadd($w, $weight, 2);
             //减库存
-            $orderType = $data['orderType'] ?? 1;
-            $checkStock = $orderType == OrderClass::ORDER_TYPE_HD_ADD ? true : false;
+            $cgStyle = $data['cgStyle'] ?? 1;
+
+            $checkStock = $cgStyle == dict::getDict('cgStyle','hd') ? true : false;
             $stockInfo = ProductClass::decreaseStock($val['productId'], $val['bigNum'], $val['smallNum'], $checkStock);
             //记录库存流水
             $recordData = [];

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -133,6 +133,7 @@ class PurchaseOrderClass extends BaseClass
 
         try {
 
+            $data['cgStyle'] = dict::getDict('cgStyle', 'ghs');
             $order = self::add($data);
 
             //采购支出

biz-ghs/order/services/OrderService.php

@@ -81,7 +81,7 @@ class OrderService extends BaseService
             'customId' => $customId,
             'payWay' => $payWay,
             'status' => PurchaseClass::STATUS_UN_PAY,
-            'orderType' => PurchaseClass::ORDER_TYPE_GHS_ADD,
+            'cgStyle' => dict::getDict('cgStyle', 'ghs'),
             'debt' => $purchaseDebt,
             'getType' => $getType,
         ];

biz-hd/purchase/classes/PurchaseClass.php

@@ -39,15 +39,9 @@ class PurchaseClass extends BaseClass
     //自取
     const GET_TYPE_SELF_GET = 2;
 
-    //供应商开单生成
-    const ORDER_TYPE_GHS_ADD = 1;
-    //零售采购生成
-    const ORDER_TYPE_HD_ADD = 2;
-
     const REFUND_NO = 1;
     const REFUND_YES = 2;
 
-
     //添加采购 ssh 2021.1.18
     public static function addPurchase($data)
     {

biz-hd/purchase/services/PurchaseService.php

@@ -81,7 +81,7 @@ class PurchaseService extends BaseService
             'customShopAdminId' => $shopAdminId,
             'customShopAdminName' => $shopAdminName,
             'ghsId' => $ghsId,
-            'orderType' => OrderClass::ORDER_TYPE_HD_ADD,
+            'cgStyle' => dict::getDict('cgStyle', 'hd'),
             'couponId' => $couponId,
             'discountType' => $discountType,
             'discountAmount' => $discountAmount,
@@ -190,7 +190,7 @@ class PurchaseService extends BaseService
     }
 
     //采购订单支付成功后回调处理流程
-    public static function thirdPay($payWay, $orderSn, $totalFee, $attach, $transactionId='')
+    public static function thirdPay($payWay, $orderSn, $totalFee, $attach, $transactionId = '')
     {
         $info = self::getByCondition(['orderSn' => $orderSn], true);
         if (empty($info)) {

common/components/dict.php

@@ -58,6 +58,13 @@ class dict
             'mall' => 3,//商城
             'kmGhs' => 4,//昆明供应商
         ],
+        //采购发起方，与ptStyle一致
+        'cgStyle' => [
+            'hd' => 1,//零售花店
+            'ghs' => 2,//供应商
+            'mall' => 3,//商城
+            'kmGhs' => 4,//昆明供应商
+        ],
 
         'merchantStatus' => ['checking' => 0, 'pass' => 1, 'noPass' => 2, 'freeze' => 3, 'unfreeze' => 4, 'shut' => 5],