Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop

app/AdminAgent/Extensions/Grid/AuditRefund.php

@@ -85,7 +85,7 @@ class AuditRefund extends RowAction
 			// 参数分别为：微信订单号、商户退款单号、订单金额、退款金额、其他参数
 			foreach ($log as $k=>$v) {
 				$refund_no = $order->refund_info['refund_no'] . '-' . $v['id'];
-				$money = intval(0 - $v->money * 100);
+				$money = intval($v->money * 100);
 				$result = $app->refund->byTransactionId($v->transaction_id, $refund_no, $money, $money);
 
 				//存入UserMoneyLog

app/Http/Controllers/Api/AgentInfoController.php

@@ -11,7 +11,7 @@ class AgentInfoController extends Controller
 {
     public function info()
 	{
-		$type = request()->route('type');;
+		$type = request()->route('type');
 		//关于我们、注册协议、购买协议
 		if (!in_array($type, ['about', 'reg_protocol', 'buy_protocol'])) {
 			return $this->error('参数无效');

app/Http/Controllers/Api/WxpayController.php

@@ -115,7 +115,7 @@ class WxpayController
 							UserMoneyLog::query()->create([
 								'user_id' => $order->user_id,
 								'agent_id' => $order->agent_id,
-								'money' => -$money,
+								'money' => $money,
 								'order_id' => $order->id,
 								'type' => 1,
 								'desc' => DB::raw("LEFT('购买产品：{$order->title}', 250)"),
@@ -219,7 +219,7 @@ class WxpayController
 							UserMoneyLog::create([
 								'user_id' => $order->user_id,
 								'agent_id' => $order->agent_id,
-								'money' => $reqInfo['settlement_refund_fee'] / 100,
+								'money' => -$reqInfo['settlement_refund_fee'] / 100,
 								'order_id' => $order->id,
 								'type' => 2,
 								'desc' => DB::raw("LEFT('退款：{$order->title}', 250)"),

routes/api.php

@@ -34,6 +34,7 @@ Route::namespace('App\Http\Controllers\Api')->group(function () {
 
 	# 小程序授权等相关
 	Route::any('auth_event', 'MiniProgramController@authEvent');
+	Route::any('msg_event/{appid?}', 'MiniProgramController@msgEvent');
 });
 
 # 仅用于测试