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

application/models/Business/Goods/GoodsCommonService.php

@@ -865,19 +865,19 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $pageBegin = \Our\PageConst::taskPageBegin;
         $time = TIMESTAMP;
         do {
-            $orders = $orderDao->getSaleOrderGoods('rec_id,sale_act_id,sale_id,goods_id,goods_num,goods_name,goods_image,order_id,is_refund,goods_pay_price,refund_id', $addTime, $pageBegin, \Our\PageConst::taskPageSize);
-            foreach ($orders['list'] as $orderGoods) {
+            $orders = $orderDao->getSaleOrderGoods('rec_id,sale_act_id,sale_id,han_order_goods.goods_id,han_order_goods.goods_num,han_order_goods.goods_name,han_order_goods.goods_image,han_order_goods.order_id,is_refund,goods_pay_price,han_order_goods.refund_id,order_state,han_order.order_sn,han_order.buyer_id,han_order.store_id,seller_state', $addTime, $pageBegin, \Our\PageConst::taskPageSize);
+            foreach ($orders as $orderGoods) {
                 $saleOrder = \DAO\SaleOrderModel::getInstance()->find(array('order_goods_id'=>$orderGoods['rec_id']),'id');
                 $insert = [];
                 $update = [];
-                $order = \DAO\Order\OrderModel::getInstance()->findByOrderId($orderGoods['order_id'],'order_state,order_sn,buyer_id,store_id');
                 if($saleOrder){
                     $update['is_refund'] = $orderGoods['is_refund'];
-                    $update['order_state'] = $order['order_state'];
+                    $update['order_state'] = $orderGoods['order_state'];
+                    $update['seller_state'] = $orderGoods['seller_state'];
                 }else{
-                    $member = \DAO\MemberModel::getInstance()->getInfo($order['buyer_id']);
+                    $member = \DAO\MemberModel::getInstance()->getInfo($orderGoods['buyer_id']);
                     $insert['member_name'] = $member['memberName'];
-                    $insert['store_id'] = $member['store_id'];
+                    $insert['store_id'] = $orderGoods['store_id'];
                     $insert['member_avatar'] = $member['memberAvatarUrl'];
                     $insert['order_goods_id'] = $orderGoods['rec_id'];
                     $insert['sale_act_id'] = $orderGoods['sale_act_id'];
@@ -887,19 +887,12 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
                     $insert['goods_name'] = $orderGoods['goods_name'];
                     $insert['goods_image'] = $orderGoods['goods_image'];
                     $insert['order_id'] = $orderGoods['order_id'];
-                    $insert['member_id'] = $order['buyer_id'];
-                    $insert['order_state'] = $order['order_state'];
+                    $insert['member_id'] = $orderGoods['buyer_id'];
+                    $insert['order_state'] = $orderGoods['order_state'];
                     $insert['is_refund'] = $orderGoods['is_refund'];
-                    $insert['order_sn'] = $order['order_sn'];
+                    $insert['order_sn'] = $orderGoods['order_sn'];
                     $insert['goods_pay_price'] = $orderGoods['goods_pay_price'];
-                }
-                if($orderGoods['refund_id'] > 0 ){
-                    $refund = \DAO\Order\RefundReturnModel::getInstance()->find(array('refund_id'=>$orderGoods['refund_id']),'seller_state,is_platform_in,platform_state');
-                    if($saleOrder){
-                        $update['seller_state'] = $refund['seller_state'];
-                    }else{
-                        $insert['seller_state'] = $refund['seller_state'];
-                    }
+                    $insert['seller_state'] = $orderGoods['seller_state'];
                 }
                 if($saleOrder){
                     \DAO\SaleOrderModel::getInstance(\Our\DbNameConst::masterDBConnectName)->update(array('order_goods_id'=>$orderGoods['rec_id']),$update);
@@ -907,7 +900,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
                     \DAO\SaleOrderModel::getInstance(\Our\DbNameConst::masterDBConnectName)->insert($insert);
                 }
                 $saleOrderDAO = \DAO\SaleOrderModel::getInstance();
-                \Our\RedisHelper::delCachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(), array(&$saleOrderDAO, 'getOrderGoodsList'),array(),array($order['buyer_id']));
+                \Our\RedisHelper::delCachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(), array(&$saleOrderDAO, 'getOrderGoodsList'),array(),array($orderGoods['buyer_id']));
             }
             $pageBegin++;
         } while (!empty($orders['list']));

application/models/Business/Order/RefundService.php

@@ -250,6 +250,7 @@ class RefundServiceModel extends \Business\AbstractModel
         $orderGoodsConvert = $orderGoodsDao->getRefundOrderGoods($orderGoods);
         $returnData = array(
             'orderId' => (int)$orderId,
+            'orderSn'=>$orderInfo['orderSn'],
             'needShippingFee' => $orderInfo['needShippingFee'],
             'shippingType' => $orderInfo['shippingType'],
             'shippingFee' => $shippingFee,

application/models/Business/Store/ShopkeeperService.php

@@ -577,7 +577,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
     {
 
         $elasticsTool = ElasticsToolModel::getInstance('orders');
-        $elasticsTool->deleteIndex();
+       // $elasticsTool->deleteIndex();
         $indexsFiled = array(
             'goodsName' => array(
                 'type' => 'string',

application/models/DAO/Order/OrderGoods.php

@@ -188,12 +188,10 @@ class OrderGoodsModel extends \DAO\AbstractModel {
     }
     //销售订单
     public function getSaleOrderGoods($field,$updateTime,$pageIndex,$pageSize) {
+        $pageIndex += 1;
         $this->setDb($this->dbName);
-        $where = Common::format('sale_act_id >0 AND gmt_update >= {0}', $updateTime);
-        $list = $this->lists($where, '', $field, $pageIndex, $pageSize);
-        return $list;
+        return $this->db->select($field)->from($this->_tableName)->join('han_order',"han_order.order_id = han_order_goods.order_id",'inner')->join('han_refund_return','han_order_goods.refund_id = han_refund_return.refund_id','left')->where("sale_act_id > 0 AND (han_order_goods.gmt_update > {$updateTime} OR han_order.gmt_update > {$updateTime} OR han_refund_return.gmt_update > {$updateTime})")->page($pageIndex,$pageSize)->fetchAll();
     }
-
     public function insertAll($datas){
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
         $error = 0;