1.6

application/admin/controller/order/Torder.php

@@ -3,7 +3,11 @@
 namespace app\admin\controller\order;
 
 use app\common\controller\Backend;
+use app\common\lib\WxPay;
 use think\Db;
+use think\Exception;
+use think\exception\PDOException;
+use think\exception\ValidateException;
 
 /**
  * 订单管理
@@ -79,6 +83,83 @@ class Torder extends Backend
         }
         return $this->view->fetch();
     }
+    /**
+     * 编辑
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $adminIds = $this->getDataLimitAdminIds();
+        if (is_array($adminIds)) {
+            if (!in_array($row[$this->dataLimitField], $adminIds)) {
+                $this->error(__('You have no permission'));
+            }
+        }
+        if ($this->request->isPost()) {
+            $params = $this->request->post("row/a");
+            if ($params) {
+                $params = $this->preExcludeFields($params);
+                if ($params['tuikuan_state'] == 1) {
+                    $order = Db::name('order')->where('o_id',$ids)->find();
+                    if ($order['type'] == 1) {
+                        // 申请微信退款
+                        $out_trade_no = $order['number'];
+                        $out_refund_no = $order['number'];
+                        $total_fee = $order['money'];
+                        $refund_fee = $order['money'];
+                        $notify_url = config('site.httpurl')."/api/order/notify_refund";
+                        $wxpay = new WxPay();
+                        $res = $wxpay->refund($out_trade_no,$out_refund_no,$total_fee,$refund_fee,$notify_url);
+                        if ($res['return_code'] == "SUCCESS" ) {
+                            if ($res['result_code'] != 'SUCCESS')
+                            return json(['code' => 100, 'msg' => $res['err_code_des']]);
+                        } else {
+                            return json(['code' => 100, 'msg' => '请求微信退失败']);
+                        }
+                    }
+                    if ($order['type'] == 0) {
+                        //处理余额退款
+                        $updMOney = Db::name('users')->where('user_id',$order['user_id'])->setInc('user_money',$order['money']);
+                        if (!$updMOney) {
+                            return json(['code' => 100, 'msg' => '处理失败']);
+                        }
+                    }
+                }
+                $result = false;
+                Db::startTrans();
+                try {
+                    //是否采用模型验证
+                    if ($this->modelValidate) {
+                        $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                        $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
+                        $row->validateFailException(true)->validate($validate);
+                    }
+                    $result = $row->allowField(true)->save($params);
+                    Db::commit();
+                } catch (ValidateException $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                } catch (PDOException $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                } catch (Exception $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                }
+                if ($result !== false) {
+                    $this->success();
+                } else {
+                    $this->error(__('No rows were updated'));
+                }
+            }
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $this->view->assign("row", $row);
+        return $this->view->fetch();
+    }
     //查看退款详情
     public function torderinfo($ids)
     {

application/admin/model/users/Users.php

@@ -40,6 +40,12 @@ class Users extends Model
         return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
     }
 
+//    public function getUsersLevelAttr($value)
+//    {
+//        $level = ['1' => '普通会员',2 => '店长会员', '3' => '经理会员', '4' => '总监会员', '5' => "董事会员]" ];
+//        return  $level[$value];
+//    }
+
 
     public function getUpdateTimeTextAttr($value, $data)
     {

application/admin/view/order/torder/edit.html

@@ -85,9 +85,13 @@
 <!--        </div>-->
 <!--    </div>-->
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('State_save')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">请选择:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-state_save" class="form-control" name="row[state_save]" type="number" value="{$row.state_save|htmlentities}">
+            <select id="c-tuikuan_state" class="form-control" name="row[tuikuan_state]" type="number">
+                <option value="1" {if $row.tuikuan_state=='退款成功' } selected {/if}>通过</option>
+                <option value="2" {if $row.tuikuan_state=='退款失败' } selected {/if}>拒绝</option>
+                <option value="3" {if $row.tuikuan_state=='退款中' } selected {/if}>审核中</option>
+            </select>
         </div>
     </div>
     <div class="form-group layer-footer">

application/api/controller/Buycar.php

@@ -3,6 +3,7 @@
 namespace app\api\controller;
 
 use app\api\model\BuycarModel;
+use app\api\model\Commoditycolor;
 use app\common\controller\Api;
 
 /**
@@ -91,17 +92,25 @@ class Buycar extends APi
         if (is_string($validata)) {
             return $this->result($validata, [], 100);
         }
+        // 查出颜色信息
+        $color = Commoditycolor::where('colorid',$params['colorid'])->find();
         $list = $params;
         unset($list['number']);
         unset($list['token']);
         $issetcar = BuycarModel::where($list)->find(); //判断购物车是否已存在此商品
-        if ($issetcar) { //存在的话把数量加上
-            $addnumber = BuycarModel::where('k_id',$issetcar['k_id'])->setInc('number',$params['number']);
-            if ($addnumber) {
-                return $this->result('添加成功', '', 200);
-            } else {
-                return $this->result('添加失败', '', 100);
-            }
+        $params['money'] = $color['money'];
+        $params['kucun'] = $color['kucun'];
+        if ($issetcar) {
+            return $this->result('购物车已经存在此商品了','',100);
+//            //存在的话把数量加上
+//            $addnumber = BuycarModel::where('k_id',$issetcar['k_id'])->setInc('number',$params['number']);
+//            //存在的话把金额加上
+//            $addmoney = BuycarModel::where('k_id',$issetcar['k_id'])->setInc('money',$color['money']);
+//            if ($addnumber&&$addmoney) {
+//                return $this->result('添加成功', '', 200);
+//            } else {
+//                return $this->result('添加失败', '', 100);
+//            }
         }
         $model = new BuycarModel();
         $addCar = $model->allowField(true)->save($params);
@@ -128,7 +137,7 @@ class Buycar extends APi
             return $this->result($validata,[],100);
         }
         foreach ($params['list'] as $v) {
-            $del = BuycarModel::where('k_id',$v['k_id'])->delete();
+            $del = BuycarModel::where('k_id',$v)->delete();
         }
         return $this->result('删除成功',[],200);
     }

application/api/controller/Member.php

@@ -305,11 +305,4 @@ class Member extends Api
             }
         }
     }
-    public function tt()
-    {
-        $p = new Promote();
-        $p->uid = 6;
-        $result = $p->getMyBoss();
-        halt($result);
-    }
 }

application/api/controller/Order.php

@@ -8,6 +8,8 @@ use app\api\model\OrderModel;
 use app\api\model\Torder;
 use app\api\model\UsersModel;
 use app\common\controller\Api;
+use app\common\lib\WxPay;
+use think\Cache;
 use think\Db;
 
 /**
@@ -21,7 +23,7 @@ class Order extends Api
     /**
      * 购物车总价统计
      * @ApiMethod   (POST)
-     * @param string $list p_id colorid
+     * @param string $list colorid,number
      */
     public function carMoney()
     {
@@ -31,12 +33,14 @@ class Order extends Api
         }
         $list = $params['list'];
         foreach ($list as $v) {
-            $commoditycolor[] = Commoditycolor::where('colorid', $v['colorid'])->find();
+            $commoditycolor[] = Commoditycolor::where('colorid', $v)->find();
         }
         if ($commoditycolor) {
             $money = 0;
-            foreach ($commoditycolor as $v) {
-                $money = $money + $v['money'];
+            $number = $params['number'];
+            $count = count($number);
+            for ($i = 0; $i < $count; $i++) {
+                $money = $money + $commoditycolor[$i]['money'] * $number[$i];
             }
             return $this->result('', $money, 200);
         } else {
@@ -48,7 +52,7 @@ class Order extends Api
      * 订单先提交
      * @ApiMethod   (POST)
      * @param string $user_id 用户id
-     * @param string $list 商品参数 c_id buy_number p_id colorid
+     * @param string $list 商品参数c_id,buy_number,p_id,colorid
      */
     public function orderGenerate()
     {
@@ -140,7 +144,7 @@ class Order extends Api
      * 支付订单
      * @ApiMethod   (POST)
      * @param string $pre_id 预存id
-     * @param string $list 商品参数 c_id buy_number p_id
+     * @param string $list 商品参数,c_id,buy_number,p_id
      * @param string $user_id 用户id
      * @param string $money 总价
      * @param string $a_id 地址id
@@ -218,10 +222,10 @@ class Order extends Api
         if (!isset($o_id)) {
             return $this->result('网络错误', '', 100);
         }
-        $order = Db::name('order')->where('o_id',$o_id)->find();
+        $order = Db::name('order')->where('o_id', $o_id)->find();
         $updOrder = OrderModel::where('o_id', $o_id)->update(['state' => 6]);
-        $updUserWhitebean = Db::name('users')->where('user_id',$order['user_id'])->setInc('user_whitebean',$order['whitebeon']);
-        if ($updOrder&&$updUserWhitebean) {
+        $updUserWhitebean = Db::name('users')->where('user_id', $order['user_id'])->setInc('user_whitebean', $order['whitebeon']);
+        if ($updOrder && $updUserWhitebean) {
             return $this->result('收货成功', '', 200);
         } else {
             return $this->result('网络错误', '', 100);
@@ -301,6 +305,7 @@ class Order extends Api
         $res = $model->logistics($order);
         return $res;
     }
+
     /**
      * 退款订单显示
      * @ApiMethod   (POST)
@@ -310,7 +315,7 @@ class Order extends Api
     {
         $o_id = $this->request->post('o_id');
         if (!isset($o_id)) {
-            return $this->result('网络错误','', 100);
+            return $this->result('网络错误', '', 100);
         }
         $orderInfo = OrderModel::with(['OrderCommodityModel', 'OrderAddress'])->where('o_id', $o_id)->find();
         if ($orderInfo) {
@@ -319,6 +324,7 @@ class Order extends Api
             return $this->result('网络错误', [], 100);
         }
     }
+
     /**
      * 退款提交
      * @ApiMethod   (POST)
@@ -343,39 +349,40 @@ class Order extends Api
             foreach ($files as $file) {
                 $imageName = $file['name'];
                 //后缀名
-                $ext = strtolower(substr(strrchr($imageName,'.'),1));
+                $ext = strtolower(substr(strrchr($imageName, '.'), 1));
                 //保存文件名
                 $fileName = uniqid();
                 $tmp = $file['tmp_name'];
                 //保存 = 路径 + 文件名 + 后缀名
-                $imageSavePath = ROOT_PATH . 'public' . DS . 'uploads/images/'.$fileName.'.'.$ext;
-                $info = move_uploaded_file($tmp,$imageSavePath);
+                $imageSavePath = ROOT_PATH . 'public' . DS . 'uploads/images/' . $fileName . '.' . $ext;
+                $info = move_uploaded_file($tmp, $imageSavePath);
                 if ($info) {
-                    $path = "/uploads/images/".$fileName.'.'.$ext;
-                    array_push($imageArr,$path);
+                    $path = "/uploads/images/" . $fileName . '.' . $ext;
+                    array_push($imageArr, $path);
                 }
             }
             //最终生成的字符串路径
-            $params['images'] = implode(',',$imageArr);
+            $params['images'] = implode(',', $imageArr);
         }
         //修改订单状态
-        $order = OrderModel::where('o_id',$params['o_id'])->find();
+        $order = OrderModel::where('o_id', $params['o_id'])->find();
         $data = array(
-            'state' => 4,
+            'state'         => 4,
             'tuikuan_state' => 3,
-            'state_save' => $order['state']
+            'state_save'    => $order['state']
         );
         $params['money'] = $order['money'];
-        $params['create_time'] = date('Y-m-d H:i:s',time());
-        $updOrder = OrderModel::where('o_id',$params['o_id'])->Update($data);
+        $params['create_time'] = date('Y-m-d H:i:s', time());
+        $updOrder = OrderModel::where('o_id', $params['o_id'])->Update($data);
         $model = new Torder();
         $subTorder = $model->allowField(true)->save($params);
         if ($subTorder) {
-            return $this->result('申请退款成功',[],200);
+            return $this->result('申请退款成功', [], 200);
         } else {
-            return $this->result('申请失败',[] ,100);
+            return $this->result('申请失败', [], 100);
         }
     }
+
     /**
      * 取消退款
      * @ApiMethod   (POST)
@@ -383,22 +390,23 @@ class Order extends Api
      */
     public function cancleTorder()
     {
-        $o_id =$this->request->post('o_id');
+        $o_id = $this->request->post('o_id');
         if (!isset($o_id)) {
             return $this->result('网络错误', [], 100);
         }
-        $order = OrderModel::where('o_id',$o_id)->find();
+        $order = OrderModel::where('o_id', $o_id)->find();
         if (!$order) {
             return $this->result('未找到该订单', [], 100);
         }
         // 修改成为退款之前的状态
-        $updOrder = OrderModel::where('o_id',$o_id)->update(['state' => $order['state_save']]);
+        $updOrder = OrderModel::where('o_id', $o_id)->update(['state' => $order['state_save']]);
         if ($updOrder) {
             return $this->result('取消成功', [], 200);
         } else {
-            return $this->result('失败', [] , 100);
+            return $this->result('失败', [], 100);
         }
     }
+
     /**
      * 退款订单详情
      * @ApiMethod   (POST)
@@ -406,17 +414,18 @@ class Order extends Api
      */
     public function torderInfo()
     {
-        $o_id =$this->request->post('o_id');
+        $o_id = $this->request->post('o_id');
         if (!isset($o_id)) {
             return $this->result('网络错误', [], 100);
         }
-        $orderInfo = OrderModel::with(['OrderCommodityModel', 'OrderAddress','Torder'])->where('o_id', $o_id)->find();
+        $orderInfo = OrderModel::with(['OrderCommodityModel', 'OrderAddress', 'Torder'])->where('o_id', $o_id)->find();
         if ($orderInfo) {
             return $this->result('', $orderInfo, 200);
         } else {
-            return $this->result('未找到该订单', [] , 100);
+            return $this->result('未找到该订单', [], 100);
         }
     }
+
     /**
      * 微信订单支付回调
      * 可以通过@ApiInternal忽略请求的方法
@@ -435,12 +444,80 @@ class Order extends Api
             //修改订单状态
             $updOederstate = Db::name('order')->where('o_id', $order['o_id'])->update(['state' => 2]);
             if ($updOederstate) {
-                return "<xml>
-                      <return_code><![CDATA[SUCCESS]]></return_code>
-                      <return_msg><![CDATA[OK]]></return_msg>
-                    </xml>";
+                $arr = array(
+                    'return_code' => 'SUCCESS',
+                    'return_msg'  => 'OK',
+                );
+                return $this->arrayToXml($arr);
             }
 
         }
     }
+
+    /**
+     * 微信退款订单回调
+     * 可以通过@ApiInternal忽略请求的方法
+     * @ApiInternal
+     */
+    public function notify_refund()
+    {
+        $payXml = file_get_contents("php://input");
+        //将xml格式转化为json格式
+        $jsonXml = json_encode(simplexml_load_string($payXml, 'SimpleXMLElement', LIBXML_NOCDATA));
+        //将json格式转成数组格式 $result['out_trade_no']
+        $result = json_decode($jsonXml, true);
+        if ($result['return_code'] == "SUCCESS") {
+            $str = $result['req_info'];
+            // 对加密信息进行解密,需要用到商户秘钥
+            $data = $this->req_info_decrypt($str);
+            // Cache::set('req_info', $data);
+            if ($data['refund_status'] == "SUCCESS") {
+                //修改退款状态
+                $updstate = Db::name("order")->where('number', $data['out_trade_no'])->update(['tuikuan_state' => '1']);
+                $arr = array(
+                    'return_code' => 'SUCCESS',
+                    'return_msg'  => 'OK',
+                );
+                return $this->arrayToXml($arr);
+            }
+        }
+        Cache::set('aaa', $result);
+        $arr = array(
+            'return_code' => 'SUCCESS',
+            'return_msg'  => 'OK',
+        );
+        return $this->arrayToXml($arr);
+    }
+
+    /**
+     * 信息解密
+     * 对加密信息进行解密,需要用到商户秘钥
+     * 可以通过@ApiInternal忽略请求的方法
+     * @ApiInternal
+     */
+    public function req_info_decrypt($str)
+    {
+        //微信商户key
+        $key = "b3ae6bbf3cc4fa017eb169ae219e2c27";
+        $str = base64_decode($str);
+        $xml = openssl_decrypt($str, 'aes-256-ecb', md5($key), OPENSSL_RAW_DATA);
+        return json_decode(json_encode(simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOCDATA)), true);
+    }
+
+    /**
+     * 数组转xml
+     * @ApiInternal
+     */
+    public function arrayToXml($arr)
+    {
+        $xml = "<xml>";
+        foreach ($arr as $key => $val) {
+            if (is_numeric($val)) {
+                $xml .= "<" . $key . ">" . $val . "</" . $key . ">";
+            } else
+                $xml .= "<" . $key . "><![CDATA[" . $val . "]]></" . $key . ">";
+        }
+        $xml .= "</xml>";
+        return $xml;
+    }
 }

application/api/controller/Recharge.php

@@ -1,9 +1,13 @@
 <?php
 namespace app\api\controller;
 
+use alipay\aop\AopClient;
+use alipay\aop\request\AlipayTradeAppPayRequest;
+use app\admin\model\BuyVipLogModel;
 use app\api\model\RechargeModel;
 use app\api\model\UsersModel;
 use app\common\controller\Api;
+use app\common\lib\Promote;
 use app\common\lib\WxPay;
 
 /**
@@ -60,9 +64,9 @@ class Recharge extends Api
         if (!$user) {
             $this->result('用户不存在', [], 100);
         }
-        if ($user->user_level == 1) {
-            $this->result('您还不是VIP用户，不能进行充值', [], 100);
-        }
+        //if ($user->user_level == 1) {
+        //    $this->result('您还不是VIP用户，不能进行充值', [], 100);
+        //}
 
         // 检测手机号是否可以充值
         $url = 'http://op.juhe.cn/ofpay/mobile/telcheck?phoneno='.$tel.'&cardnum='.$price.'&key=f5ff49671fede25118a6b01131ff88a4';
@@ -71,7 +75,26 @@ class Recharge extends Api
             $this->result('充值错误，请检查手机号码是否正确', [], 100);
         }
 
-        $final_fee = $price * 0.88;
+        // 根据会员等级判断是否享折扣
+        if ($user->user_level == 1) {
+            $final_fee = $price;
+            $isDiscount = 0;
+        } else {
+            // 折扣额度是否足够
+            if ($user->vip_discount_quota >= $price) {
+                $final_fee = $price * 0.88;
+                $isDiscount = 1;
+            } else {
+                $final_fee = $price;
+                $isDiscount = 0;
+            }
+        }
+
+        if ($tel == 18315626215 || $tel == 15615490741 || $tel == 18853911065) {
+            $final_fee = 0.01;
+            $isDiscount = 0;
+        }
+
         // 生成充值订单
         $out_trade_no = createOutTradeNo();
         $orderInfo = array(
@@ -81,7 +104,8 @@ class Recharge extends Api
             'create_time' => date('Y-m-d H:i:s', time()),
             'pay_type' => $payType,
             'out_trade_no' => $out_trade_no,
-            'final_fee' => $final_fee
+            'final_fee' => $final_fee,
+            'is_discount' => $isDiscount
         );
         $add = RechargeModel::create($orderInfo);
         if ($add) {
@@ -90,10 +114,43 @@ class Recharge extends Api
                 $payObj = new WxPay();
                 $getPrePayInfo = $payObj->getPrePayOrder('话费充值', $out_trade_no, ($final_fee * 100), $notify_url);
                 $getPayInfo = $payObj->getOrder($getPrePayInfo['prepay_id']);
-                $this->result('订单创建成功', $getPayInfo, 200);
+                $this->result('订单创建成功', ['payInfoArray' => $getPayInfo], 200);
             }
             if ($payType == 2) {
-                $this->result('订单创建成功', [], 200);
+                $notify_url2 = config('site.httpurl').'/api/recharge/recharge_alipay_notify';
+                $aop = new AopClient;
+                $aop->gatewayUrl = "https://openapi.alipay.com/gateway.do";
+                $aop->appId = config('alipay.app_id');
+                $aop->rsaPrivateKey = config('alipay.private_key');
+                $aop->format = "json";
+                $aop->charset = "utf-8";
+                $aop->signType = "RSA2";
+                $aop->alipayrsaPublicKey = config('alipay.public_key');
+                //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+                $request = new AlipayTradeAppPayRequest();
+
+                // 订单标题
+                $subject = '话费充值';
+                // 订单详情
+                $body = '话费充值';
+
+                // SDK已经封装掉了公共参数，这里只需要传入业务参数
+                $bizcontent = json_encode([
+                    'body' => $body,
+                    'subject' => $subject,
+                    'out_trade_no' => $out_trade_no,
+                    'timeout_express' => '90m',
+                    'total_amount' => $final_fee,
+                    'product_code' => 'QUICK_MSECURITY_PAY'
+                ]);
+
+                $request->setNotifyUrl($notify_url2);
+                $request->setBizContent($bizcontent);
+                // 这里和普通的接口调用不同，使用的是sdkExecute
+                $response = $aop->sdkExecute($request);
+                // 注意：这里不需要使用htmlspecialchars进行转义，直接返回即可
+                // return $response;
+                $this->result('订单创建成功', ['payInfoString' => $response], 200);
             }
         } else {
             $this->result('订单创建失败', [], 200);
@@ -120,6 +177,211 @@ class Recharge extends Api
      */
     public function recharge_wx_notify()
     {
+        //获取返回的xml格式数据
+        $payXml = file_get_contents("php://input");
+        //将xml格式转化为json格式
+        $jsonXml = json_encode(simplexml_load_string($payXml, 'SimpleXMLElement', LIBXML_NOCDATA));
+        //将json格式转成数组格式
+        $result = json_decode($jsonXml, true);
 
+        if ($result) {
+            //如果成功返回
+            if ($result['return_code'] == 'SUCCESS') {
+                if ($result['result_code'] == 'SUCCESS') {
+                    // sign 值校验
+                    // 校验时不包含返回的 sign 字段，需踢除 sign 字段
+                    foreach($result as $k => $v) {
+                        if ($k == 'sign') {
+                            $sign = $result[$k];
+                            unset($result[$k]);
+                        };
+                    }
+                    // 按字典排序
+                    ksort($result);
+                    // 转为 url 键值对
+                    $signTemp = http_build_query($result);
+                    // md5处理，$key 为微信商户平台的 api 安全密钥
+                    $key = 'b3ae6bbf3cc4fa017eb169ae219e2c27';
+                    $signTemp = md5($signTemp.'&key='.$key);
+                    // 转大写得最终 sign 值
+                    $resultSign = strtoupper($signTemp);
+                    // 如果sign值正确
+                    if ($sign === $resultSign) {
+                        // 查询订单是否存在
+                        $order = RechargeModel::where('out_trade_no', $result['out_trade_no'])->find();
+                        if (!empty($order)) {
+                            // 修改订单支付状态和支付时间
+                            $updatePayInfo = RechargeModel::where('out_trade_no', $result['out_trade_no'])
+                                ->update(['pay_status' => 1, 'pay_time' => date('Y-m-d H:i:s', time())]);
+                            // 修改充值状态
+                            $updateRechargeStatus = RechargeModel::where('out_trade_no', $result['out_trade_no'])
+                                ->update(['recharge_status' => 2]);
+                            // 扣除优惠额度
+                            if ($order->is_discount == 1) {
+                                UsersModel::where('user_id', $order->uid)->setDec('vip_discount_quota', $order->price);
+                            }
+                            // 调用聚合话费充值接口
+                            $key = 'f5ff49671fede25118a6b01131ff88a4';
+                            $phoneno = $order->tel;
+                            $cardnum = $order->price;
+                            $orderid = $order->out_trade_no;
+                            $sign = md5('JHfe821bbb6cef8f34d3dc7e68efec19ef'.$key.$phoneno.$cardnum.$orderid);
+                            $url = 'http://op.juhe.cn/ofpay/mobile/onlineorder?key='.$key.'&phoneno='.$phoneno.'&cardnum='.$cardnum.'&orderid='.$orderid.'&sign='.$sign;
+                            $this->sendRequest($url);
+                            if ($updatePayInfo && $updateRechargeStatus) {
+                                $successArray = array(
+                                    'return_code' => 'SUCCESS',
+                                    'return_msg'  => 'OK'
+                                );
+                                return $this->arrayToXml($successArray);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    /**
+     * 数组转xml
+     * @ApiInternal
+     */
+    public function arrayToXml($arr)
+    {
+        $xml = "<xml>";
+        foreach ($arr as $key=>$val)
+        {
+            if (is_numeric($val))
+            {
+                $xml.="<".$key.">".$val."</".$key.">";
+            }
+            else
+                $xml.="<".$key."><![CDATA[".$val."]]></".$key.">";
+        }
+        $xml.="</xml>";
+        return $xml;
+    }
+    /**
+     * 话费充值支付宝支付异步回调
+     * @ApiInternal
+     */
+    public function recharge_alipay_notify()
+    {
+        $params = $this->request->post();
+        if (!empty($params) && $params['trade_status'] == 'TRADE_SUCCESS') {
+            // 验证签名
+            $aop = new AopClient();
+            $aop->alipayrsaPublicKey = config('alipay.public_key');
+            // 此处反转义参数中的字符，否则验签不通过
+            $params['fund_bill_list'] = htmlspecialchars_decode($params['fund_bill_list']);
+            $checkSign = $aop->rsaCheckV1($params, null, 'RSA2');
+            if ($checkSign) {
+                // 是不是向此商户号付款
+                if ($params['app_id'] == config('alipay.app_id')) {
+                    // 查询订单是否存在
+                    $order = RechargeModel::where('out_trade_no', $params['out_trade_no'])->find();
+                    if (!empty($order)) {
+                        // 修改订单支付状态和支付时间
+                        $updatePayInfo = RechargeModel::where('out_trade_no', $params['out_trade_no'])
+                            ->update(['pay_status' => 1, 'pay_time' => date('Y-m-d H:i:s', time())]);
+                        // 修改充值状态
+                        $updateRechargeStatus = RechargeModel::where('out_trade_no', $params['out_trade_no'])
+                            ->update(['recharge_status' => 2]);
+                        // 扣除优惠额度
+                        if ($order->is_discount == 1) {
+                            UsersModel::where('user_id', $order->uid)->setDec('vip_discount_quota', $order->price);
+                        }
+                        // 调用聚合话费充值接口
+                        $key = 'f5ff49671fede25118a6b01131ff88a4';
+                        $phoneno = $order->tel;
+                        $cardnum = $order->price;
+                        $orderid = $order->out_trade_no;
+                        $sign = md5('JHfe821bbb6cef8f34d3dc7e68efec19ef'.$key.$phoneno.$cardnum.$orderid);
+                        $url = 'http://op.juhe.cn/ofpay/mobile/onlineorder?key='.$key.'&phoneno='.$phoneno.'&cardnum='.$cardnum.'&orderid='.$orderid.'&sign='.$sign;
+                        $this->sendRequest($url);
+                        if ($updatePayInfo && $updateRechargeStatus) {
+                            echo 'success';
+                        }
+                    }
+                }
+            }
+        }
+    }
+    /**
+     * 话费充值聚合异步回调 废弃
+     * @ApiInternal
+     */
+    public function recharge_notify()
+    {
+        $params = $this->request->post();
+        $order = RechargeModel::where('out_trade_no', $params['orderid'])->find();
+        if ($order) {
+            $sign = md5('f5ff49671fede25118a6b01131ff88a4'.$order->sporder_id.$order->out_trade_no);
+            if ($sign == $params['sign']) {
+                //TODO
+            }
+        }
+    }
+    /**
+     * 充值记录
+     *
+     * @ApiTitle    (充值记录)
+     * @ApiSummary  (充值记录)
+     * @ApiMethod   (POST)
+     * @ApiRoute    (/api/recharge/getRechargeRecord)
+     * @ApiParams   (name="user_id", type="int", required=true, description="用户id")
+     */
+    public function getRechargeRecord()
+    {
+        $userId = $this->request->post('user_id');
+        if (!$userId) {
+            $this->result('参数错误', [], 200);
+        }
+        $list = RechargeModel::where('uid', $userId)
+            ->where('pay_status', 1)
+            ->field('id,final_fee,create_time,recharge_status')
+            ->select();
+        $this->result('ok', $list, 200);
+    }
+    /**
+     * 充值详情
+     *
+     * @ApiTitle    (充值详情)
+     * @ApiSummary  (充值详情)
+     * @ApiMethod   (POST)
+     * @ApiRoute    (/api/recharge/rechargeDetail)
+     * @ApiParams   (name="id", type="int", required=true, description="记录id")
+     */
+    public function rechargeDetail()
+    {
+        $id = $this->request->post('id');
+        if (!$id) {
+            $this->result('参数错误', [], 200);
+        }
+        $order = RechargeModel::get($id);
+        if (empty($order)) {
+            $this->result('订单不存在', [], 200);
+        }
+        $orderid = $order->out_trade_no;
+        $key = 'f5ff49671fede25118a6b01131ff88a4';
+        // 查询聚合订单状态信息
+        $url = 'http://op.juhe.cn/ofpay/mobile/ordersta?key='.$key.'&orderid='.$orderid;
+        $result = $this->sendRequest($url);
+        // 再根据聚合数据的订单状态更新数据库状态达到状态一致
+        if ($result['error_code'] === 0) {
+            if ($result['result']['game_state'] == 1) { // 成功
+                RechargeModel::where('id', $id)->update(['recharge_status' => 2]);
+            }
+            if ($result['result']['game_state'] == 9) { // 失败
+                RechargeModel::where('id', $id)->update(['recharge_status' => 0]);
+            }
+            if ($result['result']['game_state'] == 0) { // 充值中
+                RechargeModel::where('id', $id)->update(['recharge_status' => 1]);
+            }
+        }
+        // 再次查询
+        $order = RechargeModel::get($id);
+        // 过滤字段
+        unset($order->id, $order->uid, $order->is_discount, $order->pay_status, $order->pay_time);
+        $this->result('ok', $order, 200);
     }
 }

application/api/controller/User.php

@@ -484,11 +484,11 @@ class User extends Api
         }
         $redbean = UsersModel::where('user_id', $params['user_id'])->field('user_id, user_redbean')->find();
         if ($params['user_redbean'] > $redbean['user_redbean'] || $params['user_redbean'] < 1) {
-            return $this->result('提现个数错误', [], 100);
+            return $this->result('红豆不足', [], 100);
         }
         Db::startTrans();
         try {
-            $upd = UsersModel::where('user_id', $params['user_id'])->setDec('user_redbean', $params['user(redbean']);
+            $upd = UsersModel::where('user_id', $params['user_id'])->setDec('user_redbean', $params['user_redbean']);
             Db::commit();
         } catch (\Exception $e) {
             Db::rollback();
@@ -516,6 +516,9 @@ class User extends Api
                 'number'      => '-' . $params['user_id'],
                 'create_time' => date("Y-m-d H:i:s", time()),
             );
+            // 给余额加相应的余额
+            $adduserMoney = UsersModel::where('user_id', $params['user_id'])->setInc('user_money', $params['user_redbean']);
+            // 添加兑换记录
             $record = new Record();
             $recordadd = $record->allowField(true)->save($data);
             if ($recordadd) {

application/api/model/Cashwechat.php

@@ -9,6 +9,7 @@ class Cashwechat extends Model
     public function sendMoney($amount,$re_openid,$desc='推荐奖励',$check_name='',$number){
         $total_amount = (100) * $amount;
 //        $total_amount = $amount;
+        $ip = self::get_client_ip();
         $data=array(
             'mch_appid'=> 'wxa372e8ef8a6f0e1d',//商户账号appid
             'mchid'=> '1550903451',//商户号
@@ -19,7 +20,7 @@ class Cashwechat extends Model
             're_user_name'=> $check_name,//收款用户姓名
             'amount'=>$total_amount,//金额
             'desc'=> $desc,//企业付款描述信息
-            'spbill_create_ip'=> '47.111.157.216',//Ip地址
+            'spbill_create_ip'=> $ip,//Ip地址
         );
         $secrect_key = 'b3ae6bbf3cc4fa017eb169ae219e2c27';//API密码
         $data = array_filter($data);
@@ -129,4 +130,17 @@ class Cashwechat extends Model
         }
 
     }
+    function get_client_ip()
+    {
+        if ($_SERVER['REMOTE_ADDR']) {
+            $cip = $_SERVER['REMOTE_ADDR'];
+        } elseif (getenv("REMOTE_ADDR")) {
+            $cip = getenv("REMOTE_ADDR");
+        } elseif (getenv("HTTP_CLIENT_IP")) {
+            $cip = getenv("HTTP_CLIENT_IP");
+        } else {
+            $cip = "unknown";
+        }
+        return $cip;
+    }
 }

application/common/lib/WxPay.php

@@ -8,6 +8,9 @@ class WxPay
         'mch_id' => "1550903451", // 微信申请成功之后的商户号
         'api_key' => "b3ae6bbf3cc4fa017eb169ae219e2c27" // 在微信商户平台上自己设定的32位api密钥
     );
+    //API证书 (php 环境)
+    private $SSLCERT_PATH = '/www/wwwroot/yxj/public/cert/apiclient_cert.pem';//apiclient_cert.pem 证书 绝对路劲
+    private $SSLKEY_PATH = '/www/wwwroot/yxj/public/cert/apiclient_key.pem';//apiclient_key.pem证书 绝对路径
 
     /**
      * 发起预支付订单
@@ -206,4 +209,64 @@ class WxPay
         }
         return $output;
     }
+    /*
+     * 退款
+     */
+    public function refund($out_trade_no,$out_refund_no,$total_fee,$refund_fee,$notify_url){
+        $url = 'https://api.mch.weixin.qq.com/secapi/pay/refund';
+        $data["appid"] = $this->config["appid"];
+        $data["mch_id"] = $this->config['mch_id'];
+        $data["nonce_str"] = $this->getRandChar(32);
+        $data["out_trade_no"] = $out_trade_no;
+        $data["out_refund_no"] = $out_refund_no;
+        $data['total_fee'] = $total_fee;
+        $data['refund_fee'] = $refund_fee;
+        $data["notify_url"] = $notify_url;
+        $s = $this->getSign($data, false);
+        $data["sign"] = $s;
+        $xml = $this->arrayToXml($data);
+        $response = $this->postXmlSSLCurl($xml,$url);
+        return $this->xmltoarray($response);
+    }
+    //需要使用证书的请求
+    private function postXmlSSLCurl($xml,$url,$second=30)
+    {
+        //$url = 'http://yxj.chenhao98.top/api/order/notify_refund';
+        $ch = curl_init();
+        //超时时间
+        curl_setopt($ch,CURLOPT_TIMEOUT,$second);
+        //这里设置代理，如果有的话
+        //curl_setopt($ch,CURLOPT_PROXY, '8.8.8.8');
+        //curl_setopt($ch,CURLOPT_PROXYPORT, 8080);
+        curl_setopt($ch,CURLOPT_URL, $url);
+        curl_setopt($ch,CURLOPT_SSL_VERIFYPEER,FALSE);
+        curl_setopt($ch,CURLOPT_SSL_VERIFYHOST,FALSE);
+        //设置header
+        curl_setopt($ch,CURLOPT_HEADER,FALSE);
+        //要求结果为字符串且输出到屏幕上
+        curl_setopt($ch,CURLOPT_RETURNTRANSFER,TRUE);
+        //设置证书
+        //使用证书：cert 与 key 分别属于两个.pem文件
+        //默认格式为PEM，可以注释
+        curl_setopt($ch,CURLOPT_SSLCERTTYPE,'PEM');
+        curl_setopt($ch,CURLOPT_SSLCERT, $this->SSLCERT_PATH);
+        //默认格式为PEM，可以注释
+        curl_setopt($ch,CURLOPT_SSLKEYTYPE,'PEM');
+        curl_setopt($ch,CURLOPT_SSLKEY, $this->SSLKEY_PATH);
+        //post提交方式
+        curl_setopt($ch,CURLOPT_POST, true);
+        curl_setopt($ch,CURLOPT_POSTFIELDS,$xml);
+        $data = curl_exec($ch);
+        //返回结果
+        if($data){
+            curl_close($ch);
+            return $data;
+        }
+        else {
+            $error = curl_errno($ch);
+            echo "curl出错，错误码:$error"."<br>";
+            curl_close($ch);
+            return false;
+        }
+    }
 }

public/assets/js/backend/users/users.js

@@ -28,13 +28,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'user_nickname', title: __('User_nickname')},
                         {field: 'user_tel', title: __('User_tel')},
                         {field: 'user_avatar', title: __('User_avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'user_level', title: __('等级'),operate: false, formatter:Table.api.formatter.status, searchList:{1: '普通用户', 2: 'VIP', 3: '铂金会员', 4: '钻石会员'}},
+                        {field: 'user_level', title: __('等级'),operate: false, formatter:Table.api.formatter.status, searchList:{1: '普通用户', 2: '店长会员', 3: '经理会员', 4: '总监会员 ', 5 : '董事会员' }},
                         {field: 'user_money', title: __('User_money'), operate:'BETWEEN'},
                         {field: 'user_redbean', title: __('User_redbean'), operate:'BETWEEN'},
                         {field: 'user_whitebean', title: __('User_whitebean'), operate:'BETWEEN'},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'create_time', formatter: Table.api.formatter.datetime},
                         {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'update_time', formatter: Table.api.formatter.datetime},
-                        {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'update_time', formatter: Table.api.formatter.datetime},
                         {field: 'status_switch', title: __('状态'), searchList: {1:__('启用'),0:__('禁用')}, formatter: Table.api.formatter.toggle},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]