|
|
@@ -5036,8 +5036,8 @@ class WholeController extends Curd
|
|
|
Db::beginTransaction();
|
|
|
$payStatus = 'N';
|
|
|
if (in_array('WXPAY', $payDetailType)) {
|
|
|
- $result = Pay::wechat(config('payment.wxpay'))->find($groupId, 'pos');
|
|
|
- $result = json_decode(json_encode($result), true);
|
|
|
+ $result = Pay::wechat(config('payment.wxpay'))->find($groupId, 'pos');
|
|
|
+ $result = json_decode(json_encode($result), true);
|
|
|
// $result = '{"return_code":"SUCCESS","return_msg":"OK","result_code":"SUCCESS","mch_id":"1680393367","appid":"wxc6274da7198e3eb4","openid":"o3JAn6Ii_bAlxS-jbNEC4WnPhdwM","is_subscribe":"N","trade_type":"MICROPAY","trade_state":"SUCCESS","bank_type":"OTHERS","total_fee":"1000","fee_type":"CNY","cash_fee":"1000","cash_fee_type":"CNY","transaction_id":"4200067718202409250802875650","out_trade_no":"OD24092518408RV7","attach":[],"time_end":"20240925184009","trade_state_desc":"支付成功","nonce_str":"OeGOkjch4eaV5qIt","sign":"6DCB3BFC594EBC018A2BEE2C3DFEA4E3"}';
|
|
|
// $result = json_decode($result, true);
|
|
|
if (!empty($result['return_code']) && $result['return_code'] == 'SUCCESS' && !empty($result['result_code']) && $result['result_code'] == 'SUCCESS' && !empty($result['trade_state']) && $result['trade_state'] == 'SUCCESS') {
|
|
|
@@ -5111,10 +5111,10 @@ class WholeController extends Curd
|
|
|
if (in_array($item,['WXPAY','ALIPAY'])){
|
|
|
continue;
|
|
|
}
|
|
|
- $amount = PayDetail::where('join_pay_order_id',$order->order_groupby)
|
|
|
+ $amount = PayDetail::where('join_pay_order_id',$groupId)
|
|
|
->where('pay_prepayid',$item)
|
|
|
->value('pay_amount');
|
|
|
- $this->deductAccountOne($order->order_groupby, $item, $amount);
|
|
|
+ $this->deductAccountOne($groupId, $item, $amount);
|
|
|
}
|
|
|
// 如果有余额、VIP、福利账户支付
|
|
|
// if (in_array($orders[0]['join_order_member_id'] . '-CASH', $payDetailType)) {
|
Gorden