|
|
@@ -91,7 +91,7 @@ class Orders extends Auth{
|
|
|
->join('orders_addr','orders_addr.order_id','=','orders.id')
|
|
|
->where($map)
|
|
|
->orderByDesc('id')
|
|
|
- ->select([
|
|
|
+ ->select(['orders.id as order_id',
|
|
|
'orders.*','custom.username as custom_name','orders.regiment_id as regiment_id',
|
|
|
'orders_addr.contact_area','orders_addr.contact_school','orders_addr.contact_grade','orders_addr.contact_class','orders_addr.contact_name','orders_addr.contact_phone',
|
|
|
])
|
|
|
@@ -238,12 +238,13 @@ class Orders extends Auth{
|
|
|
$id = request('id',0);
|
|
|
$orderInfo = $Model->query()->find($id);
|
|
|
if (!$orderInfo) return json_send(['code'=>'error','msg'=>'订单不存在']);
|
|
|
- $params['out_trade_no'] = (string)$orderInfo['snowflake_id'];
|
|
|
+ //$params['out_trade_no'] = (string)$orderInfo['snowflake_id'];
|
|
|
+ $params['out_trade_no'] = '533370780159971652';
|
|
|
$Snowflake = new Snowflake();
|
|
|
$out_refund_no = $Snowflake->next();
|
|
|
$params['out_refund_no'] = (string)$out_refund_no;
|
|
|
- $params['refund'] = (int)$orderInfo['pay_total'];
|
|
|
- $params['total'] = (int)$orderInfo['pay_total'];
|
|
|
+ $params['refund'] = $orderInfo['pay_total'];
|
|
|
+ $params['total'] = $orderInfo['pay_total'];
|
|
|
$params['reason'] = '用户退款';
|
|
|
$res = $Payment->refund($params);
|
|
|
if (!$res) return json_send(['code'=>'error','msg'=>'退款失败']);
|
