Merge branch 'master' into zhongqi-quickOrder

app-ghs/controllers/ConsoleController.php

@@ -165,7 +165,7 @@ class ConsoleController extends BaseController
             }
         }
 
-        //$notice[] = ['title' => '跑腿已经支持达达和滴滴，花材免跑腿费设置已经区分批发和零售，使用上有问题请与小石联系，小程序已经更新，APP这二天更新', 'action' => '', 'page' => ''];
+        //$notice[] = ['title' => '急事请连打二次客服电话 15280215347', 'action' => '', 'page' => ''];
         //$notice[] = ['title' => '新功能：客户端和后台使用跑腿的流程', 'action' => '', 'page' => '/admin/book/detail?id=use_pt'];
         //$notice[] = ['title' => '快速设置：客户下单自动计算跑腿费', 'action' => '查看', 'page' => '/admin/book/detail?id=auto_calc_pt_fee'];
         //$notice[] = ['title' => '订单上如何一键呼叫跑腿', 'action' => '查看', 'page' => '/admin/book/detail?id=one_call_pt'];

app-ghs/controllers/TestController.php

@@ -451,7 +451,8 @@ class TestController extends BaseController
             //['name' => '惠州美天鲜花水口店', 'merchantNo' => '8225950599200CY', 'wx' => [827536311, 827535872], 'zfb' => '2088080848565460'],
             //['name' => '宿州万花城鲜花', 'merchantNo' => '82237405992003F', 'wx' => [840725899, 840726149], 'zfb' => '2088180514587023'],
             //['name' => '蚌埠云采鲜花批发', 'merchantNo' => '82236305992003R', 'wx' => [840974082, 840973879], 'zfb' => '2088180525938209'],
-            ['name' => '昆明源花汇鲜花', 'merchantNo' => '8227310599200Y7', 'wx' => [847054539, 847054222], 'zfb' => '2088180838553432'],
+            //['name' => '昆明源花汇鲜花', 'merchantNo' => '8227310599200Y7', 'wx' => [847054539, 847054222], 'zfb' => '2088180838553432'],
+            ['name' => '宝鸡美婷鲜花批发', 'merchantNo' => '82279305992004N', 'wx' => [847681058, 847680856], 'zfb' => '2088180872582801'],
             ['name' => '深圳鼎盛皇室花卉', 'merchantNo' => '8225840599201MF', 'wx' => [807078304, 807076486], 'zfb' => '2088970117746334'],
             //['name' => '东莞惠雅鲜花（莞城店）', 'merchantNo' => '8226020599200GJ', 'wx' => [796953190, 796976959], 'zfb' => '2088770940104912'],
             //['name' => '东莞惠雅鲜花（南城店）', 'merchantNo' => '8226020599200JK', 'wx' => [802315656, 802315755], 'zfb' => '2088870583889365'],
@@ -964,7 +965,7 @@ class TestController extends BaseController
     //交易查询 ssh 20231021
     public function actionTradeQuery()
     {
-        $shopId = 79108;
+        $shopId = 7855;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
             util::stop('没有找到门店，编号677230');
@@ -980,13 +981,13 @@ class TestController extends BaseController
             'lklCertificatePath' => $lklCertificatePath,
         ];
         $laResource = new Lakala($params);
-        $orderSn = 'CG29798262';
-        $tradeNo = '66223126348611';
+        $orderSn = 'CG29953307';
+        $tradeNo = '';
         $queryParams = [
             'orderSn' => $orderSn,
             'tradeNo' => $tradeNo,
         ];
-        $response = $laResource->query($queryParams, 1);
+        $response = $laResource->query($queryParams, 0);
         echo "<pre>";
         print_r($response);
         util::stop();

app-hd/controllers/RechargeSqController.php

@@ -34,23 +34,17 @@ class RechargeSqController extends BaseController
 
     public function actionGetRechargeData()
     {
-        $shopId = $this->shopId;
-        $shop = $this->shop;
-        $rechargeWeal = $shop->rechargeWeal ?? 0;
-        if ($rechargeWeal == 1) {
-            $arr = [];
-            $weal = RechargeSqClass::getAllByCondition(['shopId' => $shopId], 'recharge asc', '*', null, true);
-            if (!empty($weal)) {
-                foreach ($weal as $key => $val) {
-                    $recharge = $val->recharge ?? 0;
-                    $recharge = floatval($recharge);
-                    $give = $val->give ?? 0;
-                    $give = floatval($give);
-                    $arr[] = ['recharge' => $recharge, 'give' => $give];
-                }
+        $mainId = $this->mainId;
+        $arr = [];
+        $weal = RechargeSqClass::getAllByCondition(['mainId' => $mainId], 'recharge asc', '*', null, true);
+        if (!empty($weal)) {
+            foreach ($weal as $key => $val) {
+                $recharge = $val->recharge ?? 0;
+                $recharge = floatval($recharge);
+                $give = $val->give ?? 0;
+                $give = floatval($give);
+                $arr[] = ['recharge' => $recharge, 'give' => $give];
             }
-        } else {
-            $arr = dict::getDict('rechargeMap');
         }
         util::success(['recharge' => $arr]);
     }

app-hd/controllers/ShopCouponController.php

@@ -36,10 +36,7 @@ class ShopCouponController extends BaseController
     //有可用红包 ssh 2021.5.15
     public function actionHas()
     {
-        //不要考虑最低消费，把客户所有红包列出来，这样客户可以有选择的消费！！！！！！
-        $ghsId = Yii::$app->request->get('ghsId', 0);
-        $has = ShopCouponClass::hasValidCoupon($this->shopId, $ghsId);
-        $data = ['has' => $has];
+        $data = ['has' => 0];
         util::success($data);
     }
 

biz-hd/coupon/models/Coupon.php

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

biz-hd/coupon/models/CouponAsset.php

@@ -7,7 +7,7 @@ class CouponAsset extends Base
 	
 	public static function tableName()
 	{
-		return 'xhCouponAsset';
+		return 'xhHbAsset';
 	}
 	
 }

biz-hd/member/classes/MemberLevelClass.php

@@ -2,6 +2,7 @@
 
 namespace bizHd\member\classes;
 
+use common\components\dict;
 use Yii;
 use bizHd\base\classes\BaseClass;
 
@@ -10,4 +11,21 @@ class MemberLevelClass extends BaseClass
 
     public static $baseFile = '\bizHd\member\models\MemberLevel';
 
+    public static function initData($shop)
+    {
+        $mainId = $shop['mainId'];
+        $shopId = $shop['id'];
+        $has = self::getByCondition(['mainId' => $mainId], true);
+        if (!empty($has)) {
+            return true;
+        }
+        $map = dict::getDict('memberLevelMap');
+        foreach ($map as $k => $v) {
+            $v['mainId'] = $mainId;
+            $v['shopId'] = $shopId;
+            self::add($v);
+        }
+        return true;
+    }
+
 }

biz-hd/merchant/services/SjService.php

@@ -6,10 +6,12 @@ use bizGhs\custom\services\CustomService;
 use bizHd\base\services\BaseService;
 use bizHd\custom\classes\CustomClass;
 use bizHd\goods\classes\KindClass;
+use bizHd\member\classes\MemberLevelClass;
 use bizHd\merchant\classes\SjAssetClass;
 use bizHd\merchant\classes\SjClass;
 use bizHd\merchant\classes\SjExtendClass;
 use bizHd\merchant\classes\SjInitClass;
+use bizHd\recharge\classes\RechargeSqClass;
 use bizHd\saas\classes\ApplyClass;
 use bizHd\shop\classes\ShopClass;
 use bizHd\user\classes\UserClass;
@@ -169,6 +171,11 @@ class SjService extends BaseService
             KindClass::initKind($initKindData);
         }
 
+        //充值送钱初始化
+        RechargeSqClass::initData($shopInfo);
+        //会员等级初始化
+        MemberLevelClass::initData($shopInfo);
+
         return ['sj' => $sj, 'shop' => $shopInfo];
     }
 

biz-hd/promote/models/Coupon.php

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

biz-hd/promote/models/CouponAsset.php

@@ -7,7 +7,7 @@ class CouponAsset extends Base
 
 	public static function tableName()
 	{
-		return 'xhCouponAsset';
+		return 'xhHbAsset';
 	}
 	
 }

biz-hd/recharge/classes/RechargeSqClass.php

@@ -10,4 +10,27 @@ class RechargeSqClass extends BaseClass
 
     public static $baseFile = '\bizHd\recharge\models\RechargeSq';
 
+    public static function initData($shop)
+    {
+        $mainId = $shop['mainId'];
+        $shopId = $shop['id'];
+        $has = self::getByCondition(['mainId' => $mainId], true);
+        if (!empty($has)) {
+            return true;
+        }
+        $data = [
+            ['sn' => 1, 'recharge' => 500, 'give' => 0],
+            ['sn' => 2, 'recharge' => 1000, 'give' => 0],
+            ['sn' => 3, 'recharge' => 2000, 'give' => 0],
+            ['sn' => 4, 'recharge' => 5000, 'give' => 0],
+            ['sn' => 5, 'recharge' => 10000, 'give' => 0],
+        ];
+        foreach ($data as $item) {
+            $item['mainId'] = $mainId;
+            $item['shopId'] = $shopId;
+            self::add($item);
+        }
+        return true;
+    }
+
 }

biz-mall/coupon/models/Coupon.php

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

biz-mall/coupon/models/CouponAsset.php

@@ -7,7 +7,7 @@ class CouponAsset extends Base
 	
 	public static function tableName()
 	{
-		return 'xhCouponAsset';
+		return 'xhHbAsset';
 	}
 	
 }

biz-mall/promote/models/Coupon.php

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

biz-mall/promote/models/CouponAsset.php

@@ -7,7 +7,7 @@ class CouponAsset extends Base
 
 	public static function tableName()
 	{
-		return 'xhCouponAsset';
+		return 'xhHbAsset';
 	}
 	
 }

biz/shop/classes/ShopCouponClass.php

@@ -166,19 +166,7 @@ class ShopCouponClass extends BaseClass
     // 商家是否有可用红包
     public static function hasValidCoupon($shopId, $ghsId)
     {
-        $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)

common/components/book.php

@@ -30,8 +30,8 @@ class book
             ['title' => '零售开单，拆散登记', 'id' => 'skOrder'],
             ['title' => '用标签机，打标签和价码', 'id' => 'label'],
             ['title' => '大客户价的管理', 'id' => 'super_member'],
-            ['title' => '绑定多家跑腿和免配送设置', 'id' => 'bd_pt_set', 'style' => 'red'],
-            ['title' => '前台后台使用跑腿', 'id' => 'use_pt', 'style' => 'red'],
+            ['title' => '绑定多家跑腿和免配送设置', 'id' => 'bd_pt_set'],
+            ['title' => '前台后台使用跑腿', 'id' => 'use_pt'],
         ]],
         ['class' => '采购', 'icon' => '/book/stock.png', 'list' => [
             ['title' => '采购入库和改价格（重要）', 'id' => 'cg', 'style' => 'red'],

common/models/xhCoupon.php

@@ -7,7 +7,7 @@ class xhCoupon extends xhBaseModel
  
     public static function tableName()
     {
-        return 'xhCoupon';
+        return 'xhHb';
     }
 
 }

console/controllers/ShopExtController.php

@@ -4,25 +4,33 @@ namespace console\controllers;
 
 use biz\shop\classes\ShopClass;
 use biz\shop\classes\ShopExtClass;
+use bizHd\member\classes\MemberLevelClass;
+use bizHd\recharge\classes\RechargeSqClass;
+use bizHd\shop\models\Shop;
 use yii\console\Controller;
 use Yii;
 
 class ShopExtController extends Controller
 {
 
-    //补充门店拓展信息 ssh ./yii shop-ext/bc
     public function actionBc()
     {
-        $list = ShopClass::getAllByCondition([], null, '*', null, true);
-        if (!empty($list)) {
-            foreach ($list as $shop) {
-                $shopId = $shop->id;
-                $ext = ShopExtClass::getByCondition(['shopId' => $shopId]);
-                if (empty($ext)) {
-                    $extData = [
-                        'shopId' => $shopId
-                    ];
-                    ShopExtClass::add($extData);
+        ini_set('memory_limit', '2045M');
+        set_time_limit(0);
+
+        $query = new \yii\db\Query();
+        $query->from(Shop::tableName());
+
+        foreach ($query->batch(1000) as $batch) {
+            foreach ($batch as $shop) {
+                $mainId = $shop['mainId'] ?? 0;
+                $hasRecharge = RechargeSqClass::getByCondition(['mainId' => $mainId], true);
+                if (empty($hasRecharge)) {
+                    RechargeSqClass::initData($shop);
+                }
+                $hasLevel = MemberLevelClass::getByCondition(['mainId' => $mainId], true);
+                if (empty($hasLevel)) {
+                    MemberLevelClass::initData($shop);
                 }
             }
         }