Skip to content

M
my-yaf-project
Commit 4a9886be authored by wwccw0591's avatar wwccw0591
Browse files
Options

ccw:master_dev

parent 2f3902f1
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 21 deletions
application/library/Our/ApiConst.php
View file @ 4a9886be
...@@ -131,6 +131,8 @@ class ApiConst ...@@ -131,6 +131,8 @@ class ApiConst
const refundSellerAgree = 2; const refundSellerAgree = 2;
const refundSellerRefuse = 3; const refundSellerRefuse = 3;
const refundTypeGoods = 2; const refundTypeGoods = 2;
const returnTypeNotReturn=1;
const returnTypeMustReturn=2;
const refundTypeMoney = 1; const refundTypeMoney = 1;
const refundApplyOnlyMoney = 1; const refundApplyOnlyMoney = 1;
......
application/models/Business/Order/RefundService.php
View file @ 4a9886be
...@@ -446,20 +446,24 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -446,20 +446,24 @@ class RefundServiceModel extends \Business\AbstractModel
$info['canPlatformIn'] = $refundReturnDao->isPlatformIn($info) ? ApiConst::one : ApiConst::zero; $info['canPlatformIn'] = $refundReturnDao->isPlatformIn($info) ? ApiConst::one : ApiConst::zero;
$info['canSendShippingType'] = $refundReturnDao->checkIsAddReturnShipping($info) ? ApiConst::one : ApiConst::zero; $info['canSendShippingType'] = $refundReturnDao->checkIsAddReturnShipping($info) ? ApiConst::one : ApiConst::zero;
if($info['refundShippingType']==ApiConst::bySeller){ if($info['refundShippingType']==ApiConst::bySeller){
if(!$info['diliverymanId']){ if($info['returnType']==ApiConst::returnTypeMustReturn){
$info['diliveryman']=ArrayConst::defaultDeliveryMan; if(!$info['diliverymanId']){
}else{ $info['diliveryman']=ArrayConst::defaultDeliveryMan;
$diliveryMan=$diliveryManDao->findById($info['diliverymanId']);
if(!empty($diliveryMan)){
$diliveryMan=array(
'id'=>$diliveryMan['id'],
'trueName'=>$diliveryMan['true_name'],
'mobile'=>$diliveryMan['mobile'],
);
$info['diliveryman']=$diliveryMan;
}else{ }else{
$info['diliveryman']=new \stdClass(); $diliveryMan=$diliveryManDao->findById($info['diliverymanId']);
if(!empty($diliveryMan)){
$diliveryMan=array(
'id'=>$diliveryMan['id'],
'trueName'=>$diliveryMan['true_name'],
'mobile'=>$diliveryMan['mobile'],
);
$info['diliveryman']=$diliveryMan;
}else{
$info['diliveryman']=new \stdClass();
}
} }
}else{
$info['diliveryman']=new \stdClass();
} }
}else{ }else{
$info['diliveryman']=new \stdClass(); $info['diliveryman']=new \stdClass();
......
public/test/order/addRefund.php
View file @ 4a9886be
This source diff could not be displayed because it is too large. You can view the blob instead.
public/test/order/getRefundDetail.php
View file @ 4a9886be
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
</head> </head>
<body> <body>
<form action="/order/getRefundDetail" method="post"> <form action="/order/getRefundDetail" method="post">
用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><br /> 用户登录状态key:<input name="data[key]" value="52da049f7e2fbf0e10da32dfe909850e"/><br />
退款refundId:<input name="data[refundId]" value="316574"/><br /> 退款refundId:<input name="data[refundId]" value="8"/><br />
<p id="img_area"></p> <p id="img_area"></p>
<input type="submit" value="提交"> <input type="submit" value="提交">
</form> </form>
......
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