Skip to content

M
my-yaf-project
Commit 090d4c3e authored by liuyuzhen's avatar liuyuzhen
Browse files
Options

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

parents 5ac6914c 81ec32c8
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 30 deletions
application/models/Business/Order/RefundService.php
View file @ 090d4c3e
......@@ -400,12 +400,15 @@ class RefundServiceModel extends \Business\AbstractModel
public function getStoreRefundList($storeId, $type=0,$pageIndex = ApiConst::zero, $pageSize = ApiConst::pageSize)
{
$refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName);
$orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
$orderDao=\DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
$orderDao=\DAO\Order\OrderModel::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');
......@@ -423,14 +426,18 @@ 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);
$orderWhere['order_id']=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));
$refundGoods = Common::intergrateOneToOne($refundReturns['list'], $orderGoods, 'orderGoodsId', 'recId');
$refundMerge = Common::intergrateOneToOne($refundGoods, $orders, 'orderId', 'orderId');
$refundMerge =Common::intergrateOneToOne($refundMerge,$orderCommons,'orderId','orderId');
......@@ -844,6 +851,8 @@ class RefundServiceModel extends \Business\AbstractModel
{
$refundReturnDao = \DAO\Order\RefundReturnModel::getInstance();
$orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance();
$orderDao= \DAO\Order\OrderModel::getInstance();
$orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);
$storeDao = \DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName);
$goodsDao = \DAO\GoodsModel::getInstance();
$refundReturn = $refundReturnDao->findByRefundId($returnId, $this->refundReturnField);
......@@ -852,9 +861,10 @@ class RefundServiceModel extends \Business\AbstractModel
ErrorModel::throwException(CodeConfigModel::notExistRefund);
}
$orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\RefundReasonRedisModel::getInstance(), array(&$orderGoodsDao, 'findByRecId'), array($refundReturn['orderGoodsId'], $this->getGoodsDetailField()), \Our\ApiConst::oneDaySecond);
$this->orderCommon = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array($refundReturn['orderId'], $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond);
// $this->store=$storeDao->get($refundReturn['storeId']);
// $this->store=Common::convertUnderline($this->store[0]);
$order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($refundReturn['orderId'],$orderDao->getOrderDetailField()), \Our\ApiConst::oneDaySecond, array($refundReturn['orderId']));
$this->store = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$storeDao, 'getInfoById'), array($refundReturn['storeId'],$storeDao->detailField), \Our\ApiConst::sevenDaySecond,array($refundReturn['storeId']));
$refundReturn['goodsGroup'] = $goodsDao->getGoodsGroup($orderGoods['goodsGroup']);
$refundReturn['goodsAttr'] = $goodsDao->getFormatGoodsAttr($orderGoods['goodsSpec']);
......@@ -865,31 +875,44 @@ class RefundServiceModel extends \Business\AbstractModel
if(!empty($refundReturn['picInfo'])){
$refundReturn['picInfo'] = $refundReturnDao->getRefundPics($refundReturn['picInfo']['buyer']);
}
$refundReturn['couponAmount'] = ($order['goodsAmount'] + $order['shippingFee']) - $order['orderAmount'];//优惠券金额
$refundReturn['orderAmount'] = $order['orderAmount'] ;
$refundReturn['goodsAmount']=$order['goodsAmount'];
$refundReturn['shippingFee']=$order['shippingFee'];
// $value['orderAmount'] = $value['orderAmount'];
$refundReturn['reciverInfo'] = unserialize($this->orderCommon['reciverInfo']);
if ($refundReturn['refundType'] == ApiConst::refundTypeGoods) {
if($refundReturn['refundShippingType']==ApiConst::bySeller){
$refundReturn['reciverInfo']=$orderCommonDao->getReciverInfo($refundReturn['reciverInfo']);
}
} else {
$refundReturn['reciverInfo'] = new \stdClass();
}
//平台操作类型
$refundReturn['storeMemberId']=$this->store['memberId'];
$refundReturn['platformStateName'] = ArrayConst::platformState[$refundReturn['platformState']];
$refundReturn['refundShippingTypeName'] = ArrayConst::refundShippingType[$refundReturn['refundShippingType']]['name'];
$refundReturn['refundText'] = $refundReturnDao->getRefundTextStatus($refundReturn);
$refundReturn['goodsImage'] = ImageUtil::getGoodsImgUrl($refundReturn['goodsImage'], ApiConst::goodsSmallSize);
$addressDao = \DAO\Order\DAddressModel::getInstance();
//$addressDao = \DAO\Order\DAddressModel::getInstance();
$info = $refundReturn;
if ($refundReturn['refundType'] == ApiConst::refundTypeGoods) {
if ($refundReturn['addressId']) {
$address = $addressDao->getAddressByAddressId($refundReturn['addressId'], $this->daddressField);
} else {
$address = $addressDao->getAddressByStoreId($refundReturn['storeId'], $this->daddressField);
}
if(!empty($address)){
$address['isDefault'] = (int)$address['isDefault'];
$address['company']=isset( $address['company'])? $address['company']:'';
$info['dAddressInfo'] = $address;
}else{
$info['dAddressInfo'] =new \stdClass();
}
} else {
$info['dAddressInfo'] = new \stdClass();
}
// if ($refundReturn['refundType'] == ApiConst::refundTypeGoods) {
// if ($refundReturn['addressId']) {
// $address = $addressDao->getAddressByAddressId($refundReturn['addressId'], $this->daddressField);
// } else {
// $address = $addressDao->getAddressByStoreId($refundReturn['storeId'], $this->daddressField);
// }
// if(!empty($address)){
// $address['isDefault'] = (int)$address['isDefault'];
// $address['company']=isset( $address['company'])? $address['company']:'';
// $info['dAddressInfo'] = $address;
// }else{
// $info['dAddressInfo'] =new \stdClass();
// }
//
// } else {
// $info['dAddressInfo'] = new \stdClass();
// }
$info['canPlatformIn'] = $refundReturnDao->isPlatformIn($info) ? ApiConst::one : ApiConst::zero;
$info['canSendShippingType'] = $refundReturnDao->checkIsAddReturnShipping($info) ? ApiConst::one : ApiConst::zero;
if($info['refundShippingType']==ApiConst::bySeller){
......@@ -916,8 +939,7 @@ class RefundServiceModel extends \Business\AbstractModel
$info['diliveryman']=new \stdClass();
}
if($this->clientType==NameConst::pcClient){
$orderDao=\DAO\Order\OrderModel::getInstance();
$orderCommon=$orderDao->getClienOrderCommon($info['orderId']);
$orderCommon=$orderDao->getClienOrderCommon($order);
$info=array_merge($info,$orderCommon);
}
if (!$refundReturn) {
......
application/models/DAO/Order/ApiReciverInfo.php
View file @ 090d4c3e
......@@ -72,7 +72,7 @@ class ApiReciverInfoModel extends \DAO\AbstractModel
$reciverInfo['areaInfo']=$this->areaInfo;
$reciverInfo['lng']=$this->lng;
$reciverInfo['lat']=$this->lat;
$reciverInfo['trueName']=$this->trueName;
$reciverInfo['trueName']=$this->trueName?$this->trueName:'未知';
$reciverInfo['subAddress']=$this->subAddress;
return $reciverInfo;
}
......
application/models/DAO/Order/Order.php
View file @ 090d4c3e
......@@ -1098,13 +1098,13 @@ class OrderModel extends \DAO\AbstractModel
* pcClient 获得订单数量
*/
public function getClienOrderCommon($orderId){
public function getClienOrderCommon($order){
$returnData=array();
$order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond, array($orderId));
$returnData['couponAmount'] = ($order['goodsAmount'] + $order['shippingFee']) - $order['orderAmount'];//优惠券金额
$returnData['receiveAmount'] = $order['goodsAmount'] - $returnData['couponAmount'];
$returnData['orderAmount'] = $order['orderAmount'] + $returnData['couponAmount'];
$returnData['orderAmount'] = $order['orderAmount'] ;
$returnData['goodsAmount']=$order['goodsAmount'];
$returnData['shippingFee']=$order['shippingFee'];
$returnData['paymentType']=$order['paymentType'];
return $returnData;
......
application/modules/Client/controllers/Shopkeeper.php
View file @ 090d4c3e
......@@ -241,7 +241,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
$type = intval($this->req['data']['type']);
$refundService=\Business\Order\RefundServiceModel::getInstance();
$pageIndex=$this->getPageIndex();
$pageSize=$this->getPageSize(8);
$pageSize=$this->getPageSize();
$res=$refundService->getStoreRefundList($this->storeId, $type, $pageIndex, $pageSize);
$this->success($res);
}
......
public/client/shopkeeper/getRefundDetail.php 0 → 100644
View file @ 090d4c3e
<!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/getRefundDetail" method="post">
用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><br />
订单id:<input name="data[refundId]" value="935"/><br />
<p id="img_area"></p>
<input type="submit" value="提交">
</form>
</body>
</html>
\ No newline at end of file
public/client/shopkeeper/getRefunds.php
View file @ 090d4c3e
......@@ -11,7 +11,7 @@
<form action="/client/shopkeeper/getRefunds" method="post">
用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><br />
type:<input name="data[type]" value="0"/><br />
index:<input name="data[pageIndex]" value="0"/><br />
size:<input name="data[pageSize]" value="20"/><br />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment