log

application/library/Order/OrderConfirmUtil.php

@@ -261,7 +261,7 @@ class OrderConfirmUtil {
         $orderDao = \DAO\Order\OrderModel::getInstance($dbName);
         $newPaySn = $this->makePaySn($memberId);
         $orderDao->db->doTransaction();
-        $orderPay['pay_sn'] = $paySn;
+        $orderPay['pay_sn'] = $newPaySn;
         $orderPay['buyer_id'] = $memberId;
         $orderPay['api_pay_state'] = \Our\ApiConst::zero;
         $orderPayModel = \DAO\Order\OrderPayModel::getInstance($dbName);
@@ -912,7 +912,7 @@ class OrderConfirmUtil {
         $updateOrder['is_receive_payment'] = \Our\ApiConst::one;
         $updateOrder['payment_time'] = (isset($data['payment_time'])? strtotime($data['payment_time']) : TIMESTAMP);
         $updateOrder['payment_type'] = $this->getOrderPaymentType($data['pay_type']);
-        $orderUpdateResult = $orderModel->update($orderCon,$updateOrder);	
+        $orderUpdateResult = $orderModel->update($orderCon,$updateOrder);
         if(!$orderUpdateResult){
             $orderModel->db->doRollback();
             $errorCode = \Error\CodeConfigModel::updateOrderPayedStatusFailed;

application/library/Our/DescribeConst.php

@@ -160,5 +160,7 @@ class DescribeConst
     const confirmButton='确认收货';
 
     const cancelOrderMessage='十分钟未支付，自动取消订单';
+
+    const anonymity = '匿名用户';
 }
 ?>
\ No newline at end of file

application/library/Payment/TencentPay.php

@@ -151,8 +151,6 @@ class TencentPay {
         //运行curl
         $data = curl_exec($ch);
         curl_close($ch);
-        \Our\Log::getInstance()->write(json_encode($data));
-        \Our\Log::getInstance()->write($data);
         //返回结果
         if($data)
         {   //var_dump($data);die('||');

application/library/Payment/WxPay.php

@@ -91,6 +91,7 @@ class WxPay extends \Payment\TencentPay
         return $values;
     }
 
+
     /**
      * 类实例
      *

application/models/Business/Goods/GoodsCommonService.php

@@ -561,12 +561,19 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $evaluation = \Our\RedisHelper::cachedFunction(\Redis\Db4\EvaluateGoodsRedisModel::getInstance(),array(&$evaluateInstance, 'getList'),array(array('geval_goods_commonid'=>$goodsCommonId,'geval_state'=>0),'geval_frommemberid,geval_frommembername AS memberName,geval_content AS gevalContent,geval_addtime AS gevalTime,geval_image,geval_explain AS gevalExplain,geval_isanonymous AS isAnonymous,goods_spec,member_avatar AS memberAvatar',array('geval_addtime','DESC'),1,1),\Our\ApiConst::oneDaySecond,array($goodsCommonId));
         if($evaluation){
             $evaluation = $evaluation[0];
-            $member= \DAO\MemberModel::getInstance()->getInfo($evaluation['geval_frommemberid']);
-            $evaluation['memberAvatar'] = $member['memberAvatarUrl'];
+            if($evaluation['isAnonymous'] == 1) {
+                $evaluation['memberAvatar'] = \DAO\MemberModel::getInstance()->getMemberAvatarUrl(0);
+                $evaluation['memberName'] = \Our\DescribeConst::anonymity;
+            }else{
+                $member= \DAO\MemberModel::getInstance()->getInfo($evaluation['geval_frommemberid']);
+                $evaluation['memberAvatar'] = $member['memberAvatarUrl'];
+            }
             $gevalImage = [];
             if(unserialize($evaluation['geval_image'])){
                 foreach (unserialize($evaluation['geval_image']) as $v){
-                    $gevalImage[] = \Our\Common::getStaticFile($v,\Our\ImageConst::goodsEvaluation);;
+                    if($v) {
+                        $gevalImage[] = \Our\Common::getStaticFile($v,\Our\ImageConst::goodsEvaluation)."?x-oss-process=image/resize,m_fill,h_222,w_222";
+                    }
                 }
             }
             //规格
@@ -637,12 +644,12 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::commonError);
         }
         $pageIndex=$pageIndex+\Our\ApiConst::one;
-        isset($param['commentType'])?$commentType = intval($param['commentType']):$commentType = 0;
+        isset($param['commentType'])?$commentType = intval($param['commentType']):$commentType = 1;
 
         $evaluateInstance = \DAO\EvaluateGoodsModel::getInstance();
         $where = array('geval_goods_commonid'=>$goodsCommonId,'geval_state'=>0);
         $args = array(array('geval_goods_commonid'=>$goodsCommonId,'geval_state'=>0),'geval_frommemberid,geval_frommembername AS memberName,geval_content AS gevalContent,geval_addtime AS addTime,geval_image,geval_explain AS gevalExplain,geval_isanonymous AS isAnonymous,goods_spec,member_avatar AS memberAvatar',array('geval_addtime','DESC'),$pageIndex,$pageSize);
-        if($commentType === 1){
+        if($commentType === 2){
             $args[] = true;
         }
         $evaluations = \Our\RedisHelper::cachedFunction(\Redis\Db4\EvaluateGoodsRedisModel::getInstance(),array(&$evaluateInstance, 'getList'),$args,\Our\ApiConst::oneDaySecond,array($goodsCommonId));
@@ -651,12 +658,19 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $data = [];
         if(is_array($evaluations) && !empty($evaluations)){
             foreach ($evaluations as $evaluation){
-                $member= \DAO\MemberModel::getInstance()->getInfo($evaluation['geval_frommemberid']);
-                $evaluation['memberAvatar'] = $member['memberAvatarUrl'];
+                if($evaluation['isAnonymous'] == 1) {
+                    $evaluation['memberAvatar'] = \DAO\MemberModel::getInstance()->getMemberAvatarUrl(0);
+                    $evaluation['memberName'] = \Our\DescribeConst::anonymity;
+                }else{
+                    $member= \DAO\MemberModel::getInstance()->getInfo($evaluation['geval_frommemberid']);
+                    $evaluation['memberAvatar'] = $member['memberAvatarUrl'];
+                }
                 $gevalImage = [];
                 if($evaluation['geval_image']){
                     foreach (unserialize($evaluation['geval_image']) as $v){
-                        $gevalImage[] = \Our\Common::getStaticFile($v,\Our\ImageConst::goodsEvaluation);;
+                        if($v) {
+                            $gevalImage[] = \Our\Common::getStaticFile($v,\Our\ImageConst::goodsEvaluation)."?x-oss-process=image/resize,m_fill,h_222,w_222";
+                        }
                     }
                 }
                 //规格

application/models/Business/Order/OrderService.php

@@ -153,10 +153,16 @@ class OrderServiceModel extends \Business\AbstractModel
                 $returnData['totalCount'] = $orders['totalCount'];
                 return $returnData;
             } else {
-                return new \stdClass();
+                return Array(
+                    'orders'=>[],
+                    'totalCount'=>ApiConst::zero,
+                );
             }
         } else {
-            return new \stdClass();
+            return Array(
+                'orders'=>[],
+                'totalCount'=>ApiConst::zero,
+            );
         }
 
 
@@ -220,7 +226,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $this->order = $orderDao->getConvertOrder($order, $fields);
         //收货人地址
         //收货人信息
-        $this->orderCommon = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array($orderId, $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond);
+        $this->orderCommon = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array($orderId, $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond,array($orderId));
         //$this->orderCommon = $orderCommonDao->findByOrderId($orderId, $this->orderCommonField);
         $reciverInfo = $this->orderCommon['reciverInfo'];
         $reciverInfo = unserialize($reciverInfo);
@@ -497,7 +503,6 @@ class OrderServiceModel extends \Business\AbstractModel
 
     public $baseDir;
 
-    //订单任务脚本关闭订单
     //订单任务脚本关闭订单
     public function cancelOrderTask()
     {
@@ -784,7 +789,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $orderId = $delivery['orderId'];
         //订单
 
-        $order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond);
+        $order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond,array($orderId));
         if (empty($order)) {
             ErrorModel::throwException(CodeConfigModel::notExsitOrder);
         }
@@ -1002,7 +1007,7 @@ class OrderServiceModel extends \Business\AbstractModel
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyOrderIdForPay);
         }
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
-        $order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond);
+        $order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond,array($orderId));
         if (!$order) {
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyOrderForPay);
         }

application/models/Business/Store/ShopkeeperService.php

@@ -359,7 +359,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $storeDao = \DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName);
         $goodsDao = \DAO\GoodsModel::getInstance(DbNameConst::salveDBConnectName);
         //订单
-        $order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond);
+        $order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond,array($orderId));
         if ($order['store_id'] != $storeId) {
             ErrorModel::throwException(CodeConfigModel::orderError);
         }

application/models/DAO/EvaluateGoods.php

@@ -35,7 +35,7 @@ class EvaluateGoodsModel extends \DAO\AbstractModel {
     public function getList($where,$field,$order,$pageIndex,$pageSize,$haveImg = false){
         $this->setDb();
         if($haveImg){
-            return $this->db->select($field)->from($this->_tableName)->where($where)->where('geval_image is not null')->order($order[0],$order[1])->page($pageIndex,$pageSize)->fetchAll();
+            return $this->db->select($field)->from($this->_tableName)->where($where)->where("geval_image !='N;'")->order($order[0],$order[1])->page($pageIndex,$pageSize)->fetchAll();
         }
         return $this->db->select($field)->from($this->_tableName)->where($where)->order($order[0],$order[1])->page($pageIndex,$pageSize)->fetchAll();
     }

application/models/DAO/Order/Order.php

@@ -771,7 +771,7 @@ class OrderModel extends \DAO\AbstractModel
     //删除订单详情缓存
     public function deleteFindByOrderIdCache($orderId)
     {
-        return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'findByOrderId'), array($orderId),array($orderId));
+        return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'findByOrderId'), array(),array($orderId));
     }
 
     //删除订单列表缓存
@@ -821,7 +821,7 @@ class OrderModel extends \DAO\AbstractModel
             $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
             $orderGoodsDao->deleteOrderGoodsCache($memberId, $orderId);
             $orderCommonDao= \DAO\Order\OrderCommonModel::getInstance(DbNameConst::masterDBConnectName);
-            \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array($orderId, $orderCommonDao->orderCommonField));
+            \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array(),$orderId);
 
         }
         return true;

application/models/DAO/Order/RefundReturn.php

@@ -273,21 +273,30 @@ class RefundReturnModel extends \DAO\AbstractModel {
             $refund_return = $wxpay->refund($param);
             $this->errorMessage= "微信返回:".json_encode($refund_return);
             if (!($refund_return['return_code'] == 'SUCCESS' && $refund_return['result_code'] == 'SUCCESS')) {
-                $this->errorMessage='微信退款操作执行失败！'.$orderInfo['orderId']."\r\n";
+                $this->errorMessage=date('Y-m-d').'微信退款操作执行失败！'.$orderInfo['orderId']."\r\n";
                 return false;
             }
         } else if (intval($orderInfo['paymentType']) == ApiConst::alipay) {
-            $aliPay=\Payment\Alipay::getInstance();
+            $aliPay = \Payment\Alipay::getInstance();
             $return = $aliPay->refund($param);
-            $this->errorMessage="支付宝返回:".json_encode($return);
+            $this->errorMessage = "支付宝返回:" . json_encode($return);
             $resultCode = $return->code;
-            if(!empty($resultCode)&&$resultCode ==ApiConst::alipayRefundSuccess ){
+            if (!empty($resultCode) && $resultCode == ApiConst::alipayRefundSuccess) {
                 return true;
             } else {
-                $this->errorMessage= '支付宝退款操作执行失败:'.$orderInfo['orderId']."\r\n";
+                $this->errorMessage = date('Y-m-d') . '支付宝退款操作执行失败:' . $orderInfo['orderId'] . "\r\n";
+                return false;
+            }
+        }else if(intval($orderInfo['paymentType']) == ApiConst::wxProgram){
+            $wxpay = \Payment\WxPay::getInstance();
+            $refund_return = $wxpay->refund($param);
+            $this->errorMessage= "微信小程序返回:".json_encode($refund_return);
+            if (!($refund_return['return_code'] == 'SUCCESS' && $refund_return['result_code'] == 'SUCCESS')) {
+                $this->errorMessage=date('Y-m-d').'微信退款操作执行失败！'.$orderInfo['orderId']."\r\n";
                 return false;
             }
         }
+        return true;
     }
     /**
      * 增加退款退货

scripts/crontab/order/close.php

@@ -81,7 +81,7 @@ class cliOrderClose extends basecli
         }
         $this->autoCloseOrder();
 
-        echo '定单关闭消息发送成功'."\r\n";
+        echo date('Y-m-d H:i:s',TIMESTAMP).'定单关闭消息成功'."\r\n";
     }
 }