Skip to content

F
farming
Commit 78db1882 by 郑云飞
Options

二开

parent d06fc76b
Showing with 6 additions and 6 deletions
src/main/java/com/yunniu/farming/webadmin/service/impl/OrderMainServiceImpl.java
...@@ -326,7 +326,7 @@ public class OrderMainServiceImpl { ...@@ -326,7 +326,7 @@ public class OrderMainServiceImpl {
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
return null; return Result.success("成功");
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
...@@ -550,7 +550,7 @@ public class OrderMainServiceImpl { ...@@ -550,7 +550,7 @@ public class OrderMainServiceImpl {
public Result saveCourierNumber(OrderMain order) { public Result saveCourierNumber(OrderMain order) {
OrderMain orderMain = this.orderMainDao.selectById(order.getId()); OrderMain orderMain = this.orderMainDao.selectById(order.getId());
orderMain.setIrefundstatus(OrderMain.STATUS_RETURN_GOODS); orderMain.setIrefundstatus(OrderMain.STATUS_REFUND);
orderMain.setCouriernumber(order.getCouriernumber()); orderMain.setCouriernumber(order.getCouriernumber());
this.orderMainDao.updateById(orderMain); this.orderMainDao.updateById(orderMain);
return Result.success("成功"); return Result.success("成功");
......
src/main/resources/templates/order/loanList.html
...@@ -82,11 +82,11 @@ ...@@ -82,11 +82,11 @@
<script type="text/html" id="table-handle"> <script type="text/html" id="table-handle">
<i class="layui-icon layui-icon-form" lay-event="orderDetail" title="订单详情"></i> <i class="layui-icon layui-icon-form" lay-event="orderDetail" title="订单详情"></i>
<!-- 101退款申请中 102待退货 103待退款 104退款成功 105退款拒绝--> <!-- 101退款申请中 102待退货 103待退款 104退款成功 105退款拒绝-->
{{#if (d.irefundstatus == 101) { }} {{#if (d.irefundstatus == 101) { }}
<i class="layui-icon layui-icon-ok" lay-event="pass" title="退款申请通过"></i> <i class="layui-icon layui-icon-ok" lay-event="pass" title="退款申请通过"></i>
<i class="layui-icon layui-icon-close" lay-event="refuse" title="退款申请拒绝"></i> <i class="layui-icon layui-icon-close" lay-event="refuse" title="退款申请拒绝"></i>
{{# }else if(d.irefundstatus == 102){ }} {{# }else if(d.irefundstatus == 103){ }}
<i class="layui-icon layui-icon-component" lay-event="receive" title="退款已收货"></i> <i class="layui-icon layui-icon-component" lay-event="receive" title="退款已收货"></i>
{{# }else if (d.istatus == 0 || d.istatus == 10) { }} {{# }else if (d.istatus == 0 || d.istatus == 10) { }}
{{# }else if(d.istatus == 20){ }} {{# }else if(d.istatus == 20){ }}
......
src/main/resources/templates/order/refundList.html
...@@ -82,11 +82,11 @@ ...@@ -82,11 +82,11 @@
<script type="text/html" id="table-handle"> <script type="text/html" id="table-handle">
<i class="layui-icon layui-icon-form" lay-event="orderDetail" title="订单详情"></i> <i class="layui-icon layui-icon-form" lay-event="orderDetail" title="订单详情"></i>
<!-- 101退款申请中 102待退货 103待退款 104退款成功 105退款拒绝--> <!-- 101退款申请中 102待退货 103待退款 104退款成功 105退款拒绝-->
{{#if (d.irefundstatus == 101) { }} {{#if (d.irefundstatus == 101) { }}
<i class="layui-icon layui-icon-ok" lay-event="pass" title="退款申请通过"></i> <i class="layui-icon layui-icon-ok" lay-event="pass" title="退款申请通过"></i>
<i class="layui-icon layui-icon-close" lay-event="refuse" title="退款申请拒绝"></i> <i class="layui-icon layui-icon-close" lay-event="refuse" title="退款申请拒绝"></i>
{{# }else if(d.irefundstatus == 102){ }} {{# }else if(d.irefundstatus == 103){ }}
<i class="layui-icon layui-icon-component" lay-event="receive" title="退款已收货"></i> <i class="layui-icon layui-icon-component" lay-event="receive" title="退款已收货"></i>
{{# } }} {{# } }}
</script> </script>
......
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