a

app-ghs/controllers/ProductController.php

@@ -488,7 +488,7 @@ class ProductController extends BaseController
         $join = $shop->join ?? 0;
         $default = $shop->default ?? 0;
         if ($join == 0 && $default == 0) {
-            util::fail('请在总店操作');
+            //util::fail('请在总店操作');
         }
 
         $shopAdmin = $this->shopAdmin;

biz-hd/order/classes/OrderClass.php

@@ -561,6 +561,13 @@ class OrderClass extends BaseClass
         if (isset($order->prePrice) && $order->prePrice > 0) {
             $content .= '总计：' . floatval($order->prePrice) . '<BR>';
         }
+<<<<<<< HEAD
+=======
+        if (isset($order->labourCost) && $order->labourCost > 0) {
+            $content .= '资材包装：' . floatval($order->labourCost) . '<BR>';
+        }
+        $content .= '订单金额：' . floatval($respond['orderPrice']) . '<BR>';
+>>>>>>> f0f562f584d13f17f95fdaaa1933ea9b918ba31c
         if (isset($respond['discountAmount']) && !empty($respond['discountAmount']) && $respond['discountAmount'] > 0) {
             $content .= '优惠扣除：-' . floatval($respond['discountAmount']) . '<BR>';
         }

biz-hd/order/services/OrderService.php

@@ -227,6 +227,12 @@ class OrderService extends BaseService
             $discountAmount = bcsub($totalPrice, $modifyPrice, 2);
             $data['discountAmount'] = $discountAmount;
         }
+        //七夕节前后上线时下面这段要删除！！
+        if ($modifyPrice > $totalPrice) {
+            if (isset($data['labourCost']) == false) {
+                $data['labourCost'] = bcsub($modifyPrice, $totalPrice, 2);
+            }
+        }
 
         //保存组合
         $groupName = $data['groupName'] ?? '';

console/controllers/InitController.php

@@ -2,17 +2,211 @@
 
 namespace console\controllers;
 
+<<<<<<< HEAD
 use bizHd\order\classes\OrderClass;
 use bizHd\order\models\Order;
+=======
+use biz\admin\classes\AdminClass;
+use biz\admin\classes\AdminRoleClass;
+use biz\product\classes\XjClass;
+use biz\pt\classes\PtYeChangeClass;
+use biz\recharge\classes\RechargeClass;
+use biz\shop\classes\MainClass;
+use biz\shop\classes\ShopAdminClass;
+use biz\shop\classes\ShopClass;
+use biz\shop\classes\ShopYeChangeClass;
+use biz\sj\classes\CashClass;
+use biz\sj\classes\SjClass;
+use biz\stat\classes\StatCgClass;
+use biz\stat\classes\StatCgGhsClass;
+use biz\stat\classes\StatCgGhsMonthClass;
+use biz\stat\classes\StatCgMonthClass;
+use biz\stat\classes\StatOrderCountClass;
+use biz\stat\classes\StatOutClass;
+use biz\stat\classes\StatOutMonthClass;
+use biz\stat\classes\StatPdAddClass;
+use biz\stat\classes\StatPdAddMonthClass;
+use biz\stat\classes\StatPdSubClass;
+use biz\stat\classes\StatPdSubMonthClass;
+use biz\stat\classes\StatRefundClass;
+use biz\stat\classes\StatRefundMonthClass;
+use biz\stat\classes\StatSaleClass;
+use biz\stat\classes\StatSaleMonthClass;
+use biz\stat\classes\StatStockInClass;
+use biz\stat\classes\StatStockInMonthClass;
+use biz\stat\classes\StatStockOutClass;
+use biz\stat\classes\StatStockOutMonthClass;
+use biz\stat\classes\StatWastClass;
+use biz\stat\classes\StatWastMonthClass;
+use bizGhs\cg\classes\CgClass;
+use bizGhs\clear\classes\ClearClass;
+use bizGhs\clear\models\Clear;
+use bizGhs\custom\classes\CustomClass;
+use bizGhs\item\classes\ItemClass;
+use bizGhs\item\classes\ItemClassClass;
+use bizGhs\order\classes\CheckOrderClass;
+use bizGhs\order\classes\OrderClass;
+use bizGhs\order\classes\OrderItemClass;
+use bizGhs\order\classes\RefundOrderClass;
+use bizGhs\order\classes\RefundOrderItemClass;
+use bizGhs\order\classes\StockWastageOrderClass;
+use bizGhs\order\classes\StockWastageOrderItemClass;
+use bizGhs\stat\classes\StatYjClass;
+use bizGhs\stat\classes\StatYjMonthClass;
+use bizHd\cg\classes\CgRefundClass;
+use bizHd\cg\classes\CgRefundItemClass;
+use bizHd\ghs\classes\GhsClass;
+use bizHd\goods\classes\CategoryClass;
+use bizHd\goods\classes\GoodsCategoryClass;
+use bizHd\goods\classes\GoodsClass;
+use bizHd\goods\classes\GoodsSettingClass;
+use bizHd\order\classes\OrderGoodsClass;
+use bizHd\order\models\Order;
+use bizHd\purchase\classes\PurchaseClass;
+use bizHd\purchase\classes\PurchaseItemClass;
+use bizHd\saas\classes\FestRiseClass;
+use bizHd\stat\classes\StatOrderClass;
+use bizHd\stat\classes\StatOrderMonthClass;
+use bizHd\stat\classes\StatUserClass;
+use bizHd\stat\classes\StatUserMonthClass;
+use bizHd\stat\classes\StatVisitClass;
+use bizHd\stat\classes\StatVisitMonthClass;
+use bizHd\user\classes\UserClass;
+use common\components\dict;
+use common\components\stringUtil;
+>>>>>>> f0f562f584d13f17f95fdaaa1933ea9b918ba31c
 use Yii;
 use yii\console\Controller;
 
 class InitController extends Controller
 {
 
+<<<<<<< HEAD
     //供应商和花店历史订单和历史结账单 payStatus payTime更新
     // ./yii init/pay-status
     public function actionPayStatus()
+=======
+    //花店订单脚本
+    public function actionHdOrder()
+    {
+
+        $query = new \yii\db\Query();
+        $query->from(Order::tableName());
+        $query->where(['mainId' => 742]);
+
+        foreach ($query->batch() as $batchOrder) {
+            foreach ($batchOrder as $order) {
+                $addTime = $order['addTime'] ?? '';
+                $goodsPrice = $order['goodsPrice'] ?? 0;
+                $goodsPrice = floatval($goodsPrice);
+                $sendCost = $order['sendCost'] ?? 0;
+                $sendCost = floatval($sendCost);
+                $labourCost = $order['labourCost'] ?? 0;
+                $labourCost = floatval($labourCost);
+                $discountAmount = $order['discountAmount'] ?? 0;
+                $discountAmount = floatval($discountAmount);
+                $orderPrice = $order['orderPrice'] ?? 0;
+                $orderPrice = floatval($orderPrice);
+                $total = bcadd($goodsPrice, $sendCost, 2);
+                $total = bcadd($total, $labourCost, 2);
+                $final = bcsub($total, $discountAmount, 2);
+                $final = floatval($final);
+                $shopAdminName = $order['shopAdminName'] ?? '';
+                $actPrice = $order['actPrice'] ?? 0;
+                $orderSn = $order['orderSn'] ?? '';
+                if ($final != $orderPrice) {
+                    echo "订单号：{$orderSn} {$addTime} \n";
+                    echo "===\n";
+                    $itemList = \bizHd\order\classes\OrderItemClass::getAllByCondition(['orderSn' => $orderSn], null, '*');
+                    if (!empty($itemList)) {
+                        foreach ($itemList as $item) {
+                            echo $item['name'] . " " . $item['num'] . "X" . $item['unitPrice'] . " " . $item['price'] . "\n";
+                        }
+                    }
+                    $goodsList = OrderGoodsClass::getAllByCondition(['orderSn' => $orderSn], null, '*');
+                    if (!empty($goodsList)) {
+                        foreach ($goodsList as $goods) {
+                            echo $goods['name'] . " " . $goods['num'] . "X" . $goods['unitPrice'] . " " . $goods['price'] . "\n";
+                        }
+                    }
+                    echo "===\n";
+                    echo "商品总和：{$goodsPrice} \n运费：{$sendCost} \n人工包装费：{$labourCost} \n合计：{$total} \n优惠：{$discountAmount} \n订单金额：{$orderPrice} \n实付金额：{$actPrice} \n开单人：{$shopAdminName}\n\n\n\n\n";
+                }
+            }
+        }
+    }
+
+    //花材菜单 ./yii init/menu
+    public function actionMenu()
+    {
+        $sql = "ALTER TABLE xhGhsItemClass ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER sjId;";
+        Yii::$app->db->createCommand($sql)->execute();
+        $sql = "ALTER TABLE xhAdminRole ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER `sjId`;";
+        Yii::$app->db->createCommand($sql)->execute();
+
+        $list = SjClass::getAllByCondition(['id>' => 0], null, '*', null, true);
+        if (!empty($list)) {
+            foreach ($list as $sj) {
+                $sjId = $sj->id ?? 0;
+                if (empty($sjId)) {
+                    continue;
+                }
+                $shopList = ShopClass::getAllByCondition(['sjId' => $sjId], null, '*', null, true);
+                if (empty($shopList)) {
+                    continue;
+                }
+                //补花材
+                $classList = ItemClassClass::getAllByCondition(['sjId' => $sjId], null, '*');
+                if (!empty($classList)) {
+                    foreach ($shopList as $shop) {
+                        $shopId = $shop->id ?? 0;
+                        foreach ($classList as $class) {
+                            $classId = $class['id'] ?? 0;
+                            $name = $class['name'] ?? '';
+                            $inTurn = $class['inTurn'] ?? '';
+                            $isDefault = $class['isDefault'] ?? 0;
+                            $data = [
+                                'shopId' => $shopId,
+                                'sjId' => $sjId,
+                                'name' => $name,
+                                'inTurn' => $inTurn,
+                                'isDefault' => $isDefault,
+                            ];
+                            $r = ItemClassClass::add($data, true);
+                            $newId = $r->id ?? 0;
+                            ItemClass::updateByCondition(['shopId' => $shopId, 'classId' => $classId], ['classId' => $newId]);
+                        }
+                    }
+                }
+
+                //补角色
+                $roleList = AdminRoleClass::getAllByCondition(['sjId' => $sjId], null, '*');
+                if (!empty($roleList)) {
+                    foreach ($shopList as $shop) {
+                        $shopId = $shop->id ?? 0;
+                        foreach ($roleList as $role) {
+                            $roleName = $role['roleName'] ?? '';
+                            $roleId = $role['id'] ?? 0;
+                            $roleData = [
+                                'shopId' => $shopId,
+                                'sjId' => $sjId,
+                                'roleName' => $roleName,
+                            ];
+                            $new = AdminRoleClass::add($roleData, true);
+                            $newId = $new->id ?? 0;
+                            ShopAdminClass::updateByCondition(['shopId' => $shopId, 'roleId' => $roleId], ['roleId' => $newId]);
+                        }
+                    }
+                }
+
+            }
+        }
+
+    }
+
+    //初始化 ./yii init/main
+    public function actionMain()
+>>>>>>> f0f562f584d13f17f95fdaaa1933ea9b918ba31c
     {
         ini_set('memory_limit', '2045M');
         set_time_limit(0);