Browse Source

退款收支记录

gorden 4 months ago
parent
commit
1bcf7ae756

+ 6 - 6
app/api/controller/pay/AlipayController.php

@@ -17,7 +17,7 @@ class AlipayController
     public function index(Request $request)
     {
         $params = $request->all();
-        \support\Log::info("开始获取支付宝支付参数",$params);
+        \support\Log::info("开始获取支付宝支付参数", $params);
 
         if (!isset($params['order_id'])) {
             return json_fail('参数异常');
@@ -63,19 +63,19 @@ class AlipayController
             }
 
             Db::commit();
-            \support\Log::info("支付宝支付参数获取成功");
+            \support\Log::info("支付宝支付参数获取成功", ['result' => $result]);
             return json_success('', $result);
-        }catch (\support\exception\BusinessException $e){
+        } catch (\support\exception\BusinessException $e) {
             Db::rollBack();
-            \support\Log::error("支付宝支付参数获取失败",['msg'=>$e->getMessage()]);
+            \support\Log::error("支付宝支付参数获取失败", ['msg' => $e->getMessage()]);
             return json_fail($e->getMessage());
         } catch (PayException $e) {
             Db::rollBack();
-            \support\Log::error("支付宝支付参数获取失败",['msg'=>$e->getMessage()]);
+            \support\Log::error("支付宝支付参数获取失败", ['msg' => $e->getMessage()]);
             return json_fail($e->getMessage());
         } catch (\Exception $e) {
             Db::rollBack();
-            \support\Log::error("支付宝支付参数获取失败",['msg'=>$e->getMessage()]);
+            \support\Log::error("支付宝支付参数获取失败", ['msg' => $e->getMessage()]);
             return json_fail('下单失败:' . $e->getMessage());
         }
 

+ 1 - 1
app/api/controller/pay/WxpayController.php

@@ -71,7 +71,7 @@ class WxpayController
             }
 
             Db::commit();
-            \support\Log::info("微信支付参数获取成功");
+            \support\Log::info("微信支付参数获取成功",['msg'=>$wxpay]);
             return json_success('', json_decode($wxpay, true));
         } catch (\support\exception\BusinessException $e) {
             Db::rollBack();

+ 17 - 1
app/event/statistics/InOutEvent.php

@@ -180,7 +180,7 @@ class InOutEvent
                 'dept_id' => 0,
                 'member_id' => $order->join_order_member_id,
                 'inout_classify' => 'OUT',
-                'inout_category' => '退款',
+                'inout_category' => !empty(self::$orderClassify[$order->order_classify]) ? self::$orderClassify[$order->order_classify] . '退款' : '退款',
 
             ];
             // 部门id
@@ -248,8 +248,10 @@ class InOutEvent
 
             return $data;
         } catch (BusinessException $e) {
+            Log::error("记录退款收支失败", ['msg' => $e->getMessage(), 'params' => $params]);
             throw new BusinessException($e->getMessage());
         } catch (\Exception $e) {
+            Log::error("记录退款收支失败", ['msg' => $e->getMessage(), 'params' => $params]);
             throw new BusinessException("退款支出处理失败");
         }
     }
@@ -307,4 +309,18 @@ class InOutEvent
             'data_inout_addtimes' => time()
         ]);
     }
+
+    public static $orderClassify = [
+        'GOODS' => '标准订单',
+        'SERVICE' => '标准订单',
+        'CHNMED' => '标准订单',
+        'CHNNCD' => '标准订单',
+        'PACKAGE' => '套包订单',
+        'RECHARGE' => '充值订单',
+        'DISHES' => '餐饮订单',
+        'VIP' => '康养城订单',
+        'PARTNER' => '会员合伙人订单',
+        'REFERRER' => '康养推荐官订单',
+        'COMBINE' => '新客专享订单'
+    ];
 }