Commit 4543a86e authored by christ's avatar christ

goods

parent c910b4ed
...@@ -25,6 +25,9 @@ class OrderConst { ...@@ -25,6 +25,9 @@ class OrderConst {
const express='快递配送'; const express='快递配送';
const complete="已完成"; const complete="已完成";
const close="已关闭"; const close="已关闭";
const platformStateVerify='待审核';
const platformStateAgree='同意';
const platformStateRefuse='拒绝';
const platformAudit="平台审核"; const platformAudit="平台审核";
const platFormAgree="平台同意"; const platFormAgree="平台同意";
...@@ -50,7 +53,14 @@ class OrderConst { ...@@ -50,7 +53,14 @@ class OrderConst {
//详情 //详情
const unpayDetailMessage="10分钟后交易自动关闭"; const unpayDetailMessage="10分钟后交易自动关闭";
const payCancelDetailMessage="10分钟可取消订单"; const payCancelDetailMessage="10分钟可取消订单";
//商家售后状态
const sellerStateVerify='待审核';
const sellerStateAgree='同意';
const sellerStateRefuse='不同意';
//商家售后状态
const platStateVerify='待审核';
const platStateAgree='同意';
const platStateRefuse='不同意';
//店铺详细文案 //店铺详细文案
const storeWaiteConfirm='请尽快确认订单'; const storeWaiteConfirm='请尽快确认订单';
const storeWaiteSend='请尽快发货'; const storeWaiteSend='请尽快发货';
......
...@@ -702,6 +702,7 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -702,6 +702,7 @@ class RefundServiceModel extends \Business\AbstractModel
$orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField); $orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
$orderCommons=$orderDao->convertOrder($orderCommons,'orderId'); $orderCommons=$orderDao->convertOrder($orderCommons,'orderId');
foreach ($refundMerge as &$value) { foreach ($refundMerge as &$value) {
$value['sellerStateName']=$refundReturnDao->getSellerStateName($value['sellerState']);
$value['stateName'] = $refundReturnDao->getRefundTextStatus($value,true); $value['stateName'] = $refundReturnDao->getRefundTextStatus($value,true);
/*$value['blId'] = isset($value['blId']) ? (!is_null($value['blId']) ? $value['blId'] : ApiConst::zero) : ApiConst::zero; /*$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['canPlatformIn'] = $refundReturnDao->isPlatformIn($value) ? ApiConst::one : ApiConst::zero;
...@@ -725,7 +726,13 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -725,7 +726,13 @@ class RefundServiceModel extends \Business\AbstractModel
}else{ }else{
$value['deliveryman']=new \stdClass(); $value['deliveryman']=new \stdClass();
} }
$value['goodsGroup']=!empty($goodGroup)?$goodGroup:[]; if(!empty($goodGroup)){
$value['goodsGroup']=$goodGroup;
}else{
$value['goodsGroup']=[];
$value['goodsOriginPrice']=$goodsDao->getOriginPriceByGoodsGroup($value['goodsGroup']);
}
if ($value['refundType'] == ApiConst::refundTypeGoods) { if ($value['refundType'] == ApiConst::refundTypeGoods) {
if($value['refundShippingType']==ApiConst::bySeller){ if($value['refundShippingType']==ApiConst::bySeller){
$value['reciverInfo']=$orderCommonDao->getReciverInfo($value['reciverInfo']); $value['reciverInfo']=$orderCommonDao->getReciverInfo($value['reciverInfo']);
......
...@@ -474,6 +474,14 @@ class GoodsModel extends \DAO\AbstractModel { ...@@ -474,6 +474,14 @@ class GoodsModel extends \DAO\AbstractModel {
} }
return $orderGoodses; return $orderGoodses;
} }
public function getOriginPriceByGoodsGroup($goodsGroup){
$goodsOriginPrice=ApiConst::zero;
foreach( $goodsGroup as $goodsG){
$goodsOriginPrice+= $goodsG['num']*$goodsG['goodsPrice'];
}
return $goodsOriginPrice;
}
//ccw //ccw
public function convert($goodses,$extentField=false,$refundOrders=false){ public function convert($goodses,$extentField=false,$refundOrders=false){
if($refundOrders){ if($refundOrders){
......
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