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

application/models/Business/Order/RefundService.php

@@ -401,7 +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');
@@ -420,19 +424,38 @@ 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($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');
+            $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;
                 $value['canPlatformIn'] = $refundReturnDao->isPlatformIn($value) ? ApiConst::one : ApiConst::zero;
                 $value['canSendShippingType'] = $refundReturnDao->checkIsAddReturnShipping($value) ? ApiConst::one : ApiConst::zero;*/
+                $value['couponAmount'] = ($value['goodsAmount'] + $value['shippingFee']) - $value['orderAmount'];//优惠券金额
+                $value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount'];
+                // $value['orderAmount'] = $value['orderAmount'];
+                $value['reciverInfo'] = unserialize($value['reciverInfo']);
+                $value['dlyoPickupCode'] = intval(substr($value['orderSn'], ApiConst::positionPickupCodeBegin));
+                $value['deliveryTimeEnd'] = $value['deliveryTime'] + ApiConst::arriveTimeRadius;
                 $value['goodsImage'] = ImageUtil::getGoodsImgUrl($value['goodsImage'], ApiConst::goodsSmallSize);
                 $value['goodsAttr']=$goodsDao->getFormatGoodsAttr($value['goodsSpec']);
                 $goodGroup=unserialize($value['goodsGroup']);
                 $value['goodsGroup']=!empty($goodGroup)?$goodGroup:[];
+                if ($value['refundType'] == ApiConst::refundTypeGoods) {
+                    if($value['refundShippingType']==ApiConst::bySeller){
+                        $value['reciverInfo']=$orderCommonDao->getReciverInfo($value['reciverInfo']);
+                    }
+                } else {
+                    $value['reciverInfo'] = new \stdClass();
+                }
                 unset($value['goodsSpec']);
                // unset($value['picInfo']);
             }

application/modules/Client/controllers/Delivery.php

@@ -21,6 +21,7 @@ class DeliveryController extends \Our\Controller_AbstractClient {
 
     public function init(){
         parent::init();
+        $this->shopkeeperService  = ShopkeeperServiceModel::getInstance();
 
     }
     /**

public/client/shopkeeper/getRefunds.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/getRefunds" method="post">
+
+    用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><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>
+
+</body>
+</html>
\ No newline at end of file

public/client/shopkeeper/orders.php

@@ -13,6 +13,9 @@
     用户登录状态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 />
+    size:<input name="data[sign]" value="20"/><br />
     <p id="img_area"></p>
     <input type="submit" value="提交">
 </form>