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

application/controllers/Message.php

@@ -123,4 +123,15 @@ class MessageController extends \Our\Controller_AbstractApi {
         }
     }
 
+    public function setAction(){
+        $messageService = \Business\Message\MessageServiceModel::getInstance();
+        $type=$this->req['data']['type'];
+        if(!empty($type)){
+            $res=$messageService->set($this->memberId,$type);
+            if($res){
+                $this->success(\Our\DescribeConst::setMessageSuccess);
+            }
+        }
+        \Error\ErrorModel::throwException(\Error\CodeConfigModel::setMessageFail);
+    }
 }

application/library/Our/AdvConst.php

@@ -16,7 +16,7 @@ class AdvConst {
 
     const advPositionHomeMiddle =  1052; //首页中部广告位
 
-    const advPositionPopUp = 1050; //平台首页弹窗广告
+    const advPositionPopUp = 1048; //平台首页弹窗广告
 
     const advIntervalSecond = 2000; //广告位默认轮播时间间隔,单位毫秒
 

application/library/Our/ApiConst.php

@@ -52,6 +52,8 @@ class ApiConst
     const zero = 0;
     const one = 1;
     const two = 2;
+    const cannotSendMsg=-1;
+    const canSendMsg=1;
 
     const favTimeAsc = 1;
     const favTimeDesc = 2;
@@ -69,6 +71,9 @@ class ApiConst
     const storeMessageType = 4;
     //普通用户消息类型
     const memberMessageType = 5;
+
+    const closeMessage=-1;
+    const openMessae=1;
     //消息状态
     //未读消息
     const unread = 0;

application/library/Our/DescribeConst.php

@@ -66,6 +66,7 @@ class DescribeConst
     const receiveCouponSuccess = '领取优惠券成功';
 
     const addCartSuccess = '加入购物车成功';
+    const setMessageSuccess='消息设置成功';
 
     const editCartSuccess = '编辑购物车成功';
 

application/library/Payment/Alipay.php

@@ -61,7 +61,7 @@ class Alipay {
         return $str;
     }
     public function refund($order){
-        $refundAmount = round($order['refundAmount']/\Our\ApiConst::hundred,\Our\ApiConst::two);
+        $refundAmount = round($order['refundFee']/\Our\ApiConst::hundred,\Our\ApiConst::two);
         if(APP_ENV == 'develop'||APP_ENV == 'test'||APP_ENV == 'pre' || APP_ENV=='ccwdevelop'){
             $refundAmount = 0.01;
         }

application/models/Business/Common/AdvService.php

@@ -49,6 +49,9 @@ class AdvServiceModel extends \Business\AbstractModel{
         $advInstance = \DAO\Adv\AdvModel::getInstance();
 
         $advs = \Our\RedisHelper::cachedFunction(\Redis\Db9\AdvRedisModel::getInstance(),array(&$advInstance, 'getPostionAdv'),array(\Our\AdvConst::advPositionClassTop),\Our\ApiConst::oneHour,array(\Our\AdvConst::advPositionClassTop));
+        if(!$advs){
+            $advs = array();
+        }
         return $advs;
     }
 
@@ -68,6 +71,9 @@ class AdvServiceModel extends \Business\AbstractModel{
         $advInstance = \DAO\Adv\AdvModel::getInstance();
 
         $advs = \Our\RedisHelper::cachedFunction(\Redis\Db9\AdvRedisModel::getInstance(),array(&$advInstance, 'getPostionAdv'),array(\Our\AdvConst::advPositionHomeTop),\Our\ApiConst::oneHour,array(\Our\AdvConst::advPositionHomeTop));
+        if(!$advs){
+            $advs = array();
+        }
         return $advs;
     }
 
@@ -79,6 +85,9 @@ class AdvServiceModel extends \Business\AbstractModel{
         $advInstance = \DAO\Adv\AdvModel::getInstance();
         $advInstance->getPostionAdv(\Our\AdvConst::advPositionHomeMiddle);
         $advs = \Our\RedisHelper::cachedFunction(\Redis\Db9\AdvRedisModel::getInstance(),array(&$advInstance, 'getPostionAdv'),array(\Our\AdvConst::advPositionHomeMiddle),\Our\ApiConst::oneHour,array(\Our\AdvConst::advPositionHomeMiddle));
+        if(!$advs){
+            $advs = array();
+        }
         return $advs;
     }
 
@@ -101,10 +110,7 @@ class AdvServiceModel extends \Business\AbstractModel{
                 $return['intervalTime'] = \Our\AdvConst::advIntervalSecond;
             }
         }
-        if($return){
-            return $return;
-        }
-        return false;
+        return $return;
     }
 
     public function getStoreCover($where){

application/models/Business/Message/MessageService.php

@@ -422,6 +422,13 @@ class MessageServiceModel extends \Business\AbstractModel
             return false;
         }
     }
+    public function set($memberId,$type){
+        $memberDao=\DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName);
+        if($memberDao->setIsWxsend($memberId,$type)!==false){
+            return true;
+        }
+        return false;
+    }
 
 
 }

application/models/Business/Order/OrderService.php

@@ -583,8 +583,8 @@ class OrderServiceModel extends \Business\AbstractModel
         $beginTime = file_get_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, TIMESTAMP);
         $beginTime = $beginTime ? $beginTime : ApiConst::zero;
         $endTime = TIMESTAMP - ApiConst::orderStateWaitConfirmBeyond;
+        $beginTime=0;
         $orders = $orderDao->getMustCecelRecieveOrders($beginTime, $endTime, $orderDao->getOrderDetailField());
-
         if (!empty($orders)) {
                 foreach ($orders as $order) {
                     //更新订单信息

application/models/Business/User/MemberCenterService.php

@@ -29,6 +29,12 @@ class MemberCenterServiceModel extends \Business\AbstractModel
         $memberInfo['diliverymanId'] ? $memberCenter['isDeliveryman'] = 1 : $memberCenter['isDeliveryman'] = 0;
         //是否店主
         $memberInfo['storeId'] ? $memberCenter['isSeller'] = 1 : $memberCenter['isSeller'] = 0;
+        if($memberInfo['isWxsend']>=ApiConst::zero){
+            $memberCenter['canSendMsg']=ApiConst::canSendMsg;
+        }else{
+            $memberCenter['canSendMsg']=ApiConst::cannotSendMsg;
+        }
+        $memberInfo['storeId'] ? $memberCenter['is'] = 1 : $memberCenter['isSeller'] = 0;
         //是否销售员
         $saleInstance = \DAO\SaleModel::getInstance();
         //$sale_act_id = \DAO\SaleModel::getInstance()->getOne(array('member_id'=>$memberId,'is_closing'=>0),'sale_act_id');

application/models/DAO/Member.php

@@ -2,6 +2,8 @@
 
 namespace DAO;
 
+use Error\CodeConfigModel;
+use Error\ErrorModel;
 use Our\ImageConst;
 use Our\NameConst;
 use Our\ApiConst;
@@ -17,7 +19,7 @@ class MemberModel extends \DAO\AbstractModel
     protected $_tableName = 'han_member';
 
     //有效用户返回数据
-    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');
+    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');
 
     public function init()
     {
@@ -178,7 +180,8 @@ class MemberModel extends \DAO\AbstractModel
                     'sellerId' => (int)$member['seller_id'],
                     'diliverymanId' => (int)$member['diliveryman_id'],
                     'storeId' => (int)$member['store_id'],
-                    'memberAvatarUrl' => $member['memberAvatarUrl']
+                    'memberAvatarUrl' => $member['memberAvatarUrl'],
+                    'isWxsend'=>$member['is_wxsend'],
                 );
             } else {
                 $member = $this->getOneByMemberId($memberId, '*');
@@ -198,7 +201,8 @@ class MemberModel extends \DAO\AbstractModel
                     'sellerId' => $member['seller_id'],
                     'diliverymanId' => $member['diliveryman_id'],
                     'storeId' => $member['store_id'],
-                    'memberAvatarUrl' => $member['memberAvatarUrl']
+                    'memberAvatarUrl' => $member['memberAvatarUrl'],
+                    'isWxsend'=>$member['is_wxsend'],
                 );
                 foreach ($member as $key => $value) {
                     if (empty($value) || is_null($value)) {
@@ -583,7 +587,17 @@ class MemberModel extends \DAO\AbstractModel
         $this->changeNum($memberId, $fromState, null, -1);
         $this->changeNum($memberId, $toState, null, 1);
     }
-
+    public function setIsWxsend($memberId,$type){
+           if(in_array($type,array(ApiConst::closeMessage,ApiConst::openMessae))){
+               $data['is_wxsend']=$type;
+           }else{
+               ErrorModel::throwException(CodeConfigModel::paramsError);
+           }
+        if(isset( $data['is_wxsend'])){
+            $res=$this->saveInfo($data,$memberId);
+            return $res;
+        }
+    }
     public function validPassword($where){
         if (!\Our\Validate::checkPassword($where['password'])) {
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::passwordLimit);

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';
+        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';
     }
 
     public function getOrderShippingField()

application/models/DAO/Order/RefundReturn.php

@@ -228,6 +228,7 @@ class RefundReturnModel extends \DAO\AbstractModel {
                 break;
             //已收货
             case  ApiConst::orderStateComplete:
+
                 if($order['shippingType']==ApiConst::express){
                     $order_refund=ApiConst::canRefundDay;
                 }else{

application/models/Error/CodeConfig.php

@@ -309,6 +309,7 @@ class CodeConfigModel {
     const codeIsSixNumberString = 90015;
 
     const codeIsSixNumberString1 = 90016;
+    const setMessageFail=90017;
     //销售员
     const emptySaleGoodsId = 100001;
     const emptySaleGoods = 100002;
@@ -575,6 +576,7 @@ class CodeConfigModel {
             self::wrongSmsCode => '您的验证码输入有误',
             self::codeIsSixNumberString => '短信验证码是6位数值',
             self::codeIsSixNumberString1 => '短信验证码是61位数值',
+            self::setMessageFail=>'消息设置失败',
             self::removeMessage=>'消息删除失败',
             self::storeNotExistOrClose => '店铺不存在或者已关闭',
             self::emptyStoreId => '店铺ID不能为空',

public/test/message/set.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>获得已发送消息的用户列表和(系统消息，订单消息，快递用户消息最后一条消息）</title>
+    <style>
+    </style>
+
+</head>
+<body>
+<form action="/message/set" method="post">
+    用户登录状态key:<input name="data[key]" value="ca44044c38f5a6d06ddd7304e1c7666c"/><br />
+   是否 接受消息:<input name="data[type]" value="1"/><br />
+    是否 接受消息:<input name="data[debug]" value="1"/><br />
+    <input type="submit" value="提交">
+</form>
+
+</body>
+</html>
\ No newline at end of file