红包 开始处理

app-ghs/controllers/CsController.php

@@ -52,15 +52,7 @@ class CsController extends PublicController
 
         $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], "*");
         $itemInfoData = ProductClass::groupProductInfo($itemInfoData);
-        //常用的itemIds
-        $oftenItemIds = [];
-        //$oftenItemIds = ProductClass::getOftenItemIds($shopId);
-        //获取供应商下所有花材ID （itemIds）
-        $itemIdsInfo = ProductClass::getGhsItemIds($this->sjId);
-
-        //dd($itemInfoData);
-        //组装数据： [{classId:'','className:'',child:[{itemInfoData}]}]
-        $data = ProductService::assembleData($classIds, $itemIdsInfo, $itemInfoData, $oftenItemIds, $type);
+        $data = ProductService::assembleData($classIds, $itemInfoData );
 
         $formatData = [];
 

app-ghs/controllers/HbController.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace ghs\controllers;
+
+use biz\hb\classes\HbClass;
+use common\components\util;
+use Yii;
+
+class HbController extends BaseController
+{
+
+    public function actionList()
+    {
+        $get = Yii::$app->request->get();
+        $where = [];
+        $status = $get['status'] ?? 0;
+        if (!empty($status)) {
+            $where['status'] = $status;
+        }
+        $where['ghsShopId'] = $this->shopId;
+        $py = $get['py'] ?? '';
+        if (!empty($py)) {
+            $where['customPy'] = ['like', $py];
+        }
+        $list = HbClass::getHbList($where);
+        util::success($list);
+    }
+
+}

app-ghs/controllers/ProductController.php

@@ -8,6 +8,7 @@ namespace ghs\controllers;
 
 use biz\admin\classes\AdminRoleClass;
 use biz\ghs\classes\GhsClass;
+use bizGhs\custom\classes\CustomClass;
 use bizGhs\item\classes\ItemClassClass;
 use bizGhs\merchant\classes\ShopClass;
 use bizGhs\product\classes\ProductClass;
@@ -59,17 +60,17 @@ class ProductController extends BaseController
         }
         $where['delStatus'] = 0;
 
+        //给客户开单，价格显示不同客户不同价格
+        $customId = Yii::$app->request->get('customId', 0);
+        if(!empty($customId)){
+            $custom = CustomClass::getById($customId,true);
+            Yii::$app->params['customDiscount'] = isset($custom->discount) ? $custom->discount : 1;
+        }
+
         $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], "*");
         $itemInfoData = ProductClass::groupProductInfo($itemInfoData);
-        //常用的itemIds
-        $oftenItemIds = [];
-        //$oftenItemIds = ProductClass::getOftenItemIds($shopId);
-        //获取供应商下所有花材ID （itemIds）
-        $itemIdsInfo = ProductClass::getGhsItemIds($this->sjId);
-
-        //dd($itemInfoData);
-        //组装数据： [{classId:'','className:'',child:[{itemInfoData}]}]
-        $data = ProductService::assembleData($classIds, $itemIdsInfo, $itemInfoData, $oftenItemIds, $type, true);
+
+        $data = ProductService::assembleData($classIds, $itemInfoData,  true);
 
         util::success($data);
     }

app-ghs/controllers/RechargeHbController.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace ghs\controllers;
+
+use biz\recharge\classes\RechargeHbClass;
+use common\components\arrayUtil;
+use common\components\util;
+use Yii;
+
+class RechargeHbController extends BaseController
+{
+
+    public function actionDetail()
+    {
+        $list = RechargeHbClass::getAllByCondition(['shopId' => $this->shopId, 'delStatus' => 0], 'amount DESC', '*');
+        $recharge = $this->shop->recharge ?? 0;
+        util::success(['list' => $list, 'recharge' => $recharge]);
+    }
+
+    //保存红包内容 shish 20210930
+    public function actionSaveHb()
+    {
+        $connection = Yii::$app->db;//事务处理
+        $transaction = $connection->beginTransaction();
+        try {
+            $data = Yii::$app->request->post('data');
+            $arr = json_decode($data, true);
+            if (is_array($arr) == false) {
+                util::fail('数据错误');
+            }
+            RechargeHbClass::updateByCondition(['shopId' => $this->shopId], ['delStatus' => 1]);
+            $arr = arrayUtil::arraySort($arr, 'amount');
+            foreach ($arr as $key => $item) {
+
+                $mini = $item['miniExpend'] ?? 0;
+                $hbAmount = $item['hbAmount'] ?? 0;
+                if ($mini <= $hbAmount) {
+                    util::fail('最低消费金额要大于红包金额');
+                }
+                $valid = $item['valid'] ?? 0;
+                if (empty($valid)) {
+                    util::fail('请填写红包有效期');
+                }
+                $num = $item['num'] ?? 0;
+                if ($num <= 0) {
+                    util::fail('请填写红包数量');
+                }
+                $totalHb = bcmul($hbAmount, $num, 2);
+                $amount = $item['amount'] ?? 0;
+                if ($totalHb >= $amount) {
+                    $index = $key + 1;
+                    util::fail('第' . $index . '个红包，红包总金额超过充值金额');
+                }
+
+                $item['shopId'] = $this->shopId;
+                $item['sjId'] = $this->sjId;
+                $item['totalHb'] = $totalHb;
+                RechargeHbClass::add($item);
+            }
+            $rechargeSwitch = Yii::$app->request->post('rechargeSwitch', 0);
+            $this->shop->recharge = $rechargeSwitch;
+            $this->shop->save();
+
+            $transaction->commit();
+            util::complete();
+        } catch (\Exception $e) {
+            $transaction->rollBack();
+            util::fail('没有保存成功');
+        }
+    }
+
+}

app-hd/controllers/GhsController.php

@@ -3,6 +3,7 @@
 namespace hd\controllers;
 
 use biz\ghs\classes\GhsClass;
+use biz\recharge\classes\RechargeHbClass;
 use biz\shop\classes\ShopClass;
 use common\components\util;
 use Yii;
@@ -27,6 +28,15 @@ class GhsController extends BaseController
         $id = Yii::$app->request->get('id');
         $info = GhsClass::getGhsInfo($id);
         GhsClass::valid($info, $this->shopId);
+
+        //是否有充值送红包活动
+        $ghsShopId = $info['shopId'] ?? 0;
+        $ghsShop = ShopClass::getById($ghsShopId, true);
+        $info['hasRechargeHb'] = $ghsShop->recharge ?? 0;
+
+        $hb = RechargeHbClass::getByCondition(['shopId' => $ghsShopId], true, 'totalHb DESC');
+        $info['hasRechargeHbAmount'] = $hb->totalHb ?? 0;
+
         util::success($info);
     }
 

app-hd/controllers/GhsProductController.php

@@ -35,14 +35,8 @@ class GhsProductController extends BaseController
 
         $itemInfoData = ProductClass::getAllByCondition($where,['actualSold'=>SORT_DESC,'inTurn'=>SORT_DESC],"*");
         $itemInfoData = ProductClass::groupProductInfo($itemInfoData);
-        //常用的itemIds
-        $oftenItemIds = ProductClass::getOftenItemIds($shopId);
-        //获取供应商下所有花材ID （itemIds）
-        $itemIdsInfo = ProductClass::getGhsItemIds($this->sjId);
-
-        //dd($itemInfoData);
-        //组装数据： [{classId:'','className:'',child:[{itemInfoData}]}]
-        $data = ProductService::assembleData($classIds, $itemIdsInfo,$itemInfoData, $oftenItemIds, '',true);
+
+        $data = ProductService::assembleData($classIds, $itemInfoData, true);
         ShopService::totalViewPlus($shopId);
         util::success($data);
 

app-hd/controllers/ProductController.php

@@ -41,7 +41,6 @@ class ProductController extends BaseController
 
         //库存预警
         if ($type == 'waring') {
-            //shopId 改为可以前端传,默认是当前shopId linqh  2021.1.26
             $shopId = Yii::$app->request->get('shopId', 0);
             if (!$shopId) {
                 $shopId = $this->shopId;
@@ -52,14 +51,7 @@ class ProductController extends BaseController
 
         $itemInfoData = ProductClass::getAllByCondition($where, ['actualSold' => SORT_DESC, 'inTurn' => SORT_DESC], "*");
         $itemInfoData = ProductClass::groupProductInfo($itemInfoData);
-        //常用的itemIds
-        $oftenItemIds = ProductClass::getOftenItemIds($shopId);
-        //获取供应商下所有花材ID （itemIds）
-        $itemIdsInfo = ProductClass::getGhsItemIds($this->sjId);
-
-        //dd($itemInfoData);
-        //组装数据： [{classId:'','className:'',child:[{itemInfoData}]}]
-        $data = ProductService::assembleData($classIds, $itemIdsInfo, $itemInfoData, $oftenItemIds, $type);
+        $data = ProductService::assembleData($classIds,  $itemInfoData);
 
         util::success($data);
     }
@@ -69,13 +61,9 @@ class ProductController extends BaseController
     {
         $classId = Yii::$app->request->get('classId', 0);
         $pyName = Yii::$app->request->get('py', '');
-//        $itemInfo = ItemClass::getGhsItemAll($this->sjId);
-//        $itemIds = array_column($itemInfo, 'itemId');
         $where['sjId'] = $this->sjId;
 
         if ($pyName) {
-//            $pyNameItemIds = ItemClass::getItemIdsByPyName($pyName);
-//            $itemIds = array_intersect($itemIds, $pyNameItemIds);
             $pyName = strtolower($pyName);
             $where['py'] = $pyName;
         }
@@ -120,6 +108,7 @@ class ProductController extends BaseController
     {
         $get = Yii::$app->request->get();
         $id = $get['id'] ?? 0;
+        $ghs = [];
         if (!empty($id)) {
             $ghs = GhsClass::getGhsInfo($id);
             if (empty($ghs)) {
@@ -151,7 +140,6 @@ class ProductController extends BaseController
         $transaction = $connection->beginTransaction();
         try {
 
-
             //获取所有当前供应商的分类 （全部、常用）
             //根据分类组装分类下的花材信息
             $classIds = ItemClassClass::getGhsItemClassAll($sjId);
@@ -160,17 +148,15 @@ class ProductController extends BaseController
             $where['delStatus'] = 0;
             $where['status'] = 1;
 
+
+            //客户需要给算折扣
+            Yii::$app->params['customDiscount'] = isset($ghs['giveDiscount']) ? $ghs['giveDiscount'] : 1;
+
+
             $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], "*");
             $itemInfoData = ProductClass::groupProductInfo($itemInfoData);
-            //常用的itemIds
-            //$oftenItemIds = ProductClass::getOftenItemIds($shopId);
-            $oftenItemIds = [];
-            //获取供应商下所有上架的花材
-            $itemIdsInfo = ProductClass::getAllList('classId,itemId', ['sjId' => $sjId, 'status' => 1]);
 
-            //dd($itemInfoData);
-            //组装数据： [{classId:'','className:'',child:[{itemInfoData}]}]
-            $data = ProductService::assembleData($classIds, $itemIdsInfo, $itemInfoData, $oftenItemIds, '', true);
+            $data = ProductService::assembleData($classIds, $itemInfoData, true);
 
             util::success($data);
         } catch (\Exception $e) {
@@ -197,7 +183,8 @@ class ProductController extends BaseController
     //批量修改product 排序，成本价，加价
     public function actionBatchUpdate()
     {
-        $data = Yii::$app->request->post('data', ''); //data = [{id:1,inTurn:10,addPrice:2,cost:10}]
+        //data = [{id:1,inTurn:10,addPrice:2,cost:10}]
+        $data = Yii::$app->request->post('data', '');
         $type = Yii::$app->request->post('type', '');
         if (empty($data) || empty($type)) {
             util::fail("参数错误");

app-hd/controllers/RechargeController.php

@@ -4,6 +4,7 @@ namespace hd\controllers;
 
 use biz\ghs\classes\GhsClass;
 use biz\recharge\classes\RechargeClass;
+use biz\recharge\classes\RechargeHbClass;
 use biz\shop\classes\ShopClass;
 use biz\sj\classes\SjClass;
 use bizHd\wx\classes\WxOpenClass;
@@ -123,12 +124,37 @@ class RechargeController extends BaseController
         util::success($newParams);
     }
 
-    //充值余额 ssh 2021.2.21
+    //充值送红包 ssh 2021.2.21
     public function actionBalance()
     {
         ini_set('date.timezone', 'Asia/Shanghai');
         $get = Yii::$app->request->get();
-        $amount = $get['amount'] ?? 500;
+        $hbId = $get['id'] ?? 0;
+        $ghsId = $get['ghsId'] ?? 0;
+        $ghsInfo = GhsClass::getById($ghsId, true);
+        if (empty($ghsInfo)) {
+            util::fail('没有找到供应商');
+        }
+        GhsClass::valid($ghsInfo, $this->shopId);
+        $ghsShopId = $ghsInfo['shopId'] ?? 0;
+        $hbInfo = RechargeHbClass::getById($hbId, true);
+        if (empty($hbInfo)) {
+            util::fail('无效活动');
+        }
+        if ($hbInfo->shopId != $ghsShopId) {
+            util::fail('供应商与充值红包活动不一致');
+        }
+        if ($hbInfo->delStatus == 1) {
+            util::fail('红包已更新，请重新发起充值');
+        }
+        $amount = $hbInfo->amount ?? 0;
+        if ($amount <= 0) {
+            util::fail('充值金额有问题');
+        }
+        if ($this->sj->parentShopId != $ghsShopId) {
+            util::fail('无法充值，请找第一个邀请您的供应商');
+        }
+
         $wxPay = dict::getDict('payWay', 'wxPay');
         $shopAdmin = $this->shopAdmin->attributes;
         $shopAdminName = $shopAdmin['name'] ?? '';
@@ -142,6 +168,13 @@ class RechargeController extends BaseController
             'remark' => '',
             'shopAdminId' => $this->shopAdminId,
             'shopAdminName' => $shopAdminName,
+            'hbId' => $hbInfo->id ?? 0,
+            'hbAmount' => $hbInfo->hbAmount ?? 0,
+            'hbNum' => $hbInfo->num,
+            'totalHb' => $hbInfo->totalHb,
+            'valid' => $hbInfo->valid,
+            'miniExpend' => $hbInfo->miniExpend,
+            'ffHbGhsId' => $ghsId,
         ];
         $order = RechargeClass::addOrder($data, true);
         $orderSn = $order->orderSn;

app-hd/controllers/RechargeHbController.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace hd\controllers;
+
+use biz\ghs\classes\GhsClass;
+use biz\recharge\classes\RechargeHbClass;
+use common\components\util;
+use Yii;
+
+class RechargeHbController extends BaseController
+{
+
+    //获取供货商充值红包列表 shish 20210930
+    public function actionGetGhsHb()
+    {
+        $ghsId = Yii::$app->request->get('ghsId', 0);
+        $ghsInfo = GhsClass::getById($ghsId, true);
+        GhsClass::valid($ghsInfo, $this->shopId);
+        $ghsShopId = $ghsInfo->shopId ?? 0;
+        $list = RechargeHbClass::getAllByCondition(['shopId' => $ghsShopId], 'amount DESC', '*', null);
+        util::success(['list' => $list]);
+    }
+
+}

app-hd/controllers/ShopCouponController.php

@@ -22,6 +22,10 @@ class ShopCouponController extends BaseController
         if (!empty($status)) {
             $where['status'] = $status;
         }
+        $ghsId = $get['ghsId'] ?? 0;
+        if (!empty($ghsId)) {
+            $where['ghsId'] = $ghsId;
+        }
         $list = ShopCouponService::getCouponList($where);
         util::success($list);
     }
@@ -29,10 +33,21 @@ class ShopCouponController extends BaseController
     //有可用红包 shish 2021.5.15
     public function actionHas()
     {
-        $has = ShopCouponClass::hasUnUseCoupon($this->shopId);
-        $data = [
-            'has' => $has
-        ];
+        //不要考虑最低消费，把客户所有红包列出来，这样客户可以有选择的消费！！！！！！
+        $ghsId = Yii::$app->request->get('ghsId', 0);
+        $has = ShopCouponClass::hasValidCoupon($this->shopId, $ghsId);
+        $data = ['has' => $has];
         util::success($data);
     }
+
+    //供应商发放的有效优惠券、红包 shish 20211001
+    public function actionGhsSendHb()
+    {
+        $get = Yii::$app->request->get();
+        $amount = $get['amount'] ?? 0;
+        $ghsId = $get['ghsId'] ?? 0;
+        $list = ShopCouponClass::ghsSendHb($this->shopId, $ghsId, $amount);
+        util::success(['list' => $list]);
+    }
+
 }

app-hd/controllers/ShopExtController.php

@@ -6,6 +6,8 @@ use biz\ghs\classes\GhsClass;
 use biz\product\classes\XjClass;
 use biz\shop\classes\ShopExtClass;
 use common\components\util;
+use biz\admin\classes\AdminRoleClass;
+use common\components\printUtil;
 use Yii;
 
 class ShopExtController extends BaseController
@@ -25,4 +27,54 @@ class ShopExtController extends BaseController
         util::success(['list' => $list]);
     }
 
+    //添加打印机 shish 20210712
+    public function actionAddPrint()
+    {
+
+        $shopAdmin = $this->shopAdmin;
+        $roleId = $shopAdmin['roleId'] ?? 0;
+        $role = AdminRoleClass::getById($roleId);
+        $roleName = $role['roleName'] ?? '';
+        if ($roleName == '员工') {
+            util::fail('没有权限操作哦');
+        }
+
+        $shopId = $this->shopId;
+        $ext = ShopExtClass::getByCondition(['shopId' => $shopId], true);
+        $get = Yii::$app->request->get();
+        $printSn = $get['printSn'] ?? '';
+        $printKey = $get['printKey'] ?? '';
+        $print = new printUtil($printSn);
+        $shop = $this->shop;
+        $default = $shop->default ?? 0;
+        $shopName = $shop->shopName ?? '';
+        $sj = $this->sj;
+        $sjName = $sj->name ?? '';
+        $name = $default == 1 ? $sjName : $sjName . ' ' . $shopName;
+        if (!empty($printSn) && !empty($printKey)) {
+            $return = $print->addPrint($printKey, $name);
+            if ($return) {
+                $ext->printSn = $printSn;
+                $ext->printKey = $printKey;
+                $ext->save();
+                util::complete('添加成功');
+            }
+        }
+        if (empty($printSn) && empty($printKey)) {
+            $ext->printSn = '';
+            $ext->printKey = '';
+            $ext->save();
+            util::complete('修改成功');
+        }
+        util::fail('添加失败');
+    }
+
+    //获取打印机信息
+    public function actionGetPrint()
+    {
+        $shopId = $this->shopId;
+        $ext = ShopExtClass::getByCondition(['shopId' => $shopId]);
+        util::success($ext);
+    }
+
 }

app-hd/controllers/ShopHbController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace hd\controllers;
+
+use biz\shop\services\ShopCouponService;
+use common\components\util;
+use Yii;
+
+class ShopHbController extends BaseController
+{
+
+    public $guestAccess = [];
+
+    //门店列表 shish 2021.5.15
+    public function actionList()
+    {
+        $get = Yii::$app->request->get();
+        $where = [];
+        $where['shopId'] = $this->shopId;
+        $status = $get['status'] ?? 0;
+        if (!empty($status)) {
+            $where['status'] = $status;
+        }
+        $ghsId = $get['ghsId'] ?? 0;
+        if (!empty($ghsId)) {
+            $where['ghsId'] = $ghsId;
+        }
+        $list = ShopCouponService::getCouponList($where);
+        util::success($list);
+    }
+
+}

biz-ghs/order/classes/OrderClass.php

@@ -120,35 +120,24 @@ class OrderClass extends BaseClass
         $data['sendCost'] = $sendCost;
         $data['bigNum'] = $respond['bigNum'] ?? 0;
         $data['smallNum'] = $respond['smallNum'] ?? 0;
+
+        //默认订单要打单
+        $data['needPrint'] = $data['needPrint'] ?? dict::getDict('needPrint', 'need');
+
+        //价格
         $price = $respond['price'] ?? 0;
         $currentPrice = bcadd($price, $sendCost, 2);
         $data['prePrice'] = $currentPrice;
-        //默认生成订单时需要打单
-        $data['needPrint'] = $data['needPrint'] ?? dict::getDict('needPrint', 'need');
-        $data['actPrice'] = $currentPrice;
-        $data['realPrice'] = $currentPrice;
-
-        if (isset($data['modifyPrice'])) {
-            //商家打折，修改金额
-            $modifyPrice = $data['modifyPrice'] ?? 0;
-            if ($modifyPrice > $currentPrice) {
-                util::fail('实收金额大于订单总金额');
-            }
-            if ($modifyPrice < $currentPrice) {
-                $data['discountAmount'] = bcsub($currentPrice, $modifyPrice, 2);
-                $data['discountType'] = dict::getDict('discountType', 'discount');
-                $currentPrice = $modifyPrice;
-                $data['actPrice'] = $currentPrice;
-                $data['realPrice'] = $currentPrice;
-            }
-        } else {
-            //客户采购
-            if (isset($data['discountAmount']) && $data['discountAmount'] > 0) {
-                $discountAmount = $data['discountAmount'] ?? 0;
-                $data['actPrice'] = bcsub($currentPrice, $discountAmount, 2);
-                $data['realPrice'] = bcsub($currentPrice, $discountAmount, 2);
-            }
+        $actPrice = $currentPrice;
+        $realPrice = $currentPrice;
+        //客户采购时使用红包
+        if (isset($data['discountType']) && $data['discountType'] == dict::getDict('discountType', 'hb')) {
+            $discountAmount = $data['discountAmount'] ?? 0;
+            $actPrice = bcsub($currentPrice, $discountAmount, 2);
+            $realPrice = $actPrice;
         }
+        $data['actPrice'] = $actPrice;
+        $data['realPrice'] = $realPrice;
 
         $data['sendTimeWant'] = isset($data['sendTimeWant']) && !empty($data['sendTimeWant']) ? $data['sendTimeWant'] : date("Y-m-d");
         //订单有效期

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -319,7 +319,7 @@ class PurchaseOrderClass extends BaseClass
                 $shortCover = $val['cover'] ?? '';
                 $orderInfo[$key]['ShortCover'] = $shortCover;
                 $orderInfo[$key]['cover'] = imgUtil::groupImg($shortCover) . "?x-oss-process=image/resize,m_fill,h_130,w_130";
-                $orderInfo[$key]['bigCover'] = imgUtil::groupImg($shortCover) . "?x-oss-process=image/resize,m_fill,h_700,w_700";;
+                $orderInfo[$key]['bigCover'] = imgUtil::groupImg($shortCover) . "?x-oss-process=image/resize,m_fill,h_700,w_700";
             }
         }
         $orderData = self::groupAdmin($orderData);

biz-ghs/product/classes/ProductClass.php

@@ -103,8 +103,6 @@ class ProductClass extends BaseClass
             $cover = imgUtil::getPrefix() . 'hhb_small.png';
             $bigCover = imgUtil::getPrefix() . 'hhb_small.png';
             if (!empty($shortCover)) {
-                //取小图200 shish 20210704
-                //判断是否有参数，无则拼接 linqh 2021.7.6
                 $parse = parse_url(self::groupImg($shortCover));
                 if (empty($parse['query'])) {
                     $cover = self::groupImg($shortCover) . "?x-oss-process=image/resize,m_fill,h_130,w_130";
@@ -127,7 +125,14 @@ class ProductClass extends BaseClass
 
             //特价 shish 20210901
             $discountPrice = $v['discountPrice'] ?? 0;
-            $price = $discountPrice > 0 ? $discountPrice : $v['price'];
+            $price = $discountPrice > 0 && $v['price'] > $discountPrice ? $discountPrice : $v['price'];
+
+            //客户折扣价
+            $customDiscount = isset(Yii::$app->params['customDiscount']) ? Yii::$app->params['customDiscount'] : 1;
+            if ($customDiscount < 1 && $customDiscount > 0) {
+                $price = bcmul($price, $customDiscount, 2);
+            }
+
             $list[$k]['price'] = $price;
             $list[$k]['bigPrice'] = $price;
 
@@ -572,10 +577,6 @@ class ProductClass extends BaseClass
     }
 
     //下单时计算商品的价格  linqh 2021.1.28
-    //itemInfo : [{"classId":5,"productId":3,"bigNum":1,"smallNum":2},{"classId":5,"productId":4,"bigNum":1,"smallNum":5}]
-    //2021.7.26增加前端传的价格 （小程序有传，但pc端不穿）
-    //itemInfo ：[{"classId":5,"productId":3,"bigNum":1,"smallNum":2,"price":0}]
-    //返回 [{"productId":3,"price":2.1}]
     public static function formatProductInfo($itemInfo, $customId = 0)
     {
         $data = [];
@@ -591,7 +592,7 @@ class ProductClass extends BaseClass
         $totalBigNum = 0;
         $totalSmallNum = 0;
 
-        //商家给客户打折
+        //不同的人卖不现价格
         $discount = 1;
         if (!empty($customId)) {
             $custom = CustomClass::getById($customId, true);
@@ -613,6 +614,11 @@ class ProductClass extends BaseClass
                 $itemPrice = $discountPrice;
             }
 
+            //不同的人卖不同价格
+            if ($discount > 0 && $discount < 1) {
+                $itemPrice = bcmul($itemPrice, $discount, 2);
+            }
+
             //供应商开单可以传单价过来
             if (isset($v['price'])) {
                 if (is_numeric($v['price']) == false || $v['price'] <= 0) {
@@ -646,7 +652,7 @@ class ProductClass extends BaseClass
             $smallUnitPrice = bcdiv($itemPrice, $tmp['ratio'], 2);
             $tmp['smallUnitPrice'] = $smallUnitPrice;
 
-            $discountPrice = bcmul($itemPrice,$discount,2);
+            $discountPrice = bcmul($itemPrice, $discount, 2);
             $discountSmallPrice = bcdiv($discountPrice, $tmp['ratio'], 2);
             $tmp['discountPrice'] = $discountPrice;
             $tmp['discountSmallPrice'] = $discountSmallPrice;

biz-ghs/product/services/ProductService.php

@@ -18,7 +18,7 @@ class ProductService extends BaseService
     const OFTEN_CLASS_ID = '-2';
 
     //组装分类花材数据
-    public static function assembleData($classIds, $itemIdsInfo, $itemInfoData, $oftenItemIds, $type, $showSale = false)
+    public static function assembleData($classIds,  $itemInfoData,  $showSale = false)
     {
         $saleItem = []; //今日特价
 

biz-hd/purchase/classes/PurchaseClass.php

@@ -73,6 +73,8 @@ class PurchaseClass extends BaseClass
         $productData = self::getProductMapData($productList, "productId");
         $hdProductData = self::getProductMapData($productList, "hdProductId");
 
+        $giveDiscount = $ghs['giveDiscount'] ?? 1;
+
         //计算价格= 各个productId的price*num(bigNum,smallNum) + sendCost(配送费)
         $bigNum = 0; //总共多少扎
         $smallNum = 0; //总共多少支
@@ -100,10 +102,15 @@ class PurchaseClass extends BaseClass
                 $price = $discountPrice;
             }
 
+            if ($giveDiscount < 1 && $giveDiscount > 0) {
+                $price = bcmul($price, $giveDiscount, 2);
+            }
+
             //花材原价
             $productPrePrice = bcmul($itemNum, $price, 2); //采购总价
             $productTotalPrice = $productPrePrice;
-            //花材改价
+
+            //供应商开单时修改价格
             if (isset($product['userPrice']) && $product['userPrice'] > 0) {
                 $price = $product['userPrice'];
                 $productTotalPrice = bcmul($itemNum, $price, 2);
@@ -143,7 +150,7 @@ class PurchaseClass extends BaseClass
         $sendCost = $data['sendCost'] ?? 0.00;
         $prePrice = bcadd($prePrice, $sendCost, 2);
         $actPrice = $prePrice;
-        $realPrice = $prePrice;
+        $realPrice = $actPrice;
 
         if (isset($data['modifyPrice'])) {
             //商家打折，修改金额
@@ -159,20 +166,10 @@ class PurchaseClass extends BaseClass
             }
         } else {
 
-            if (isset($ghs['giveDiscount']) && $ghs['giveDiscount'] < 1 && $ghs['giveDiscount'] > 0) {
-                $data['discountType'] = dict::getDict('discountType', 'discount');
-                $give = bcsub(1, $ghs['giveDiscount'], 2);
-                $discountAmount = bcmul($prePrice, $give, 2);
-                $data['discountAmount'] = $discountAmount;
-                $actPrice = bcsub($prePrice, $discountAmount, 2);
-                $realPrice = $actPrice;
-                $data['discount'] = $ghs['giveDiscount'];
-            }
-
             //验证优惠券
-            $couponId = isset($data['couponId']) ? $data['couponId'] : 0;
-            if (!empty($couponId)) {
-                $coupon = ShopCouponClass::getLockById($couponId);
+            $hbId = isset($data['hbId']) ? $data['hbId'] : 0;
+            if (!empty($hbId)) {
+                $coupon = ShopCouponClass::getLockById($hbId);
                 ShopCouponClass::valid($coupon, $data['shopId']);
                 if ($coupon->miniCost != 0 && $coupon->miniCost > $prePrice) {
                     util::fail('达到最低消费才能使用优惠券');
@@ -182,11 +179,14 @@ class PurchaseClass extends BaseClass
                 }
                 $coupon->take = ShopCouponClass::TAKE_HAS;
                 $coupon->save();
-                $realPrice = bcsub($actPrice, $coupon->amount, 2);
-                $data['discountType'] = dict::getDict('discountType', 'usePtCoupon');
+                $data['discountType'] = dict::getDict('discountType', 'hb');
                 $data['discountAmount'] = $coupon->amount;
+                $data['hbId'] = $hbId;
+
+                $actPrice = bcsub($prePrice, $coupon->amount, 2);
+                $realPrice = $actPrice;
+
             }
-            $data['couponId'] = $couponId;
 
         }
 
@@ -195,6 +195,9 @@ class PurchaseClass extends BaseClass
         $data['realPrice'] = $realPrice;
         $data['bigNum'] = $bigNum;
         $data['smallNum'] = $smallNum;
+
+        $data['discount'] = $giveDiscount;
+
         //采购单有效期
         $validTime = dict::getDict('sale_purchase_order_valid');
         $current = time() + $validTime;
@@ -338,9 +341,9 @@ class PurchaseClass extends BaseClass
             }
         } else {
             //验证优惠券
-            $couponId = isset($data['couponId']) ? $data['couponId'] : 0;
-            if (!empty($couponId)) {
-                $coupon = ShopCouponClass::getLockById($couponId);
+            $hbId = isset($data['hbId']) ? $data['hbId'] : 0;
+            if (!empty($hbId)) {
+                $coupon = ShopCouponClass::getLockById($hbId);
                 ShopCouponClass::valid($coupon, $data['shopId']);
                 if ($coupon->miniCost != 0 && $coupon->miniCost > $prePrice) {
                     util::fail('达到最低消费才能使用优惠券');
@@ -353,8 +356,9 @@ class PurchaseClass extends BaseClass
                 $realPrice = bcsub($actPrice, $coupon->amount, 2);
                 $data['discountType'] = dict::getDict('discountType', 'usePtCoupon');
                 $data['discountAmount'] = $coupon->amount;
+                $data['hbId'] = $hbId;
             }
-            $data['couponId'] = $couponId;
+
         }
         $data['prePrice'] = $prePrice;
         $data['actPrice'] = $actPrice;

biz-hd/purchase/services/PurchaseService.php

@@ -90,10 +90,10 @@ class PurchaseService extends BaseService
             'couponId' => $couponId,
             'discountType' => $discountType,
             'discountAmount' => $discountAmount,
-            'discount' => $discount,
             'remark' => $remark,
             'xj' => $xj,
             'sendTimeWant' => $sendTimeWant,
+            'discount' => $discount,
         ];
         $result = OrderClass::addOrder($arr);
         $saleId = $result['id'] ?? 0;
@@ -166,7 +166,7 @@ class PurchaseService extends BaseService
             $saleId = $purchase->saleId;
             //销售单失效
             OrderClass::cancel($saleId);
-            $couponId = $purchase->couponId;
+            $couponId = $purchase->hbId;
             if (!empty($couponId)) {
                 $coupon = ShopCouponClass::getLockById($couponId);
                 ShopCouponClass::rollback($coupon);
@@ -282,7 +282,7 @@ class PurchaseService extends BaseService
             util::fail('订单不是待付款状态');
         }
 
-        /**零售采购单状态变化**/
+        //零售采购单状态变化
         $info->payWay = $payWay;
         $info->status = PurchaseClass::STATUS_UN_SEND;
         if ($payWay == dict::getDict('payWay', 'debtPay')) {
@@ -291,7 +291,7 @@ class PurchaseService extends BaseService
         }
         $info->save();
 
-        /**零售门店资产变化**/
+        //零售门店资产变化
         $shopId = $info['shopId'] ?? 0;
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
@@ -299,7 +299,7 @@ class PurchaseService extends BaseService
         }
         $realPrice = $info->realPrice;
         $actPrice = $info->actPrice;
-        /**余额支付引起余额减少**/
+        //余额支付引起余额减少
         if ($payWay == dict::getDict('payWay', 'balancePay')) {
             ShopClass::purchaseReduceBalance($shop, $realPrice, $info);
         }
@@ -338,14 +338,14 @@ class PurchaseService extends BaseService
         StatOutClass::updateOrInsert($shop, $info->actPrice);
 
         //使用优惠券
-        $couponId = $info->couponId;
-        if (!empty($couponId)) {
-            $coupon = ShopCouponClass::getLockById($couponId);
+        $hbId = $info->hbId;
+        if (!empty($hbId)) {
+            $coupon = ShopCouponClass::getLockById($hbId);
             $coupon->status = ShopCouponClass::STATUS_USED;
             $coupon->save();
         }
 
-        /**供应商资产变化**/
+        //供应商资产变化
         $ghsId = $info->ghsId ?? 0;
         $ghs = GhsClass::getLockById($ghsId);
         if (empty($ghs)) {

biz/hb/classes/HbClass.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace biz\hb\classes;
+
+use biz\base\classes\BaseClass;
+use common\components\imgUtil;
+
+class HbClass extends BaseClass
+{
+
+    public static $baseFile = '\biz\hb\models\Hb';
+
+    public static function getHbList($where)
+    {
+        $data = self::getList('*', $where, 'addTime DESC');
+        $list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
+        if (empty($list)) {
+            return $data;
+        }
+        $data['list'] = self::groupHbInfo($list);
+        return $data;
+    }
+
+    public static function groupHbInfo($list)
+    {
+        if (empty($list)) {
+            return $list;
+        }
+        foreach ($list as $key => $val) {
+            $cAvatar = $val['customAvatar'] ?? '';
+            $preCAvatar = imgUtil::groupImg($cAvatar);
+            $list[$key]['customAvatar'] = $preCAvatar . "?x-oss-process=image/resize,m_fill,h_130,w_130";
+            $list[$key]['customBigAvatar'] = $preCAvatar . "?x-oss-process=image/resize,m_fill,h_700,w_700";
+
+            $gAvatar = $val['ghsAvatar'] ?? '';
+            $preGAvatar = imgUtil::groupImg($gAvatar);
+            $list[$key]['ghsAvatar'] = $preGAvatar . "?x-oss-process=image/resize,m_fill,h_130,w_130";
+            $list[$key]['ghsBigAvatar'] = $preGAvatar . "?x-oss-process=image/resize,m_fill,h_700,w_700";
+        }
+        return $list;
+    }
+
+}

biz/hb/models/Hb.php

@@ -0,0 +1,11 @@
+<?php
+namespace biz\hb\models;
+use biz\base\models\Base;
+
+class Hb extends Base
+{
+    public static function tableName()
+    {
+        return 'xhHb';
+    }
+}

biz/hb/services/HbService.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace biz\hb\services;
+
+use biz\base\services\BaseService;
+use Yii;
+
+class HbService extends BaseService
+{
+
+    public static $baseFile = '\biz\hb\classes\HbClass';
+
+}

biz/recharge/classes/RechargeClass.php

@@ -4,6 +4,7 @@ namespace biz\recharge\classes;
 
 use biz\base\classes\BaseClass;
 use biz\ghs\classes\GhsClass;
+use biz\shop\classes\ShopCouponClass;
 use biz\sj\classes\SjClass;
 use bizHd\merchant\classes\ShopClass;
 use common\components\dict;
@@ -57,6 +58,9 @@ class RechargeClass extends BaseClass
         $capitalType = dict::getDict('capitalType', 'xhRecharge');
         //余额是否指定门店使用
         $fix = false;
+
+        //免费续期功能暂时关闭
+        /**
         if ($rechargeRenew == 1) {
             $sjId = $recharge->sjId;
             SjClass::renewOneYear($sjId, 2, ['amount' => $recharge->amount, 'orderSn' => $orderSn]);
@@ -69,6 +73,13 @@ class RechargeClass extends BaseClass
                 noticeUtil::push("客户[{$customName}]在供应商[{$ghsName}]充值花款{$recharge->amount}元，免费续期一年", '15280215347');
             }
         }
+        **/
+
+        //充值送红包
+        if($recharge->sjStyle == SjClass::STYLE_RETAIL && !empty($recharge->ffHbGhsId)) {
+            ShopCouponClass::giveCoupon($recharge);
+        }
+
         \biz\shop\classes\ShopClass::rechargeAddBalance($shop, $amount, $recharge, $tx, $capitalType, $fix);
     }
 

biz/recharge/classes/RechargeHbClass.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace biz\recharge\classes;
+
+use biz\base\classes\BaseClass;
+use biz\ghs\classes\GhsClass;
+use biz\sj\classes\SjClass;
+use bizHd\merchant\classes\ShopClass;
+use common\components\dict;
+use common\components\noticeUtil;
+use common\components\orderSn;
+
+class RechargeHbClass extends BaseClass
+{
+
+    public static $baseFile = '\biz\recharge\models\RechargeHb';
+
+}

biz/recharge/models/RechargeHb.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace biz\recharge\models;
+
+use biz\base\models\Base;
+
+class RechargeHb extends Base
+{
+
+    public static function tableName()
+    {
+        return 'xhRechargeHb';
+    }
+
+}

biz/recharge/services/RechargeHbService.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace biz\recharge\services;
+
+use biz\base\services\BaseService;
+
+class RechargeHbService extends BaseService
+{
+
+    public static $baseFile = '\biz\recharge\classes\RechargeHbClass';
+
+}

biz/shop/classes/ShopCouponClass.php

@@ -3,6 +3,8 @@
 namespace biz\shop\classes;
 
 use biz\base\classes\BaseClass;
+use biz\ghs\classes\GhsClass;
+use common\components\noticeUtil;
 use common\components\util;
 
 class ShopCouponClass extends BaseClass
@@ -41,6 +43,39 @@ class ShopCouponClass extends BaseClass
         ]
     ];
 
+    public static function giveCoupon($recharge)
+    {
+        $sjId = $recharge->sjId ?? 0;
+        $shopId = $recharge->shopId ?? 0;
+        $ghsId = $recharge->ghsId ?? 0;
+        $hbAmount = $recharge->hbAmount ?? 0;
+        $hbNum = $recharge->hbNum ?? 0;
+        $valid = $recharge->valid ?? 0;
+        $miniExpend = $recharge->miniExpend ?? 0;
+        $amount = $recharge->amount ?? 0;
+        $rechargeId = $recharge->id ?? 0;
+        if ($hbNum <= 0) {
+            noticeUtil::push("充值成功但红包没有发放成功，数量：{$hbNum} 金额：{$amount} id：{$rechargeId}", '15280215347');
+            return false;
+        }
+        for ($i = 0; $i < $hbNum; $i++) {
+            $start = date("Y-m-d H:i:s");
+            $end = date("Y-m-d H:i:s", time() + $valid * 86400);
+            $coupon = [
+                'sjId' => $sjId,
+                'shopId' => $shopId,
+                'beginTime' => $start,
+                'endTime' => $end,
+                'name' => '红包券',
+                'amount' => $hbAmount,
+                'miniCost' => $miniExpend,
+                'status' => self::STATUS_UN_USE,
+                'ghsId' => $ghsId,
+            ];
+            self::add($coupon);
+        }
+    }
+
     public static function groupBaseInfo($list)
     {
         return $list;
@@ -59,7 +94,7 @@ class ShopCouponClass extends BaseClass
                 'name' => $val['name'],
                 'amount' => $val['amount'],
                 'miniCost' => $val['miniCost'],
-                'status' => ShopCouponClass::STATUS_UN_USE,
+                'status' => self::STATUS_UN_USE,
             ];
             $couponData[] = $coupon;
         }
@@ -72,14 +107,40 @@ class ShopCouponClass extends BaseClass
         return $coupon->save();
     }
 
+    public static function ghsSendHb($shopId, $ghsId, $amount)
+    {
+        $current = date("Y-m-d H:i:s");
+        $list = self::getAllByCondition(['shopId' => $shopId, 'status' => ShopCouponClass::STATUS_UN_USE, 'ghsId' => $ghsId], null, '*', null, true);
+        if (empty($list)) {
+            return $list;
+        }
+        $arr = [];
+        foreach ($list as $item) {
+            if ($current >= $item->beginTime && $current < $item->endTime) {
+                if ($item->miniCost <= $amount) {
+                    $arr[] = $item;
+                }
+            }
+        }
+        return $arr;
+    }
+
     // 商家是否有可用优惠券
-    public static function hasUnUseCoupon($shopId)
+    public static function hasValidCoupon($shopId, $ghsId)
     {
-        $count = ShopCouponClass::getCount([
-            'shopId' => $shopId,
-            'status' => ShopCouponClass::STATUS_UN_USE,
-        ]);
-        return $count > 0 ? true : false;
+        $current = date("Y-m-d H:i:s");
+        $list = self::getAllByCondition(['shopId' => $shopId, 'status' => ShopCouponClass::STATUS_UN_USE, 'ghsId' => $ghsId], null, '*', null, true);
+        $flag = 0;
+        if (empty($list)) {
+            return $flag;
+        }
+        foreach ($list as $item) {
+            if ($current >= $item->beginTime && $current < $item->endTime) {
+                $flag = 1;
+                break;
+            }
+        }
+        return $flag;
     }
 
     public static function valid($coupon, $shopId)

biz/shop/models/ShopCoupon.php

@@ -9,7 +9,7 @@ class ShopCoupon extends Base
 
     public static function tableName()
     {
-        return 'xhShopCoupon';
+        return 'xhHb';
     }
 
 }

common/components/dict.php

@@ -39,8 +39,9 @@ class dict
         //是否在线支付
         'onlinePay' => ['not' => 1, 'yes' => 2],
 
-        //客户采购时订单有效期15分钟
-        'sale_purchase_order_valid' => 900,
+        //客户采购时订单有效期10分钟
+        'sale_purchase_order_valid' => 600,
+
         //商家开单时订单有效期一个月
         'kd_order_valid' => 2592000,
 
@@ -110,6 +111,8 @@ class dict
             'usePtCoupon' => 2,
             //商家打折
             'discount' => 3,
+            //红包
+            'hb'  => 4,
         ],
 
         'payStatus' => ['cancel' => -1, 'waitForPay' => 0, 'waitForSend' => 1],

console/controllers/OrderController.php

@@ -7,6 +7,7 @@ use bizGhs\order\models\Order;
 use bizGhs\order\services\OrderService;
 use common\components\dict;
 use common\components\noticeUtil;
+use common\components\util;
 use Yii;
 use yii\console\Controller;
 use bizHd\purchase\classes\PurchaseClass;
@@ -21,6 +22,9 @@ class OrderController extends Controller
     //待配送订单，超过24小时自动完成 ./yii order/auto-finish
     public function actionAutoFinish()
     {
+        //好像没有用了
+        util::stop();
+
         $remain = time() - 86400;
         $date = date("Y-m-d H:i:s", $remain);
 
@@ -78,6 +82,9 @@ class OrderController extends Controller
     //商家自己开的订单，3小时后没确认自动确认为欠款 ./yii order/auto-confirm
     public function actionAutoConfirm()
     {
+        //好像没有用了
+        util::stop();
+
         $remain = time() - 10800;
         $date = date("Y-m-d H:i:s", $remain);
 

console/controllers/ProductController.php

@@ -9,65 +9,4 @@ use yii\console\Controller;
 class ProductController extends Controller
 {
 
-    //上下架 ./yii product/update-status
-    public function actionUpdateStatus()
-    {
-        $list = ProductClass::getAllByCondition([], null, '*', null, true);
-        if (empty($list)) {
-            return false;
-        }
-        foreach ($list as $product) {
-            $delStatus = $product->delStatus;
-            //已经下架的商品
-            if ($delStatus == 1) {
-                $product->status = 2;
-                $product->delStatus = 0;
-                $product->save();
-                echo $product->name . " {$product->id} 已经下架 status 变成 2 delStatus 变成 0\n";
-            }
-        }
-    }
-
-    //更新封面 ./yii product/update-cover
-    public function actionUpdateCover()
-    {
-        $list = ProductClass::getAllByCondition([], null, '*', null, true);
-        if (empty($list)) {
-            return false;
-        }
-        foreach ($list as $product) {
-            $itemId = $product->itemId ?? 0;
-            $ptItem = PtItemClass::getById($itemId, true);
-            $ptCover = $ptItem->cover ?? '';
-            if (!empty($ptCover)) {
-                $product->cover = $ptCover;
-                $product->save();
-                echo "{$product->id} 已更新为{$ptCover} \n";
-            }
-        }
-    }
-
-    //更新价格 ./yii product/update-price
-    public function actionUpdatePrice()
-    {
-        $list = ProductClass::getAllByCondition(['shopId' => 10], null, '*', null, true);
-        if (empty($list)) {
-            return false;
-        }
-        foreach ($list as $product) {
-            $ptItemId = $product->itemId ?? 0;
-            $weight = $product->weight ?? 0;
-            $addPrice = $product->addPrice ?? 0;
-            $ratio = $product->ratio ?? 20;
-            $p = ProductClass::getByCondition(['shopId' => 214, 'itemId' => $ptItemId], true);
-            if (!empty($p)) {
-                //$p->addPrice = $addPrice;
-                //$p->weight = $weight;
-                $p->ratio = $ratio;
-                $p->save();
-                echo "productId {$p->id} 加价改成了：{$addPrice} 重量改成了：{$weight} 比例修改为 {$ratio} \n";
-            }
-        }
-    }
-
 }

console/controllers/ShopCouponController.php

@@ -18,11 +18,10 @@ class ShopCouponController extends Controller
     // /usr/local/nginx/html/huahuibao/yii shop-coupon/expire
     public function actionExpire()
     {
-        $coupons = ShopCouponClass::getLimitList('*', [
-            'status' => ShopCouponClass::STATUS_UN_USE,
-            'endTime<' => date("Y-m-d H:i:s"),
-        ], '1000', 'id asc');
-
+        $coupons = ShopCouponClass::getLimitList('*', ['status' => ShopCouponClass::STATUS_UN_USE, 'endTime<' => date("Y-m-d H:i:s"), 'take' => 1,], '2000', 'id asc');
+        if (empty($coupons)) {
+            return false;
+        }
         try {
             foreach ($coupons as $coupon) {
                 $couponAr = ShopCouponClass::getById($coupon['id'], true);
@@ -32,7 +31,7 @@ class ShopCouponController extends Controller
             }
         } catch (Exception $e) {
             $msg = $e->getMessage();
-            noticeUtil::push("零售商优惠券过期变更报错：{$msg}", '15280215347');
+            noticeUtil::push("零售店优惠券过期处理报错：{$msg}", '15280215347');
         }
     }