commit

app/admin/controller/finance/UserExtract.php

@@ -113,17 +113,19 @@ class UserExtract extends AuthController
             $export[] = [
                 $item['uid'],
                 $item['nickname'],
+                $item['real_name'],
                 $item['phone'],
                 $item['extract_price'],
                 $type,
-                $account,
+                $account.' ',
                 $item['bank_address'],
+                $item['bank_belonging'],
                 $status,
                 $item['fail_msg'],
                 date('Y-m-d H:i:s', $item['add_time'])
             ];
         }
-        PHPExcelService::setExcelHeader(['UID', '用户昵称', '手机号', '提现金额', '提现方式','微信|支付宝|银行卡', '银行卡地址', '状态',
+        PHPExcelService::setExcelHeader(['UID', '用户昵称', '姓名','手机号', '提现金额', '提现方式','微信|支付宝|银行卡', '银行卡地址','所属支行名称', '状态',
             '未通过原因', '提现时间'])
             ->setExcelTile('提现导出' . date('YmdHis', time()), '提现信息' . time(), ' 生成时间：' . date('Y-m-d H:i:s', time()))
             ->setExcelContent($export)
@@ -221,9 +223,11 @@ class UserExtract extends AuthController
         if ($extract->status == 1) return JsonService::fail('您已提现,请勿重复提现!');
         if ($extract->status == -1) return JsonService::fail('您的提现申请已被拒绝!');
         $res = UserExtractModel::changeSuccess($id);
-        $res1 = json_decode(do_request(' https://api.mall.hqgjsmc.com/service-php-api/member/comfireOrder', ['orderno' => $extract['order_id'], 'confireDate' => date('Y-m-d H:m:s')]));
-        if ($res1->status != 200)  return JsonService::fail($res1->msg);
-        if ($res && $res1) {
+        if($extract['type'] == 2){
+            $res1 = json_decode(do_request('https://api.mall.hqgjsmc.com/service-php-api/member/comfireOrder', ['orderno' => $extract['order_id'], 'confireDate' => date('Y-m-d H:m:s')]));
+            if ($res1->status != 200)  return JsonService::fail($res1->msg);
+        }
+        if ($res) {
             UserExtractModel::commitTrans();
             return JsonService::successful('操作成功!');
         } else {

app/admin/model/user/UserRecharge.php

@@ -88,6 +88,9 @@ class UserRecharge extends BaseModel
                 case 'weixin':
                     $item['_recharge_type'] = '公众号充值';
                     break;
+                case 'alipay':
+                    $item['_recharge_type'] = '支付宝';
+                    break;
                 default:
                     $item['_recharge_type'] = '其他充值';
                     break;
@@ -111,6 +114,9 @@ class UserRecharge extends BaseModel
                 case 'weixin':
                     $item['_recharge_type'] = '公众号充值';
                     break;
+                case 'alipay':
+                    $item['_recharge_type'] = '支付宝';
+                    break;
                 default:
                     $item['_recharge_type'] = '其他充值';
                     break;

app/admin/view/finance/user_extract/index.php

@@ -123,6 +123,7 @@
                                  银行卡号：{$vo.bank_code}
                                 <br/>
                                  银行开户地址:{$vo.bank_address}
+                                 所属支行名称:{$vo.bank_belonging}
                                 {elseif condition="$vo['extract_type'] eq 'weixin'"/}
                                 昵称：{$vo.nickname}<br>
                                 微信号：{$vo.wechat}

app/api/controller/order/StoreOrderController.php

@@ -241,30 +241,44 @@ class StoreOrderController
                     }
                     break;
                 case 'alipay':
-                    $payment = new \AdaPaySdk\Payment();
-                    # 支付设置
-                    $payment_params = array(
-                        'app_id'=> 'app_3dc215b5-ade5-47d8-8461-ddb796bd5e06',
-                        'order_no'=> $order['order_id'].'-'.rand(100000, 999999),
-                        'pay_channel'=> 'alipay_wap',
-                        //'time_expire'=> date("YmdHis", time()+86400),
-                        'pay_amt'=> sprintf("%01.2f",$order['pay_price']),
-                        'goods_title'=> '环球优购',
-                        'goods_desc'=> '环球优购',
-                        'description'=> 'alipay',
-                        'device_info'=> ['device_p'=> $_SERVER ["REMOTE_ADDR"]],
-                        'callback_url' => 'http://yg.hqgjsmc.com/index',
-                        'notify_url' => 'http://yg.hqgjsmc.com/api/adapay/notify'
-                    );
-                    $payment->create($payment_params);
-                    if ($payment->isError()){
-                        //失败处理
-                        return app('json')->fail('支付失败');
-                    } else {
-                        //成功处理
-                        return app('json')->status('alipay', ['jsConfig' => $payment->result, 'orderId' => $order['order_id']]);
+                    if ($order['pay_price'] <= 0){
+                        if (StoreOrder::yuePay($orderId, $request->uid(), $formId))
+                            return app('json')->status('success', '余额支付成功', $info);
+                        else {
+                            $errorinfo = StoreOrder::getErrorInfo();
+                            if (is_array($errorinfo))
+                                return app('json')->status($errorinfo['status'], $errorinfo['msg'], $info);
+                            else
+                                return app('json')->status('pay_error', $errorinfo);
+                        }
+                        break;
+                    }else{
+                        $payment = new \AdaPaySdk\Payment();
+                        # 支付设置
+                        $payment_params = array(
+                            'app_id'=> 'app_3dc215b5-ade5-47d8-8461-ddb796bd5e06',
+                            'order_no'=> $order['order_id'].'-'.rand(100000, 999999),
+                            'pay_channel'=> 'alipay_wap',
+                            //'time_expire'=> date("YmdHis", time()+86400),
+                            'pay_amt'=> sprintf("%01.2f",$order['pay_price']),
+                            'goods_title'=> '环球优购',
+                            'goods_desc'=> '环球优购',
+                            'description'=> 'alipay',
+                            'device_info'=> ['device_p'=> $_SERVER ["REMOTE_ADDR"]],
+                            'callback_url' => 'http://yg.hqgjsmc.com/index',
+                            'notify_url' => 'http://yg.hqgjsmc.com/api/adapay/notify'
+                        );
+                        $payment->create($payment_params);
+                        if ($payment->isError()){
+                            //失败处理
+                            return app('json')->fail('支付失败');
+                        } else {
+                            //成功处理
+                            return app('json')->status('alipay', ['jsConfig' => $payment->result, 'orderId' => $order['order_id']]);
+                        }
+                        break;
                     }
-                    break;
+
                 case 'weixin_s':
                     $payment = new \AdaPaySdk\Payment();
                     # 支付设置
@@ -420,31 +434,42 @@ class StoreOrderController
                 }
                 break;
             case 'alipay':
-                $payment = new \AdaPaySdk\Payment();
-                # 支付设置
-                $payment_params = array(
-                    'app_id'=> 'app_3dc215b5-ade5-47d8-8461-ddb796bd5e06',
-                    'order_no'=> $order['order_id'].'-'.rand(100000, 999999),
-                    'pay_channel'=> 'alipay_wap',
-                    //'time_expire'=> date("YmdHis", time()+86400),
-                    'pay_amt'=> $order['pay_price'],
-                    'goods_title'=> '环球优购',
-                    'goods_desc'=> '环球优购',
-                    'description'=> 'alipay',
-                    'device_info'=> ['device_p'=> $_SERVER ["REMOTE_ADDR"]],
-                    'callback_url' => 'http://yg.hqgjsmc.com/index',
-                    'notify_url' => 'http://yg.hqgjsmc.com/api/adapay/notify'
-                );
-                $payment->create($payment_params);
-                if ($payment->isError()){
-                    //失败处理
-                    return app('json')->fail('支付失败');
-                } else {
-                    //成功处理
-                    return app('json')->status('alipay', ['jsConfig' => $payment->result, 'order_id' => $order['order_id']]);
+                if ($order['pay_price'] <= 0){
+                    if (StoreOrder::yuePay($order['order_id'], $request->uid()))
+                        return app('json')->status('success', '余额支付成功');
+                    else {
+                        $error = StoreOrder::getErrorInfo();
+                        return app('json')->fail(is_array($error) && isset($error['msg']) ? $error['msg'] : $error);
+                    }
+                    break;
+                }else{
+                    $payment = new \AdaPaySdk\Payment();
+                    # 支付设置
+                    $payment_params = array(
+                        'app_id'=> 'app_3dc215b5-ade5-47d8-8461-ddb796bd5e06',
+                        'order_no'=> $order['order_id'].'-'.rand(100000, 999999),
+                        'pay_channel'=> 'alipay_wap',
+                        //'time_expire'=> date("YmdHis", time()+86400),
+                        'pay_amt'=> $order['pay_price'],
+                        'goods_title'=> '环球优购',
+                        'goods_desc'=> '环球优购',
+                        'description'=> 'alipay',
+                        'device_info'=> ['device_p'=> $_SERVER ["REMOTE_ADDR"]],
+                        'callback_url' => 'http://yg.hqgjsmc.com/index',
+                        'notify_url' => 'http://yg.hqgjsmc.com/api/adapay/notify'
+                    );
+                    $payment->create($payment_params);
+                    if ($payment->isError()){
+                        //失败处理
+                        return app('json')->fail('支付失败');
+                    } else {
+                        //成功处理
+                        return app('json')->status('alipay', ['jsConfig' => $payment->result, 'order_id' => $order['order_id']]);
 
+                    }
+                    break;
                 }
-                break;
+
             case 'weixin_s':
                 $payment = new \AdaPaySdk\Payment();
                 # 支付设置

app/models/store/StoreOrder.php

@@ -405,7 +405,9 @@ class StoreOrder extends BaseModel
                 $SurplusIntegral = bcsub($userInfo['integral'], $payIntegral, 2);
                 $res2 = $res2 && false != UserBill::expend('积分商品', $uid, 'integral', 'integral_product', $payIntegral, $key, $SurplusIntegral, '购买积分商品使用' . $payIntegral . '积分');
             }
-
+            $deductionPrice = 0;
+            $usedIntegral = 0;
+            $user_consumption = 0;
             if ($userConsumption && $SurplusConsumption > 0){
                 $payPrice -= $payPostage;
                 if ($SurplusConsumption < $payPrice){
@@ -426,6 +428,7 @@ class StoreOrder extends BaseModel
                 $usedIntegral = 0;
                 if (!$resc) return self::setErrorInfo('使用消费券抵扣失败!', true);
             }elseif (!$useIntegral && !$userConsumption){
+
                 $deductionPrice = 0;
                 $user_consumption = 0;
             }

app/models/user/UserExtract.php

@@ -99,6 +99,7 @@ class UserExtract extends BaseModel
         if(isset($data['cardnum'])) $insertData['bank_code'] = $data['cardnum'];
         else $insertData['bank_code'] = '';
         if(isset($data['bankname'])) $insertData['bank_address']=$data['bankname'];
+        if(isset($data['bank_belonging'])) $insertData['bank_belonging']=$data['bank_belonging'];
         else $insertData['bank_address']='';
         if(isset($data['weixin'])) $insertData['wechat'] = $data['weixin'];
         else $insertData['wechat'] = $userInfo['nickname'];
@@ -109,6 +110,7 @@ class UserExtract extends BaseModel
         }else if($data['extract_type'] == 'bank'){
             if(!$data['cardnum']) return self::setErrorInfo('请输入银行卡账号');
             if(!$data['bankname']) return self::setErrorInfo('请输入开户行信息');
+            if(!$data['bank_belonging']) return self::setErrorInfo('请输入所属支行名称');
             $mark = '使用银联卡'.$insertData['bank_code'].'提现'.$insertData['extract_price'].'元';
         }else if($data['extract_type'] == 'weixin'){
             if(!$data['weixin']) return self::setErrorInfo('请输入微信账号');

crmeb/services/WechatService.php

@@ -367,6 +367,7 @@ class WechatService
     public static function paymentPrepare($openid, $out_trade_no, $total_fee, $attach, $body, $detail = '', $trade_type = 'JSAPI', $options = [])
     {
         $order = self::paymentOrder($openid, $out_trade_no, $total_fee, $attach, $body, $detail, $trade_type, $options);
+        $order['appid'] = sys_config('pay_weixin_appid');
         $result = self::paymentService()->prepare($order);
         if ($result->return_code == 'SUCCESS' && $result->result_code == 'SUCCESS') {
             try {