commit

app/api/controller/many/ManyController.php

@@ -96,12 +96,12 @@ class ManyController
                 $user['white_integral'] = 0;
                 $user['purple_integral'] -= ($data['price'] - $white);
                 if ($white > 0){
-                    UserBill::expend('扣除白积分', $user['uid'], 'white_integral', 'bet_white_integral', $white, 0,0,'使用白积分,参与打怪-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
+                    UserBill::expend('扣除红积分', $user['uid'], 'white_integral', 'bet_white_integral', $white, 0,0,'使用红积分,参与打怪-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
                 }
                 UserBill::expend('扣除紫积分', $user['uid'], 'purple_integral', 'bet_purple_integral', $data['price']-$white, 0,$user['purple_integral'],'使用紫积分,参与打怪-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
             }else{
                 $user['white_integral'] -= $data['price'];
-                UserBill::expend('扣除白积分', $user['uid'], 'white_integral', 'bet_white_integral', $data['price'], 0,$user['white_integral'],'使用白积分,参与打怪-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
+                UserBill::expend('扣除红积分', $user['uid'], 'white_integral', 'bet_white_integral', $data['price'], 0,$user['white_integral'],'使用红积分,参与打怪-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
             }
             $many['number'] += $data['price'];
             if ($many['number'] >= $many['money']){

app/models/store/StoreOrder.php

@@ -1308,7 +1308,7 @@ class StoreOrder extends BaseModel
             $userInfo = User::getUserInfo($order['uid']);
             BaseModel::beginTrans();
             $res1 = false != User::where('uid', $userInfo['uid'])->update(['white_integral' => bcadd($userInfo['white_integral'], $order['white_integral'], 2)]);
-            $res2 = false != UserBill::income('购买商品赠送白积分', $order['uid'], 'white_integral', 'gain', $order['white_integral'], $order['id'], $userInfo['white_integral'], '购买商品赠送' . floatval($order['white_integral']) . '白积分');
+            $res2 = false != UserBill::income('购买商品赠送红积分', $order['uid'], 'white_integral', 'gain_white_integral', $order['white_integral'], $order['id'], bcadd($userInfo['white_integral'], $order['white_integral'], 2), '购买商品赠送' . floatval($order['white_integral']) . '红积分');
             $res = $res1 && $res2;
             BaseModel::checkTrans($res);
             return $res;
@@ -1331,7 +1331,7 @@ class StoreOrder extends BaseModel
             $userInfo = User::getUserInfo($order['uid']);
             BaseModel::beginTrans();
             $res1 = false != User::where('uid', $userInfo['uid'])->update(['business_integral' => bcadd($userInfo['business_integral'], $order['business_integral'], 2)]);
-            $res2 = false != UserBill::income('购买商品赠送白积分', $order['uid'], 'business_integral', 'gain', $order['business_integral'], $order['id'], $userInfo['business_integral'], '购买商品赠送' . floatval($order['business_integral']) . '商家积分');
+            $res2 = false != UserBill::income('购买商品赠送喜嗨积分', $order['uid'], 'business_integral', 'gain_business_integral',$order['business_integral'], $order['id'], bcadd($userInfo['business_integral'], $order['business_integral'], 2), '购买商品赠送' . floatval($order['business_integral']) . '喜嗨积分');
             $res = $res1 && $res2;
             BaseModel::checkTrans($res);
             return $res;