pc

application/models/Business/Order/RefundService.php

@@ -401,9 +401,11 @@ class RefundServiceModel extends \Business\AbstractModel
     {
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName);
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
+
         $orderDao=\DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
         $goodsDao=\DAO\GoodsModel::getInstance(DbNameConst::salveDBConnectName);
         $addressDao = \DAO\Order\DAddressModel::getInstance(DbNameConst::salveDBConnectName);
+        $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance();
         $where['store_id'] = $storeId;
         $where['order_lock'] = 2;
         $order = array('add_time' => 'desc');
@@ -422,12 +424,16 @@ class RefundServiceModel extends \Business\AbstractModel
         //获得售后列表
         $refundReturns = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$refundReturnDao, 'getList'), array($where, $this->storeRefundReturnField, $pageIndex, $pageSize, $order), \Our\ApiConst::oneDaySecond, array($storeId));
         $orderGoodsId = array_column($refundReturns['list'], 'orderGoodsId');
+        $orderIds= array_column($refundReturns['list'], 'orderId');
+        $orderWhere['orderId']=array('in',$orderIds);
         //获得售后商品列表getOrderGoodsByRecIds
         if (!empty($orderGoodsId)) {
-            $orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($where, "goods_amount as goods_amount,order_amount as orderAmount,shipping_fee as shippingFee,order_sn as orderSn,payment_type as paymentType", $pageIndex, $pageSize, $order, \Our\ApiConst::oneDaySecond, array($storeId)));
+            $orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($orderWhere, "goods_amount as goods_amount,order_amount as orderAmount,shipping_fee as shippingFee,order_sn as orderSn,payment_type as paymentType", $pageIndex, $pageSize, $order, \Our\ApiConst::oneDaySecond, array($storeId)));
+            $orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
             $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByRecIds'), array($orderGoodsId, $this->refundOrderGoodsField), \Our\ApiConst::oneDaySecond, array($storeId));
-            $refundMerge = Common::intergrateOneToOne($refundReturns['list'], $orderGoods, 'orderGoodsId', 'recId');
-            $refundMerge = Common::intergrateOneToOne($refundMerge, $orders, 'orderId', 'orderId');
+            $refundGoods = Common::intergrateOneToOne($refundReturns['list'], $orderGoods, 'orderGoodsId', 'recId');
+            $refundMerge = Common::intergrateOneToOne($refundGoods, $orders, 'orderId', 'orderId');
+            $refundMerge =Common::intergrateOneToOne($refundMerge,$orderCommons,'orderId','orderId');
             foreach ($refundMerge as &$value) {
                 $value['stateName'] = $refundReturnDao->getRefundTextStatus($value);
                 /*$value['blId'] = isset($value['blId']) ? (!is_null($value['blId']) ? $value['blId'] : ApiConst::zero) : ApiConst::zero;
@@ -443,23 +449,12 @@ class RefundServiceModel extends \Business\AbstractModel
                 $value['goodsAttr']=$goodsDao->getFormatGoodsAttr($value['goodsSpec']);
                 $goodGroup=unserialize($value['goodsGroup']);
                 $value['goodsGroup']=!empty($goodGroup)?$goodGroup:[];
-
                 if ($value['refundType'] == ApiConst::refundTypeGoods) {
-                    if ($value['addressId']) {
-                        $address = $addressDao->getAddressByAddressId($value['addressId'], $this->daddressField);
-                    } else {
-                        $address = $addressDao->getAddressByStoreId($value['storeId'], $this->daddressField);
-                    }
-                    if(!empty($address)){
-                        $address['isDefault'] = (int)$address['isDefault'];
-                        $address['company']=isset( $address['company'])? $address['company']:'';
-                        $value['dAddressInfo'] = $address;
-                    }else{
-                        $value['dAddressInfo'] =new \stdClass();
+                    if($value['refundShippingType']==ApiConst::bySeller){
+                        $value['reciverInfo']=$orderCommonDao->getReciverInfo($value['reciverInfo']);
                     }
-
                 } else {
-                    $value['dAddressInfo'] = new \stdClass();
+                    $value['reciverInfo'] = new \stdClass();
                 }
                 unset($value['goodsSpec']);
                // unset($value['picInfo']);

public/client/shopkeeper/orders.php

@@ -13,6 +13,8 @@
     用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><br />
     订单状态id:<input name="data[orderState]" value=""/><br />
     keyword:<input name="data[keyword]" value="400"/><br />
+    index:<input name="data[pageIndex]" value="0"/><br />
+    size:<input name="data[pageSize]" value="20"/><br />
     <p id="img_area"></p>
     <input type="submit" value="提交">
 </form>