话费功能更改

app/common/repositories/user/UserRepository.php

@@ -2616,7 +2616,7 @@ class UserRepository extends BaseRepository
                     if(empty($item['product'])){
                         $item['product']=[
                             'product'=>[
-                                'image'=>'http://app.bjtdba.com/uploads/def/20210326/e91a34629fefb65170071c2d45a623ac.jpg',
+                                'image'=>'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png',
                                 'store_name'=>'商家年费'
                             ]
                         ];

app/controller/api/Notify.php

@@ -63,7 +63,7 @@ class Notify
                             }
                             //话费充值支付成功推送
                             try{
-                                $push = app()->make(Huafei::class)->pushHf($order_data['uid'], $order_data['order_no'], $order_data['mobile'], $order_data['pay_price']);
+                                $push = app()->make(Huafei::class)->pushHf($order_data['uid'], $order_data['order_no'], $order_data['mobile'], $order_data['pay_price'], $order_data['order_id']);
                                 if($push['code'] != '0000'){
                                     $pay_wx = systemConfig('pay_wx');
                                     //推送失败 给新支付的这一笔退款
@@ -82,6 +82,11 @@ class Notify
                                     ];
                                     $hf_refund_res = app()->make(StoreRefundOrderRepository::class)->payment_Reverse($refund_traits, $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', $order_data['order_no'])->update(['status'=> -1]);
+                                    Db::name('user_sign_score')->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
+                                    Db::name('user_sign_gongxian')->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
+                                    Db::name('user_sign_fugou')->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
                                 }
                             }catch (\Exception $e) {
                                 Db::name('log')->insert(['data'=>'话费充值支付回调推送订单错误：'.$e->getFile().'：'.$e->getLine().'【'.$e->getMessage().'】']);

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

@@ -46,31 +46,39 @@ class Huafei extends BaseController
 			$ret = Db::name("order_huafei")->where("order_sn", $order_no)->update($updateData);
 			if($ret){
 				if($param['status'] == 2) {
-					//判断数据库有无此订单
-					$type_shop = 9;
-					$orderThird = app()->make(UserThirdRepository::class);
-					//预估养老金
-					$orderThird->yuguOrder(
-						$huafeiInfo['order_huafei_id'],
-						$huafeiInfo['commission'],
-						$huafeiInfo['uid'],
-						$huafeiInfo['order_sn'],
-						$type_shop,
-						'order_huafei');
-					//预估积分
-					$orderThird->yuguJifen(
-						$huafeiInfo['commission'] ,
-						$huafeiInfo['uid'],
-						$huafeiInfo['order_sn'],
-						$type_shop
-					);	
-					//复购金
-					$orderThird->yuguFugou(
-						$huafeiInfo['commission'] ,
-						$huafeiInfo['uid'],
-						$huafeiInfo['order_sn'],
-						$type_shop
-					);	
+					// //判断数据库有无此订单
+					// $type_shop = 9;
+					// $orderThird = app()->make(UserThirdRepository::class);
+					// //预估养老金
+					// $orderThird->yuguOrder(
+					// 	$huafeiInfo['order_huafei_id'],
+					// 	$huafeiInfo['commission'],
+					// 	$huafeiInfo['uid'],
+					// 	$huafeiInfo['order_sn'],
+					// 	$type_shop,
+					// 	'order_huafei');
+					// //预估积分
+					// $orderThird->yuguJifen(
+					// 	$huafeiInfo['commission'] ,
+					// 	$huafeiInfo['uid'],
+					// 	$huafeiInfo['order_sn'],
+					// 	$type_shop
+					// );	
+					// //复购金
+					// $orderThird->yuguFugou(
+					// 	$huafeiInfo['commission'] ,
+					// 	$huafeiInfo['uid'],
+					// 	$huafeiInfo['order_sn'],
+					// 	$type_shop
+					// );	
+				}
+
+				if($param['status'] == 3) {
+					//把赠送出去的养老金 积分 贡献值 复购金 改为已失效
+					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]);
+					Db::name('user_sign_gongxian')->where('order_id', $huafeiInfo['order_no'])->update(['status'=> 0]);
+					Db::name('user_sign_fugou')->where('order_id', $huafeiInfo['order_no'])->update(['status'=> 0]);
 				}
 	
 				echo 'success';
@@ -121,7 +129,7 @@ class Huafei extends BaseController
 		try{
 			$order_no = $this->request->param('order_no');
 			$order_data = Db::name('order_huafei_hf') -> where('order_no', $order_no)->find();
-			$RES = $this->pushHf($order_data['uid'], $order_data['order_no'], $order_data['mobile'], $order_data['pay_price']);
+			$RES = $this->pushHf($order_data['uid'], $order_data['order_no'], $order_data['mobile'], $order_data['pay_price'], $order_data['order_id']);
 			return app('json')->success('充值话费推送补发成功', $RES);
 		}catch (\Exception $e) {
 			Db::name('log')->insert(['data'=>'充值话费推送补发错误：'.$e->getFile().'：'.$e->getLine().'【'.$e->getMessage().'】']);
@@ -163,7 +171,35 @@ class Huafei extends BaseController
 
 
 	//话费充值推送
-	public function pushHf($uid, $order_sn, $phone, $money){
+	public function pushHf($uid, $order_sn, $phone, $money, $order_id = 0){
+
+		$commissionMoney = $money*0.04;
+		//判断数据库有无此订单
+		$type_shop = 9;
+		$orderThird = app()->make(UserThirdRepository::class);
+		//预估养老金
+		$orderThird->yuguOrder(
+			$order_id,
+			$commissionMoney,
+			$uid,
+			$order_sn,
+			$type_shop,
+			'order_huafei');
+		//预估积分&贡献值
+		$orderThird->yuguJifen(
+			$commissionMoney,
+			$uid,
+			$order_sn,
+			$type_shop
+		);						
+		//复购金
+		$orderThird->yuguFugou(
+			$commissionMoney,
+			$uid,
+			$order_sn,
+			$type_shop
+		);	
+
 		//推送订单
 		$push = $this->pushOrder($order_sn, $phone, $money);
 		Db::name('log')->insert(['data'=>'话费充值推送订单返回数据'.json_encode($push)]);
@@ -223,7 +259,7 @@ class Huafei extends BaseController
         $list = $query->page($page, $limit)->where($where)->select()->each(function ($item){
             return $item;
         });
-		return app('json')->success('获取话费充值记录成功', ['list'=>$list, 'count'=>$count]);
+		return app('json')->success('获取话费充值记录成功', ['list'=>$list, 'count'=>$count, 'uid'=>$uid]);
 	}