Merge branch 'master' into dev

biz-hd/custom/classes/CustomClass.php

@@ -244,6 +244,7 @@ class CustomClass extends BaseClass
 
         //成长值变动记录
          $growthData = [
+             'shopId' => $shopId,
              'userId' => $custom->userId,
              'userName' => $custom->name,
              'event' => "管理员变更{$memberName}级，成长值从{$oldGrowth}变更为{$growth}",

biz-hd/recharge/classes/RechargeClass.php

@@ -475,12 +475,12 @@ class RechargeClass extends BaseClass
         $growthData = [
             'shopId' => $shopId,
             'userId' => $custom->userId,
-            'userName' => '',
+            'userName' => $custom->name,
             'event' => $event,
             'relateId' => $relateId,
             'relateType' => 0,
             'num' => $balancePay,
-            'growth' => $balancePay,
+            'growth' => $custom->growth,
             'staffId' => $staffId, //操作人（员工id）
             'staffName' => $staffName, //员工名称
             'createTime' => $createTime,
@@ -491,12 +491,12 @@ class RechargeClass extends BaseClass
         $integralData = [
             'shopId' => $shopId,
             'userId' => $custom->userId,
-            'userName' => '',
+            'userName' => $custom->name,
             'event' => $event,
             'relateId' => $relateId,
             'relateType' => 0,
             'num' => $balancePay,
-            'integral' => $balancePay,
+            'integral' => $custom->integral,
             'staffId' => $staffId, //操作人（员工id）
             'staffName' => $staffName, //员工名称
             'createTime' => $createTime,

console/controllers/CustomController.php

@@ -9,6 +9,7 @@ use bizHd\custom\classes\CustomClass;
 use bizHd\custom\classes\HdClass;
 use bizHd\member\classes\MemberLevelClass;
 use bizHd\purchase\classes\PurchaseClass;
+use common\components\dict;
 use common\components\noticeUtil;
 use common\components\util;
 use bizHd\user\classes\UserClass;
@@ -174,18 +175,25 @@ class CustomController extends Controller
                         continue;
                     }
 
-                    $customs = CustomClass::getAllByCondition(['shopId' => $shopId], null, 'id, userId, buyAmount, growth, member, memberName', null, true);
+                    $customs = CustomClass::getAllByCondition(['shopId' => $shopId], null, 'id, userId, balance, buyAmount, growth, integral, member, memberName', null, true);
                     $levelDatas = MemberLevelClass::getAllByCondition(['mainId' => $mainId], 'amount DESC', 'id, name, level, amount');
                     if (!empty($customs) && !empty($levelDatas)) {
                         foreach ($customs as $c) {
                             $buyAmount = 0;
+                            $integral = 0;
                             // 获取所有零售订单，计算消费金额
-                            $orderList = \bizHd\order\classes\OrderClass::getAllByCondition(['customId' => $c->id], null, 'id, forward, actPrice');
+                            $orderList = \bizHd\order\classes\OrderClass::getAllByCondition(['customId' => $c->id], null, 'id, forward, actPrice, payWay');
                             if (!empty($orderList)) {
                                 foreach ($orderList as $order) {
                                     if ($order['forward'] == 0) { //0 常规订单
+                                        if ($order['payWay'] == dict::getDict('payWay', 'balancePay')) {
+                                            // 余额支付不计算积分与成长值
+                                        } else {
+                                            $integral = bcadd($integral, $order['actPrice'], 2);
+                                        }
                                         $buyAmount = bcadd($buyAmount, $order['actPrice'], 2);
                                     } elseif ($order['forward'] == 1) { //1 售后付款单(红冲)
+                                        $integral = bcsub($integral, $order['actPrice'], 2);
                                         $buyAmount = bcsub($buyAmount, $order['actPrice'], 2);
                                     } else {
                                         Yii::info('订单类型不存在,订单ID:' . $order['id']);
@@ -194,8 +202,8 @@ class CustomController extends Controller
                                 }
                             }
                             $c->buyAmount = $buyAmount;
-                            $c->growth = $buyAmount;
-                            $c->integral = $buyAmount;
+                            $c->growth = $integral + $c->balance;
+                            $c->integral = $integral  + $c->balance;
 
                             // 根据 growth 设置等级
                             $memberData = CustomClass::getCustomExpenseLevel($c->growth, $mainId, $levelDatas); // 设置等级多处需要同步修改的，请搜索：getCustomExpenseLevel
@@ -217,7 +225,6 @@ class CustomController extends Controller
 
         // 脚本执行完之后，清除缓存
         Yii::$app->redis->executeCommand('DEL', [$redisKey]);
-
     }
 
     //批量创建客户