Merge branch 'master' of https://git.bjtdba.com/shop/php

app/common/repositories/user/UserRepository.php

@@ -963,8 +963,7 @@ class UserRepository extends BaseRepository
 //            Queue::push(SendNewPeopleCouponJob::class, $user->uid);
 
             //赠送积分 注册送30积分
-            $this->sign_add($user['uid'], 10,1,'注册送30积分','','', '', 1, '', 1);
-
+            $this->sign_add($user['uid'], 30,1,'注册送30积分','','', '', 1, '', 1);
             Db::commit();
             return $user;
         } catch (\Exception $e) {
@@ -1536,8 +1535,11 @@ class UserRepository extends BaseRepository
                 //     //首次邀请好友奖励积分
                 //     $this -> sign_add($spreadUid,systemConfig('first_yq_score'),1,'首次邀请好友奖励积分','','');
                 // }
-                // //邀请好友奖励积分
-                // $this -> sign_add($spreadUid,systemConfig('invitation'),1,'邀请好友注册奖励积分','','');
+                //邀请好友奖励积分
+                // $this->sign_add($spreadUid,systemConfig('invitation'),1,'邀请好友注册奖励积分','','');
+                //邀请好友奖励积分
+                $this->sign_add($spreadUid, 30,1,'邀请好友注册奖励积分','','', '', 1, '', 1);
+
                 $user->spread_uid = $spreadUid;
                 $user->spread_time = date('Y-m-d H:i:s');
                 if($spreadUid){

app/controller/api/Notify.php

@@ -54,6 +54,7 @@ class Notify
                                     'rand'=>$requestId[1],
                                     'pay_type'=>$pay_type,
                                     'pay_wx'=>systemConfig('pay_wx'),
+                                    'app_id'=>$post['app_id'],
                                     'payment_id'=>$post_data_str['id'],
                                     'reverse_amt'=>$post_data_str['pay_amt'],
                                     'status'=>1

app/controller/api/store/service/Huafei.php

@@ -6,6 +6,7 @@ use think\App;
 use think\facade\Db;
 use crmeb\basic\BaseController;
 use app\common\repositories\user\UserThirdRepository;
+use app\common\repositories\store\order\StoreRefundOrderRepository;
 
 class Huafei extends BaseController
 {
@@ -74,6 +75,25 @@ class Huafei extends BaseController
 				}
 
 				if($param['status'] == 3) {
+					$order_data = Db::name('order_huafei_hf')->where('order_no', $order_no)->find();
+					$pay_wx = systemConfig('pay_wx');
+					//推送失败 给新支付的这一笔退款
+					Db::name('log')->insert(['data' => '给新话费充值支付的这一笔退款']);
+					if ($pay_wx == 3){
+						$key='api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
+					}else{
+						$key='api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
+					}
+					$refund_traits = [
+						'payment_id'  => $order_data['payment_id'],
+						'app_id'      => $order_data['app_id'],
+						'order_no'    => app()->make(StoreRefundOrderRepository::class)->getNewOrderId(),
+						'reverse_amt' => $order_data['reverse_amt'],
+						'notify_url'  => env('APP_URL') . "/api/hf_notify/reverse_order",
+					];
+					$hf_refund_res = app()->make(StoreRefundOrderRepository::class)->payment_Reverse($refund_traits, $order_data['pay_type'] == '1' ? 2 : 1, $pay_wx, $key);
+					Db::name('log')->insert(['data'=>'话费充值汇付支付撤销返回结果：'.json_encode($hf_refund_res)]);
+
 					//把赠送出去的养老金 积分 贡献值 复购金 改为已失效
 					Db::name('user_bill')->where('order_sn', $huafeiInfo['order_no'])->update(['status'=> -1]);
 					Db::name('user_sign_score')->where('order_id', $huafeiInfo['order_no'])->update(['status'=> 0]);