修复金额显示 修复赠送累加

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -1353,7 +1353,9 @@ class OrderMerchantRepository extends BaseRepository
                 'settlement_time' => date('Y-m-d H:i:s')
             ];
             Db::name("user_sign_hongbao")->insert($hongbao_data);//添加记录
-            Db::name('user')->where('uid', $order["uid"])->inc('hongbao', (float)$hongbao)->update();
+            $user_hongbao = Db::name('user')->where('uid', $order["uid"])->value('hongbao');
+            $user_hongbao = bcadd($user_hongbao, (float)$hongbao,2);
+            Db::name('user')->where('uid', $order["uid"])->update(['hongbao'=>$user_hongbao]);
         }
 
         ///用户可以拿到PV等值的积分和贡献值
@@ -1373,7 +1375,9 @@ class OrderMerchantRepository extends BaseRepository
             $ins_data['order_type'] = $order_id;
             $ins_data['settlement_time'] = date('Y-m-d H:i:s');
             Db::name('user_sign_score')->insertGetId($ins_data);
-            Db::name('user')->where('uid', $order["uid"])->inc('score', (float)$pv)->update();
+            $user_score = Db::name('user')->where('uid', $order["uid"])->value('score');
+            $user_score = bcadd($user_score, (float)$pv,2);
+            Db::name('user')->where('uid', $order["uid"])->update(['score'=>$user_score]);
             //贡献值
             $gongxian_data = [
                 "uid"           =>$order["uid"],
@@ -1389,7 +1393,9 @@ class OrderMerchantRepository extends BaseRepository
                 'settlement_time' => date('Y-m-d H:i:s')
             ];
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
-            Db::name('user')->where('uid', $order["uid"])->inc('contribute', (float)$pv)->update();
+            $user_contribute = Db::name('user')->where('uid', $order["uid"])->value('contribute');
+            $user_contribute = bcadd($user_contribute, (float)$pv,2);
+            Db::name('user')->where('uid', $order["uid"])->update(['contribute'=>$user_contribute]);
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，积分和贡献值低于0.01无法入库 特此记录！']);
         }
@@ -1437,7 +1443,9 @@ class OrderMerchantRepository extends BaseRepository
                 'addtime'=>time(),
             ];
             Db::name('user_sign_fugou')->insert($bill);
-            Db::name('user')->where('uid', $order["uid"])->inc('fugou', (float)$tuijian_fugou)->update();
+            $user_fugou = Db::name('user')->where('uid', $top_data["spread_uid"])->value('fugou');
+            $user_fugou = bcadd($user_fugou, (float)$tuijian_fugou,2);
+            Db::name('user')->where('uid', $top_data["spread_uid"])->update(['fugou'=>$user_fugou]);
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的复购金比例较低，复购金低于0.01无法入库 特此记录！']);
         }
@@ -1511,7 +1519,7 @@ class OrderMerchantRepository extends BaseRepository
                 "type"          =>1
             ];
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
-            $merchant_user->contribute = $merchant_user->contribute + $pv;
+            $merchant_user->contribute = bcadd($merchant_user->contribute, (float)$gongxian,2);
             $merchant_user->save();
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
@@ -1533,7 +1541,7 @@ class OrderMerchantRepository extends BaseRepository
                 "surplus"       =>$jd,
                 "type"          =>1
             ];
-            $merchant_user->jingdou = $merchant_user->jingdou + $pv;
+            $merchant_user->jingdou = bcadd($merchant_user->jingdou, (float)$jd,2);
             $merchant_user->save();
             Db::name("user_sign_jingdou")->insert($jd_data);//添加记录
         } else {

app/controller/api/Auth.php

@@ -748,7 +748,8 @@ class Auth extends BaseController
         $data['vr']=set_price_rtrim($data['vr']);//购物金
         $data['hongbao']=set_price_rtrim($data['hongbao']);//红包
         $data['fugou']=set_price_rtrim($data['fugou']);//复购金
-        //$data['brokerage_price']=set_price_rtrim($data['brokerage_price']);//养老金
+        $data['brokerage_price']=set_price_rtrim($data['brokerage_price']);//养老金
+        $data['annuity'] = set_price_rtrim($data['annuity']);//养老金
         $a = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',3) -> where('status',0) -> sum('number');
         $b = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',3) -> where('status',1) -> sum('number');
         // $data['brokerage_price'] = $a +$b;