字眼更改为幸福宝

app/command/TestTask.php

@@ -251,7 +251,7 @@ class TestTask extends Command
 
                 $resultArray = explode(",", $count[0]['uids']);
                 foreach ($resultArray as $reg_uid) {
-                    //查询储蓄保和上级
+                    //查询幸福宝和上级
                     $reg_user = Db::connect('chuxubao')->query("select * from chuxubao.rrx_user where uid={$reg_uid} and is_del=0")[0] ?? [];
                     if (!$reg_user) {
                         continue;
@@ -281,7 +281,7 @@ class TestTask extends Command
                             Db::name('user')->where('uid', $yihucha_user['uid'])->update(['spread_uid' => $yihucha_spread_user['uid']]);
                         } else if ($yihucha_user['spread_uid'] != $yihucha_spread_user['uid']) {
                             //暂时不作操作
-                            echo "{$reg_user['phone']}已注册，有邀请人并且邀请人不是储蓄保上级 需要注意 储蓄保邀请人{$reg_spread_user['phone']} 一壶茶邀请人{$yihucha_puser['phone']}\r\n";
+                            echo "{$reg_user['phone']}已注册，有邀请人并且邀请人不是幸福宝上级 需要注意 幸福宝邀请人{$reg_spread_user['phone']} 一壶茶邀请人{$yihucha_puser['phone']}\r\n";
                         }
                     }
                 }

app/command/test/ln/ImportUser.php

@@ -13,7 +13,7 @@ class ImportUser extends Command
     protected function configure()
     {
         // 指令配置
-        $this->setName('import_user')->setDescription('导入储蓄保一壶茶会员');
+        $this->setName('import_user')->setDescription('导入幸福宝一壶茶会员');
     }
 
     protected function execute(Input $input, Output $output)

app/command/test/ln/ImportUser2.php

@@ -12,7 +12,7 @@ class ImportUser2 extends Command
 {
     protected function configure()
     {
-        $this->setName('chuxubao')->setDescription('导入储蓄保数据');
+        $this->setName('chuxubao')->setDescription('导入幸福宝数据');
     }
 
     protected function execute(Input $input, Output $output)
@@ -74,7 +74,7 @@ class ImportUser2 extends Command
                     $yihucha_child_user = Db::name('user')->where('phone', $child_user['phone'])->where('is_del', 0)->find();
                     //子级用户信息为空，用父级uid覆盖
                     if (empty($yihucha_child_user['spread_uid'])) {
-                        $logs['step2'] = "一壶茶邀请关系为空, 父级用户uid, {$yihucha_father_user['uid']}, 父级用户手机号, {{$yihucha_father_user['phone']}}, 使用储蓄保邀请关系覆盖";
+                        $logs['step2'] = "一壶茶邀请关系为空, 父级用户uid, {$yihucha_father_user['uid']}, 父级用户手机号, {{$yihucha_father_user['phone']}}, 使用幸福宝邀请关系覆盖";
                         Db::name('user')->where('uid', $yihucha_child_user['uid'])->update(['spread_uid' => $yihucha_father_user['uid']]);
                     } else {
                         $yihucha_child_spread_user = Db::name('user')->where('uid', $yihucha_child_user['spread_uid'])->where('is_del', 0)->find();

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

@@ -1664,7 +1664,7 @@ class OrderMerchantRepository extends BaseRepository
 
         //商户得到的(京豆和贡献值奖励的倍，后台设置)
         $jd = bcmul($divisible_commission, $mer_jd, 2);
-        if ($jd >= 0.01) {
+        if ($jd >= 0.01) {  
             $jd_data = [
                 "uid"           =>$mer_data["uid"],
                 "mer_id"        =>$order["mer_id"],

app/common/repositories/store/order/StoreOrderRepository.php

@@ -7688,7 +7688,7 @@ class StoreOrderRepository extends BaseRepository
         $insterAll = array(
             'money' => $amount_queshao,
             'member_id' => '',
-            'mark' => '一壶茶应得 (' . set_price_rtrim(decimal2($amount_queshao + $amount_yihucha)) . ') 实得(' . set_price_rtrim($amount_yihucha) . ') 给了储蓄保(' . set_price_rtrim($amount_queshao) . ')',
+            'mark' => '一壶茶应得 (' . set_price_rtrim(decimal2($amount_queshao + $amount_yihucha)) . ') 实得(' . set_price_rtrim($amount_yihucha) . ') 给了幸福宝(' . set_price_rtrim($amount_queshao) . ')',
             'order_id' => $order_id
         );
 
@@ -8594,8 +8594,8 @@ class StoreOrderRepository extends BaseRepository
                 $_order = [
                     'commission_rate' => (float)$merchantRepository->get($cartInfo['mer_id'])->mer_commission_rate,
                     'order_type' => in_array($cartInfo['mer_id'], $takes) == 1 ? 1 : 0,
-                    'extension_one' => 0,
-                    'extension_two' => 0,
+                    'extension_one' => $cartInfo['list'][0]['productAttr']['extension_one'] ?? 0,
+                    'extension_two' => $cartInfo['list'][0]['productAttr']['extension_two'] ?? 0,
                     'orderInfo' => $cartInfo['order'],
                     'cartInfo' => $cartInfo['list'],
                     'order_sn' => $this->getNewOrderId() . ($k + 1),
@@ -9914,7 +9914,7 @@ class StoreOrderRepository extends BaseRepository
                     }
                     /** @var OrderMerchantRepository $orderMerchantRepository */
                     $orderMerchantRepository = app()->make(OrderMerchantRepository::class);
-                    $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_order_data['extension_two']);
+                    $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_order_data['extension_one']);
 
                     //商户获得贡献值  ---- 3月29日  商户不再获得贡献值 改为获得分润值
 //                    if ($concession_pri >= 0.01) {

app/common/repositories/store/product/ProductRepository.php

@@ -1081,7 +1081,7 @@ class ProductRepository extends BaseRepository
 
 
         $productDetails = array(
-            'name'     => $product ?? "储蓄保",//商品名称。需传递真实产品名称。
+            'name'     => $product ?? "幸福宝",//商品名称。需传递真实产品名称。
             'quantity' => 1,//商品数量
             'amount'   => strval($price * 100),//商品单价
         );

app/common/repositories/user/UserExtractRepository.php

@@ -451,7 +451,7 @@ class UserExtractRepository extends BaseRepository
                     'extract_price'=> $extract_price_yihu,
                     'service_money'=> $service_money_yihu,
                     'order_sn'=> $data['order_sn'],
-                    'type'=> 1,//0- 储蓄保 1-一壶茶
+                    'type'=> 1,//0- 幸福宝 1-一壶茶
                 );
 //                    }
                 $insertAll[]=array(
@@ -461,7 +461,7 @@ class UserExtractRepository extends BaseRepository
                     'extract_price'=> ($data['extract_price']-$extract_price_yihu),
                     'service_money'=> ($data['service_money']-$service_money_yihu),
                     'order_sn'=> $data['order_sn'],
-                    'type'=> 0,//0- 储蓄保 1-一壶茶
+                    'type'=> 0,//0- 幸福宝 1-一壶茶
                 );
                 DB::name('user_extract_item')->insertAll($insertAll);
 
@@ -908,11 +908,11 @@ class UserExtractRepository extends BaseRepository
             $aop->isCheckAlipayPublicCert = true;
             $order_title='提现';
             if($userdata['withdrawal_type']==1){
-                $order_title='储蓄保提现';
+                $order_title='幸福宝提现';
                 $userdata['extract_price']=bcsub($userdata['extract_price'],$userdata['service_money']);
             }elseif($userdata['withdrawal_type']==2){
                 $mer_name=Db::name('merchant')->where('mer_id',$userdata['mer_id'])->value('mer_name');
-                $order_title='储蓄保-'.$mer_name.'提现';
+                $order_title='幸福宝-'.$mer_name.'提现';
                 $userdata['extract_price']=bcsub($userdata['extract_price'],$userdata['service_money']);
             }
 //            Db::name('log')->insert(['data'=>'AopCertClient']);

app/common/repositories/user/UserRepository.php

@@ -2377,11 +2377,11 @@ class UserRepository extends BaseRepository
 
                 if($v['source'] == 0){
                     if($v['commission_type'] == 9){
-                        $this -> getContent('channel_order',$v['order_sn'],'储蓄保',$v['status'],$v['commission_type'],$v);
+                        $this -> getContent('channel_order',$v['order_sn'],'幸福宝',$v['status'],$v['commission_type'],$v);
                     }elseif($v['commission_type'] == 10){
-                        $this -> getContent('merchant_annual_cost_order',$v['order_sn'],'储蓄保',$v['status'],$v['commission_type'],$v);
+                        $this -> getContent('merchant_annual_cost_order',$v['order_sn'],'幸福宝',$v['status'],$v['commission_type'],$v);
                     }else{
-                        $this -> getContent('store_order',$v['order_sn'],'储蓄保',$v['status'],$v['commission_type'],$v,$v['create_time']);
+                        $this -> getContent('store_order',$v['order_sn'],'幸福宝',$v['status'],$v['commission_type'],$v,$v['create_time']);
                     }
                 }else{
                     $uid=Db::name("store_order")->where("order_sn",$v["order_sn"])->value("uid");
@@ -2667,7 +2667,7 @@ class UserRepository extends BaseRepository
                     $v['title']='人工减少佣金';
                 }
             }else{
-                $v['title']='储蓄保-佣金提现';
+                $v['title']='幸福宝-佣金提现';
             }
             if($v['bank_info']!=''){
                 $bank_info=json_decode($v['bank_info'],true);
@@ -2703,7 +2703,7 @@ class UserRepository extends BaseRepository
                     $v['title']='人工减少佣金';
                 }
             }else{
-                $v['title']='储蓄保-佣金提现';
+                $v['title']='幸福宝-佣金提现';
             }
             if($v['bank_info']!=''){
                 $bank_info=json_decode($v['bank_info'],true);

app/controller/api/Auth.php

@@ -1415,7 +1415,7 @@ class Auth extends BaseController
             if(empty($sessionKey['sessionKey'])||empty($encryptedData['encryptedData'])||empty($iv['iv'])){
                 return app('json')->fail('参数不正确');
             }
-            $appid = 'wx9082e5ac2fdb513f';//储蓄保小程序appid
+            $appid = 'wx9082e5ac2fdb513f';//幸福宝小程序appid
             if($this->source=='yhc'){
                 $appid = 'wx9082e5ac2fdb513f';//一壶茶小程序appid
             }

app/controller/api/Notify.php

@@ -682,7 +682,7 @@ class Notify
                                         }
                                         /** @var OrderMerchantRepository $orderMerchantRepository */
                                         $orderMerchantRepository = app()->make(OrderMerchantRepository::class);
-                                        $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_order_data['extension_two']);
+                                        $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_order_data['extension_one']);
 
                                         //商户获得贡献值  ---- 3月29日  商户不再获得贡献值 改为获得分润值
                     //                    if ($concession_pri >= 0.01) {

app/controller/api/entropybarter/User.php

@@ -95,12 +95,12 @@ class User extends BaseController
     /**
      * @param $uid
      * @param $spread_uid
-     * 绑定储蓄保的关系
+     * 绑定幸福宝的关系
      */
     public function cxb_bangding($uid,$spread_uid)
     {
         $spread_uid_user=Db::name('user')->where('uid',$uid)->value('spread_uid');
-        Db::name('log')->insert(['data'=>'绑定储蓄保的关系进来了他的上级ID'.$spread_uid_user]);
+        Db::name('log')->insert(['data'=>'绑定幸福宝的关系进来了他的上级ID'.$spread_uid_user]);
         if($spread_uid_user==0){
             Db::name('user')->where('uid',$uid)->update(['spread_uid'=>$spread_uid]);
         }

app/controller/api/merchant/sxy/Access.php

@@ -736,7 +736,7 @@ class Access
             $groupOrder = Db::name('order_huafei_hf')->where('order_id', (int)$oid)->find();
             if (!$groupOrder) return app('json')->fail('订单不存在或已支付');
 
-            $res = $this->pay_huifu($type,$code,$groupOrder,"储蓄保",env('APP_URL')."/api/hf_notify/huafei",'delay');
+            $res = $this->pay_huifu($type,$code,$groupOrder,"幸福宝",env('APP_URL')."/api/hf_notify/huafei",'delay');
             Db::name('log')->insert(['data'=>'汇付话费订单支付--- 返回参数'.json_encode($res)]);
             if (isset($res['id'])) {
                 return app('json')->success($res);
@@ -836,7 +836,7 @@ class Access
                     ->where(["sc.cart_id"=>$cart_id])
                     ->value('sp.store_name');
             }
-            $res = $this -> pay_huifu($type,$code,$groupOrder,$product ?? "储蓄保",env('APP_URL')."/api/hf_notify/pay",'delay');
+            $res = $this -> pay_huifu($type,$code,$groupOrder,$product ?? "幸福宝",env('APP_URL')."/api/hf_notify/pay",'delay');
             Db::name('log')->insert(['data'=>'汇付订单支付--- 返回参数'.json_encode($res)]);
             if (isset($res['id'])) {
                 Db::name('store_group_order')->where('group_order_id', $oid)->update(['hf_pay_id' => $res['id'],'pay_wx'=>systemConfig('pay_wx')]);
@@ -881,7 +881,7 @@ class Access
             Db::name("log")->insert(array('data'=>Db::name("store_product")->getLastSql()));//日志记录
 
             $productDetails = array(
-                'name' => $product ?? "储蓄保",//商品名称。需传递真实产品名称。
+                'name' => $product ?? "幸福宝",//商品名称。需传递真实产品名称。
                 'quantity' => 1,//商品数量
                 'amount' => strval($groupOrder['pay_price'] * 100),//商品单价
             );
@@ -942,7 +942,7 @@ class Access
                     ->where(["sc.cart_id"=>$cart_id])
                     ->value('sp.store_name');
             }
-            $res = $this -> pay_huifu($type,$code,$groupOrder,$product ?? "储蓄保",env('APP_URL')."/api/hf_notify/pay",'delay');
+            $res = $this -> pay_huifu($type,$code,$groupOrder,$product ?? "幸福宝",env('APP_URL')."/api/hf_notify/pay",'delay');
             Db::name('log')->insert(['data'=>'汇付订单支付--- 返回参数'.json_encode($res)]);
             if (isset($res['id'])) {
                 Db::name('store_group_order')->where('group_order_id', $oid)->update(['hf_pay_id' => $res['id'],'pay_wx'=>systemConfig('pay_wx')]);
@@ -987,7 +987,7 @@ class Access
             Db::name("log")->insert(array('data'=>Db::name("store_product")->getLastSql()));//日志记录
 
             $productDetails = array(
-                'name' => $product ?? "储蓄保",//商品名称。需传递真实产品名称。
+                'name' => $product ?? "幸福宝",//商品名称。需传递真实产品名称。
                 'quantity' => 1,//商品数量
                 'amount' => strval($groupOrder['pay_price'] * 100),//商品单价
             );
@@ -1064,8 +1064,8 @@ class Access
                 'app_id'=>$app_id,
                 'pay_channel'=>$pay_channel,
                 'pay_amt'=>strval($groupOrder['pay_price']),//金额。,
-                'goods_title'=>$product ?? "储蓄保",
-                'goods_desc'=>$product ?? "储蓄保",
+                'goods_title'=>$product ?? "幸福宝",
+                'goods_desc'=>$product ?? "幸福宝",
                 'device_info'=>[
                     'device_ip'=>app('request')->ip()
 //                    'device_ip'=>'115.171.134.68'
@@ -1094,8 +1094,8 @@ class Access
                 'app_id'=>$app_id,
                 'pay_channel'=>$pay_channel,
                 'pay_amt'=>strval($groupOrder['pay_price']),//金额。,
-                'goods_title'=>$product ?? "储蓄保",
-                'goods_desc'=>$product ?? "储蓄保",
+                'goods_title'=>$product ?? "幸福宝",
+                'goods_desc'=>$product ?? "幸福宝",
                 'device_info'=>[
                     'device_ip'=>app('request')->ip()
 //                    'device_ip'=>'115.171.134.68'
@@ -1208,7 +1208,7 @@ class Access
             Db::name("log")->insert(array('data'=>Db::name("store_product")->getLastSql()));//日志记录
 
             $productDetails = array(
-                'name' => $product ?? "储蓄保年费",//商品名称。需传递真实产品名称。
+                'name' => $product ?? "幸福宝年费",//商品名称。需传递真实产品名称。
                 'quantity' => 1,//商品数量
                 'amount' => strval($groupOrder['pay_price'] * 100),//商品单价
             );

app/controller/api/store/product/StoreProduct.php

@@ -251,7 +251,7 @@ class StoreProduct extends BaseController
     //生成邀请小程序码
     public function invite_code(){
         $uid = $this->request->param('uid',0);
-        $type = 0;//0-储蓄保 1-国盛 2-一壶茶
+        $type = 0;//0-幸福宝 1-国盛 2-一壶茶
         $imgId = $this->request->param('imgId',0);
 
         //删除老数据
@@ -556,7 +556,7 @@ class StoreProduct extends BaseController
                         'angle' => 0,
                     ),
                     array(
-                        'text' => '加入储蓄保，一起攒攒攒',
+                        'text' => '加入幸福宝，一起攒攒攒',
                         'left' => 400,
                         'top' => 1200,
                         'fontPath' => $filelink['Normal'],     //字体文件

app/controller/api/user/Im.php

@@ -305,7 +305,7 @@ class Im
      * 加群
      * @param $group_id string 群组id
      * @param $user_id string 环信用户id
-     * @param $uid int 储蓄保用户id
+     * @param $uid int 幸福宝用户id
      */
     public function createGroupUser($group_id, $user_id, $uid)
     {

app/controller/api/user/User.php

@@ -218,12 +218,10 @@ class User extends BaseController
         $where['uid'] = $uid;
 
         if ($pm==0){
-
             $data = DB::name('user_sign_hongbao')->where($where)->where('type',1)->where('status',1)->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==1){
             $data = DB::name('user_sign_hongbao')->where($where)->where(['type' => 2,'status' => 1])->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
         }
         if($pm==2){
             $data = DB::name('user_sign_hongbao')->where($where)->where('type',1)->where([['status','in','-1,0']])->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
@@ -3257,7 +3255,7 @@ class User extends BaseController
                 'app_id'      => $app_id,
                 'pay_channel' => $pay_channel,
                 'pay_amt'     => (string)$order['pay_price'],
-                'goods_title' => "储蓄保",
+                'goods_title' => "幸福宝",
                 'goods_desc'  => $title,
                 'device_info' => [
                     'device_ip' => app('request')->ip()
@@ -3628,7 +3626,7 @@ class User extends BaseController
                     'surplus' => $vr,
                     'mark' => '红包转VR',
                     'type' => 2,
-                    'status' => 0,
+                    'status' => 1,
                     'addtime' => time(),
                 ];
                 Db::name('user_sign_hongbao')->insertGetId($insertdata);