Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/controllers/User.php

@@ -33,6 +33,9 @@ class UserController extends \Our\Controller_AbstractIndex {
             $password=$data[NameConst::password];
             if($this->memberService->checkUserNamePassWord($mobile,$password)){
                 $member= $this->memberService->getOneByMobileAndPassword($mobile,$password);
+                if($member['member_state']==\Our\ApiConst::zero){
+                    \Error\ErrorModel::throwException(\Error\CodeConfigModel::unavailMemberState);
+                }
                 //第二步保存扫码会员信息
                 $result = $this->memberService->saveStoreMembers($member['member_id']);
                 if(!$result){
@@ -46,7 +49,7 @@ class UserController extends \Our\Controller_AbstractIndex {
                     if(!$result['status']){
                         \Error\ErrorModel::throwException(\Error\CodeConfigModel::loginBindUserInfoFailed);
                     }
-                        if(isset($result['member'])&&$member){
+                    if(isset($result['member'])&&$member){
                         $member = array_merge($member,$result['member']);
                     }
                 }

application/library/Our/ApiConst.php

@@ -60,6 +60,7 @@ class ApiConst
     const zero = 0;
     const one = 1;
     const two = 2;
+    const four=4;
     const cannotSendMsg=-1;
     const canSendMsg=1;
 
@@ -226,6 +227,9 @@ class ApiConst
     const bySeller = 1;
     const express = 2;
 
+    const oneHandred=100;
+    const oneHandredOne=101;
+
     //文案类型
     const buyerText = 1;
     const storeText = 2;
@@ -343,7 +347,8 @@ class ApiConst
 
     const addGoodsToCart = 1; //将商品加入购物车
     const addBundingToCart = 2; //将组合销售商品加入购物车
-
+    const positionPickupCodeBegin=12;
+    const positionPickupCodeBeginMysql=13;
     const onlineGoodsState = 1;//正常商品状态
     const onlineGoodsVerify = 1;  //商品已通过审核
     const onlineGoodsDel = 0;  //商品未删除

application/library/Our/NameConst.php

@@ -168,6 +168,8 @@ class NameConst {
     const frontPrefix = 'front';
 
     const blGoods = '_goodsCommon';
+
+    const pcClient='pc-client';
 }
 
 ?>
\ No newline at end of file

application/models/DAO/Member.php

@@ -23,6 +23,10 @@ class MemberModel extends \DAO\AbstractModel
     //有效用户返回数据
     private $availMemberColumn = array('member_id', 'member_name', 'member_truename', 'member_avatar', 'member_sex', 'member_birthday', 'member_mobile', 'member_mobile_bind', 'member_qq', 'member_qqopenid', 'member_qqinfo', 'member_wxinfo', 'member_wxopenid', 'member_sinaopenid', 'member_sinainfo', 'member_points', 'member_state', 'member_quicklink', 'member_exppoints', 'store_id', 'iswx', 'agree_flag', 'seller_id', 'diliveryman_id', 'member_tag_ids', 'member_group_ids', 'is_teacher', 'member_email', 'member_email_bind','is_wxsend');
 
+
+    //有效用户返回数据
+    private $memberColumn = array('member_id', 'member_name', 'member_truename', 'member_avatar', 'member_sex', 'member_birthday', 'member_mobile', 'member_mobile_bind', 'member_qq', 'member_qqopenid', 'member_qqinfo', 'member_wxinfo', 'member_wxopenid', 'member_sinaopenid', 'member_sinainfo', 'member_points', 'member_state', 'member_quicklink', 'member_exppoints', 'store_id', 'iswx', 'agree_flag', 'seller_id', 'diliveryman_id', 'member_tag_ids', 'member_group_ids', 'is_teacher', 'member_email', 'member_email_bind','is_wxsend','member_state');
+
     public function init()
     {
         $this->memberMysql = \Mysql\MemberModel::getInstance();
@@ -98,7 +102,7 @@ class MemberModel extends \DAO\AbstractModel
             $where[NameConst::memberPasswd]=md5($password);
         }
 
-        $result = $this->db->select($this->availMemberColumn)->from($this->_tableName)->where($where)->fetchOne();
+        $result = $this->db->select($this->memberColumn)->from($this->_tableName)->where($where)->fetchOne();
         if ($result) {
             $memberAvatarUrl = $this->getMemberAvatarUrl($result['member_id'], $result['member_avatar']);
             $result['memberAvatarUrl'] = $memberAvatarUrl;

application/models/DAO/Order/ApiReciverInfo.php

@@ -57,8 +57,8 @@ class ApiReciverInfoModel extends \DAO\AbstractModel
         $this->address=$reciverInfo['address'];
         $this->areaInfo=$reciverInfo['area'];
         $this->street=$reciverInfo['street'];
-        $this->lng=$reciverInfo['lng'];
-        $this->lat=$reciverInfo['lat'];
+        $this->lng=isset($reciverInfo['lng'])?$reciverInfo['lng']:ApiConst::zero;
+        $this->lat=isset($reciverInfo['lat'])?$reciverInfo['lat']:ApiConst::zero;
         $this->cityCode=isset($reciverInfo['citycode'])?$reciverInfo['citycode']:'';
         $this->addressId=$reciverInfo['address_id'];
         $this->subAddress=isset($reciverInfo['subaddress'])?$reciverInfo['subaddress']:'';

application/models/DAO/Order/Diliveryman.php

@@ -61,7 +61,7 @@ class DiliverymanModel extends \DAO\AbstractModel
      */
     public function find($where)
     {
-        $data = $this->db->from($this->_tableName)->where($where)->fetchOne();
+        $data = $this->db->from($this->_tableName)->select($this->detailField)->where($where)->fetchOne();
         return $data;
     }
     //任务脚本方法
@@ -80,17 +80,31 @@ class DiliverymanModel extends \DAO\AbstractModel
         $where[$this->_primaryKey] = $id;
         return $this->find($where);
     }
-
-    public function convert($info,$keyValues,$imageField='qrcode_path'){
-        $convertInfo=array();
-        foreach($keyValues as $key =>$val){
-            if($key!=$imageField){
-                $convertInfo[$val]=$info[$key];
-            }else{
-                $convertInfo[$val]=\Our\Common::getStaticFile($info[$key],ImageConst::memberAvatar) ;
-            }
+    public function getDeliveryManFields()
+    {
+        return array(
+            'qrcode_path' => 'qrcodePath',
+            'true_name' => 'trueName',
+            'mobile' => 'mobile',
+        );
+    }
+    public function convert($info){
+        $memberDao=\DAO\MemberModel::getInstance();
+        $info['qrcodePath']=$memberDao->getMemberAvatar($info['memberId']);
+        return $info;
+    }
+    public function getByWhere($where)
+    {
+        $this->setDb($this->dbName);
+        if(is_array($where)){
+            $where = $this->db->getSqlWhereByArray($where);
         }
-        return $convertInfo;
+        $list = $this->db->select($this->detailField)->from($this->_tableName)->where($where)->fetchAll();
+        return $list;
+    }
+    public function getDeliveryManByStoreId($storeId){
+        $where['store_id']=$storeId;
+        return $this->getByWhere($where);
     }
 
 

application/models/DAO/Order/Order.php

@@ -45,7 +45,7 @@ class OrderModel extends \DAO\AbstractModel
 
     public function getOrderDetailField()
     {
-        return 'order_id as orderId,coupon_id as couponId,refund_amount as refundAmount,order_sn as orderSn,pay_sn as paySn,store_name as storeName,add_time as addTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,payment_time as paymentTime,finnshed_time as finnshedTime,need_shipping_fee as needShippingFee,payment_code as paymentCode,buyer_id as buyerId,buyer_name as buyerName,refund_condition as refundCondition,delay_time as delayTime,gmt_update as gmtUpdate';
+        return 'order_id as orderId,coupon_id as couponId,refund_amount as refundAmount,order_sn as orderSn,pay_sn as paySn,store_name as storeName,add_time as addTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,payment_time as paymentTime,finnshed_time as finnshedTime,need_shipping_fee as needShippingFee,payment_code as paymentCode,buyer_id as buyerId,buyer_name as buyerName,refund_condition as refundCondition,delay_time as delayTime,gmt_update as gmtUpdate,diliveryman_id as diliverymanId';
     }
 
     public function getOrderShippingField()

application/models/Error/CodeConfig.php

@@ -98,6 +98,7 @@ class CodeConfigModel {
     const authMemberExistMobile = 10111;
     const uploadMemberAvatarFailed = 10112;
     const uploadWxMemberAvatarFailed = 10113;
+    const unavailMemberState = 10114;
 
     //访问错误
     const illegalAccess=200001;
@@ -458,10 +459,10 @@ class CodeConfigModel {
             self::emptyUserAvatar => '第三方用户头像不能为空',
             self::emptyUserNickname => '第三方用户昵称不能为空',
             self::addMemberMappingError => '添加第三方绑定关系失败',
-            self::userAlreadyBind => '当前账号已被其他账号绑定,如需绑定,请先解绑',
+            self::userAlreadyBind => '当前第三方账号已被其他账号绑定,如需绑定,请先解绑',
             self::emptyPlatformType => '第三方平台类型不能为空',
             self::wrongPlatformInfo => '获取平台授权信息错误',
-            self::loginBindUserInfoFailed => '登录是绑定用户信息失败',
+            self::loginBindUserInfoFailed => '登录时绑定用户信息失败',
             self::cancelBindingUserFailed => '取消第三方绑定失败',
             self::emptyUserOpenid => '第三方用户唯一识别符不能为空',
             self::bindingSuccess => '绑定成功',
@@ -504,6 +505,7 @@ class CodeConfigModel {
             self::saveMemberMapppingFailed => '保存用户第三方绑定信息失败',
             self::uploadMemberAvatarFailed => '上传用户头像失败',
             self::uploadWxMemberAvatarFailed => '微信上传用户头像失败',
+            self::unavailMemberState => '您的账号已被禁用',
             //商品相关
             self::emptyCommonId=> '商品主键不能为空',
             self::goodsNotExist=> '商品不存在',

application/models/Mysql/LinkMySQL.php

@@ -64,7 +64,9 @@ class LinkMySQLModel{
     }
 
     public static function unsetDbConecet(){
-        unset(self::$_instances);
+        if(!empty(self::$_instances)){
+            self::$_instances=null;
+        }
     }
 
 

application/modules/Client/controllers/Feedback.php

+<?php
+
+class FeedbackController extends \Our\Controller_AbstractApi {
+
+    public function init(){
+        parent::init();
+    }
+
+    public function saveFeedbackAction(){
+        $msg = \Business\User\FeedBackServiceModel::getInstance()->saveFeedback($this->req[\Our\NameConst::data],$this->memberId);
+        unset($this->req[\Our\NameConst::data]['imageA']);
+        unset($this->req[\Our\NameConst::data]['imageB']);
+        unset($this->req[\Our\NameConst::data]['imageC']);
+        $this->success('');
+    }
+}
\ No newline at end of file

application/modules/Client/controllers/Member.php

+<?php
+use Business\User\LoginV2Model;
+use Error\ErrorModel;
+use Our\ApiConst;
+use Our\NameConst;
+use Error\CodeConfigModel;
+use Business\User\MemberServiceModel;
+use Our\DescribeConst;
+class MemberController extends \Our\Controller_AbstractApi {
+    private $memberService;
+
+    public function init(){
+        parent::init();
+        $this->memberService=MemberServiceModel::getInstance();
+    }
+    public function indexAction() {
+        throw new Exception('hello ',404);
+    }
+
+    /**
+     * 获取会员基本信息
+     *
+     * @var member/getMemberInfo
+     */
+    public function getMemberInfoAction(){
+        $result=$this->memberService->getMemberInfo($this->memberId);
+        $this->success($result);
+    }
+
+    /**
+     * 保存用户信息
+     * @throws Exception
+     */
+    public function saveMemberInfoAction(){
+        $data = $this->req[\Our\NameConst::data];
+        $result = $this->memberService->saveMemberInfo($data,$this->memberId);
+        if($result===false){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::saveMemberFailed);
+        }
+        $this->success(new stdClass(),\Our\DescribeConst::saveMemberSuccess,\Our\DescribeConst::saveMemberSuccess);
+    }
+
+    /**
+     * 保存用户头像
+     */
+    public function saveMemberAvatarAction(){
+
+        $data = $this->req[\Our\NameConst::data];
+        $result = $this->memberService->saveMemberAvatar($data,$this->memberId);
+        $member = $this->memberService->getMemberInfo($this->memberId);
+        if($result!==false){
+            $this->success(array('memberAvatar'=>$member['memberAvatar']));
+        }
+        \Error\ErrorModel::throwException(\Error\CodeConfigModel::saveMemberAvatarFailed);
+    }
+
+    /**
+     * 取消第三方绑定
+     */
+    public function cancelBindingAction(){
+        $data = $this->req[\Our\NameConst::data];
+        $this->memberService->cancelBinding($data,$this->memberId);
+        if($data['userType']==\Our\ApiConst::userFromWx){
+            $userToken=$this->memberService->getWxUserToken($this->memberId);
+            if(!empty($userToken)){
+                $this->updateOldLoginKey($userToken);
+            }
+        }
+        $this->success(new stdClass(),\Our\DescribeConst::cancelBindingSuccess,\Our\DescribeConst::cancelBindingSuccess);
+    }
+
+    /**
+     * 已登录用户绑定第三方平台账号
+     */
+    public function bindThirdPlatformAction(){
+        $data = $this->req[\Our\NameConst::data];
+        $result = $this->memberService->bindThirdPlatform($data,$this->memberId);
+        if($result){
+            $this->success(new stdClass(),\Our\DescribeConst::bindingSuccess,\Our\DescribeConst::bindingSuccess);
+        }
+        \Error\ErrorModel::throwException(\Error\CodeConfigModel::bindingSuccess);
+    }
+
+
+    /**
+     * 用户退出登录
+     * @throws Exception
+     */
+    public function logOutAction(){
+        $key = $this->req[\Our\NameConst::data]['key'];
+        $result = $this->memberService->logOut($key);
+        session_unset();
+        session_destroy();
+        if($result){
+            $this->success(new stdClass());
+        }
+        ErrorModel::throwException(CodeConfigModel::noLogin);
+
+    }
+
+    /**
+     * 用户退出登录
+     * @throws Exception
+     */
+    public function logOutTestAction(){
+        $key = $this->req[\Our\NameConst::data]['key'];
+        $result = $this->memberService->logOutTest($key);
+        if($result){
+            $this->success(new stdClass());
+        }
+        ErrorModel::throwException(CodeConfigModel::noLogin);
+
+    }
+
+
+    /**
+     * 修改密码
+     */
+    public function changePasswordAction(){
+        $data = $this->req[\Our\NameConst::data];
+        $result = $this->memberService->changePassword($data,$this->memberId);
+        if($result){
+            $this->success(new stdClass(),\Our\DescribeConst::changePasswordSuccess,\Our\DescribeConst::changePasswordSuccess);
+        }
+        \Error\ErrorModel::throwException(\Error\CodeConfigModel::bindingSuccess);
+    }
+
+
+
+    /**
+     * 修改手机号码
+     */
+    public function changeMobileAction(){
+        $data = $this->req[\Our\NameConst::data];
+        $this->memberService->changeMobile($data,$this->memberId);
+        $this->success(new stdClass(),\Our\DescribeConst::changeMobileSuccess,\Our\DescribeConst::changeMobileSuccess);
+
+    }
+
+    /**
+     * 微信绑定手机号码
+     */
+    public function bindMobileForWxAction(){
+        $data = $this->req[\Our\NameConst::data];
+        $this->memberService->bindMobile($data,$this->memberId);
+        $this->success(new stdClass(),\Our\DescribeConst::bindMobileForWxSuccess,\Our\DescribeConst::bindMobileForWxSuccess);
+    }
+
+}

application/modules/Client/controllers/Shopkeeper.php

@@ -23,6 +23,7 @@ class ShopkeeperController extends \Our\Controller_AbstractApi {
         parent::init();
         $this->memberService = MemberServiceModel::getInstance();
         $this->shopkeeperService  = ShopkeeperServiceModel::getInstance();
+        $this->shopkeeperService->clientType=NameConst::pcClient;
     }
 
     /**
@@ -151,6 +152,17 @@ class ShopkeeperController extends \Our\Controller_AbstractApi {
         }
     }
 
+    /**
+     * 获得配送员列表
+     */
+    public function getDeliveriersAction(){
+        $result = $this->shopkeeperService->getDiliveryManByStoreId($this->memberId);
+        if($result!==false){
+            $this->success($result,\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);
+        }
+        ErrorModel::throwException(CodeConfigModel::commonError);
+    }
+
     /**
      * 订单详情
      */

public/client/shopkeeper/getDeliveriers.php

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>简单的html5 File测试 for pic2base64</title>
+    <style>
+    </style>
+
+</head>
+<body>
+<form action="/client/shopkeeper/getDeliveriers" method="post">
+
+    用户登录状态key:<input name="data[key]" value="681c788e2d5a1a67bb4432aebe67c35b"/><br />
+
+    <p id="img_area"></p>
+    <input type="submit" value="提交">
+</form>
+
+</body>
+</html>
\ No newline at end of file

public/client/shopkeeper/orderDetail.php

@@ -8,7 +8,7 @@
 
 </head>
 <body>
-<form action="/shopkeeper/orderDetail" method="post">
+<form action="/client/shopkeeper/orderDetail" method="post">
     用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><br />
     订单id:<input name="data[orderId]" value="935"/><br />
     <p id="img_area"></p>

public/client/shopkeeper/orders.php

@@ -8,7 +8,7 @@
 
 </head>
 <body>
-<form action="/shopkeeper/orders" method="post">
+<form action="/client/shopkeeper/orders" method="post">
 
     用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><br />
     订单状态id:<input name="data[orderState]" value=""/><br />

public/client/user/login.php

@@ -9,7 +9,7 @@
 </head>
 <body>
 
-<form action="/user/login" method="post">
+<form action="/client/user/login" method="post">
     用户名：<input name="data[mobile]" value="18305954587"/><br />
     密码:<input name="data[password]" value="123456"/><br />
     key:<input name="data[key]" value="c2e5e7bfce8a727c7fb6f696bcaa23ac"/><br />

scripts/crontab/push/bridge.php

@@ -14,20 +14,20 @@ $http = new swoole_http_server("0.0.0.0", 9501);
 $http->on('request', function ($request, $response) {
     try{
         $respData=$request->post;
-        echo json_encode($respData);
-        echo 'abcdefg'.'|||||||||||';
+       // echo json_encode($respData);
+
         if(isset($respData['type'])&&$respData['type']==1){
             $info=$respData['content'];
             $memberDao=$info['className']::getInstance(\Our\DbNameConst::masterDBConnectName);
-            echo json_encode($info['params']);
+           echo json_encode($info);
             if(empty($info['params'])){
                 $res=call_user_func_array(array($memberDao,$info['method']));
             }else{
                 $res=call_user_func_array(array($memberDao,$info['method']),$info['params']);
             }
-
             $res=(isset($res)&&!empty($res))?$res:false;
             unset($memberDao);
+            \Mysql\LinkMySQLModel::unsetDbConecet();
             if($res!==false){
                 echo 'success';
                 $response->end(json_encode(array('status'=>1,'message'=>'执行成功','data'=>$res)));