Skip to content

M
my-yaf-project
Commit 7a7784e7 authored by christ's avatar christ
Browse files
Options

退款退货

parent 44d1902a
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 108 deletions
application/models/Business/Order/RefundService.php
View file @ 7a7784e7
......@@ -956,9 +956,11 @@ class RefundServiceModel extends \Business\AbstractModel
}
}
} else {
$refundAmount = $orderGoods['goodsPrice']*$orderGoods['goodsNum'];
}
$returnData['refundAmount'] = $refundAmount - $orderInfo['refundAmount'] - $returnData['needShippingFee'] + $shippingFee;
$returnData['refundAmount']= $returnData['refundAmount']<ApiConst::zero?ApiConst::zero:$refundAmount['refundAmount'];
// if($orderGoods['goodsType']==ApiConst::goodsTypeFour){
// //已经退款过的金额
// $alreadyRefundMoney=$orderGoodsDao->getIsRefundMoney($orderGoodses,$orderGoods['promotionsId']);
......
application/models/DAO/Order/RefundReturn.php
View file @ 7a7784e7
......@@ -471,6 +471,9 @@ class RefundReturnModel extends \DAO\AbstractModel {
$refund_array['commis_rate'] = $goods['commisRate'];
$refund_array['goods_image'] = $goods['goodsImage'];
}
if($refund_array['goods_id']==ApiConst::zero){
throw
}
if(!isset($refund_array['refund_sn'])|| !$refund_array['refund_sn']){
$refund_array['refund_sn'] = $this->getRefundsn($order['storeId']);
}
......
public/test.html
View file @ 7a7784e7
<span style="color: rgb(51, 51, 51); font-family: " helvetica="" neue",="" helvetica,="" "pingfang="" sc",="" "hiragino="" sans="" gb",="" "microsoft="" yahei",="" "noto="" cjk="" "wenquanyi="" micro="" hei",="" arial,="" sans-serif;="" font-size:="" 14px;"="">1：关于退货退款要显示的按钮</span>
<br>
return_type
<table class="">
<tbody>
<tr>
<td> type</td>
<td> 订单管理(orderCount)</td>
<td> 售后管理（refundCount）</td>
<td> 待处理(waitRefundProccessCount)</td>
<td> 待收货(waitRefundReceiveCount)</td>
<td> 待接单（waitReceiveCount）</td>
<td> 待配送(waitDeliveryCount)</td>
<td> 待自提（waitGetCount）</td>
<td> 库存管理(alertCount)</td>
<td> 当前活动菜单</td>
<td> 是否根据params参数请求接口</td>
<tbody><tr>
<td> refundShippingType</td>
<td> sellerState</td>
<td> shippingOver</td>
<td> returnType</td>
<td> 要显示的按钮</td>
</tr>
<tr>
<td> 101 </td>
<td>1/-1/0</td>
<td> 0</td>
<td> 1</td>
<td> 2</td>
<td> 0</td>
<td> 0</td>
<td>1/-1<br></td>
<td> 1/-1</td>
<td> 1/-1</td>
<td> 0</td>
<td> 全部订单/待付款</td>
<td> 如过列表中存在 orderId=params[orderId]
请求接口 c/m 参数orderId=params[orderId]
用返回的数据更新 列表orderId=params[orderId]那条数据</td>
</tr>
<tr>
<td> 102</td>
<td> </td>
<td>1/-1<br></td>
<td> 1/-1</td>
<td> 1/-1</td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> 全部售后订单</td>
<td> 如过列表中存在 refundId=params[<span style="color: rgb(51, 51, 51); font-family: " helvetica="" neue",="" helvetica,="" "pingfang="" sc",="" "hiragino="" sans="" gb",="" "microsoft="" yahei",="" "noto="" cjk="" "wenquanyi="" micro="" hei",="" arial,="" sans-serif;="" font-size:="" 14px;"="">refundId</span>]
请求接口 c/m 参数<span style="color: rgb(51, 51, 51); font-family: " helvetica="" neue",="" helvetica,="" "pingfang="" sc",="" "hiragino="" sans="" gb",="" "microsoft="" yahei",="" "noto="" cjk="" "wenquanyi="" micro="" hei",="" arial,="" sans-serif;="" font-size:="" 14px;"="">refundId</span>=params[<span style="color: rgb(51, 51, 51); font-family: " helvetica="" neue",="" helvetica,="" "pingfang="" sc",="" "hiragino="" sans="" gb",="" "microsoft="" yahei",="" "noto="" cjk="" "wenquanyi="" micro="" hei",="" arial,="" sans-serif;="" font-size:="" 14px;"="">refundId</span>]
用返回的数据更新 列表<span style="color: rgb(51, 51, 51); font-family: " helvetica="" neue",="" helvetica,="" "pingfang="" sc",="" "hiragino="" sans="" gb",="" "microsoft="" yahei",="" "noto="" cjk="" "wenquanyi="" micro="" hei",="" arial,="" sans-serif;="" font-size:="" 14px;"="">refundId</span>=params[<span style="color: rgb(51, 51, 51); font-family: " helvetica="" neue",="" helvetica,="" "pingfang="" sc",="" "hiragino="" sans="" gb",="" "microsoft="" yahei",="" "noto="" cjk="" "wenquanyi="" micro="" hei",="" arial,="" sans-serif;="" font-size:="" 14px;"="">refundId</span>]那条数据</td>
<td> 2</td>
<td> 修改收货时间，选择配送员，确认收货</td>
</tr>
<tr>
<td> 106</td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> 1</td>
<td> 2</td>
<td> 0</td>
<td> 1</td>
<td> </td>
<td>=alertCount</td>
<td> 库存管理</td>
<td>重新请求库存预警列表接口</td>
</tr>
<tr>
<td> 107</td>
<td> 当前账号在其他地方登陆请求退出登陆接口</td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
</tr>
<tr>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> 任意</td>
<td> 1</td>
<td> 0</td>
<td> 任意</td>
<td> 同意,不同意</td>
</tr>
<tr>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> 0</td>
<td> 2</td>
<td> 0</td>
<td> 任意</td>
<td> 确认收货</td>
</tr>
</tbody>
</table><p><br></p>
\ No newline at end of file
</table><br><p>2：修改收货时间</p><p>修改收货时间用的是receiveTime字段</p><p><br></p><p style="color: rgb(51, 51, 51); font-family: " helvetica="" neue",="" helvetica,="" "pingfang="" sc",="" "hiragino="" sans="" gb",="" "microsoft="" yahei",="" "noto="" cjk="" "wenquanyi="" micro="" hei",="" arial,="" sans-serif;="" font-size:="" 14px;"="">3 商品属性显示方式</p>
<p style="color: rgb(51, 51, 51); font-family: " helvetica="" neue",="" helvetica,="" "pingfang="" sc",="" "hiragino="" sans="" gb",="" "microsoft="" yahei",="" "noto="" cjk="" "wenquanyi="" micro="" hei",="" arial,="" sans-serif;="" font-size:="" 14px;"="">goodsAttr-&gt;attrName:goodsAttr-&gt;attrValue goodsAttr-&gt;attrName:goodsAttr-&gt;attrValue</p>
<p><br><br></p><p><br></p><p><br></p><p><br></p>
\ No newline at end of file
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