记得上下班打卡 | git大法好,push需谨慎

Commit bb8e849f authored by 胡佳晨's avatar 胡佳晨

admin 增加 初始化 transferStatus = 5 的转赠状态

更改为可转赠状态
parent 05cd0fb5
...@@ -23,4 +23,7 @@ public interface IKylinOrderTicketsAdminService { ...@@ -23,4 +23,7 @@ public interface IKylinOrderTicketsAdminService {
//订单详情 //订单详情
OrderDetailsAdminVo orderDetails(String orderId); OrderDetailsAdminVo orderDetails(String orderId);
//初始化订单转赠 [只支持退回订单 transferStatus = 5]
String initTransfer(String orderId);
} }
...@@ -27,8 +27,7 @@ import java.util.List; ...@@ -27,8 +27,7 @@ import java.util.List;
*/ */
@Controller @Controller
@RequestMapping("/kylin/order") @RequestMapping("/kylin/order")
public class KylinOrderTicketsController extends BaseController public class KylinOrderTicketsController extends BaseController {
{
private String prefix = "zhengzai/kylin/order"; private String prefix = "zhengzai/kylin/order";
@Autowired @Autowired
...@@ -39,8 +38,7 @@ public class KylinOrderTicketsController extends BaseController ...@@ -39,8 +38,7 @@ public class KylinOrderTicketsController extends BaseController
@RequiresPermissions("kylin:order:orderlist:view") @RequiresPermissions("kylin:order:orderlist:view")
@GetMapping("/orderList") @GetMapping("/orderList")
public String tickets() public String tickets() {
{
return prefix + "/orderList/orderList"; return prefix + "/orderList/orderList";
} }
...@@ -51,8 +49,7 @@ public class KylinOrderTicketsController extends BaseController ...@@ -51,8 +49,7 @@ public class KylinOrderTicketsController extends BaseController
@RequiresPermissions("kylin:order:orderlist:list") @RequiresPermissions("kylin:order:orderlist:list")
@PostMapping("/orderList/list") @PostMapping("/orderList/list")
@ResponseBody @ResponseBody
public TableDataInfo list(OrderListReq orderListReq) public TableDataInfo list(OrderListReq orderListReq) {
{
startPage(); startPage();
List<OrderTicketsListDao> list = iKylinOrderTicketsAdminService.orderList(orderListReq); List<OrderTicketsListDao> list = iKylinOrderTicketsAdminService.orderList(orderListReq);
return getDataTable(list); return getDataTable(list);
...@@ -84,4 +81,15 @@ public class KylinOrderTicketsController extends BaseController ...@@ -84,4 +81,15 @@ public class KylinOrderTicketsController extends BaseController
ajax.put("value", performanceSponsorList); ajax.put("value", performanceSponsorList);
return ajax; return ajax;
} }
/**
* 获取第三方列表
*/
@Log(title = "演出订单-初始化转赠 [只支持 transferStatus = 5]]", businessType = BusinessType.LIST)
@GetMapping("/orderList/initTransfer")
@ResponseBody
public AjaxResult initTransfer(@RequestParam("orderId") String orderId) {
String result = iKylinOrderTicketsAdminService.initTransfer(orderId);
return this.success(result);
}
} }
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
<th:block th:include="include :: bootstrap-typeahead-js" /> <th:block th:include="include :: bootstrap-typeahead-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('kylin:order:orderlist:detail')}]]; var detailFlag = [[${@permission.hasPermi('kylin:order:orderlist:detail')}]];
var transferFlag = [[${@permission.hasPermi('kylin:order:orderlist:transferInit')}]];
var prefix = ctx + "kylin/order/orderList"; var prefix = ctx + "kylin/order/orderList";
var orderStatusDic = [[${@dict.getType('zhengzai_order_status')}]]; var orderStatusDic = [[${@dict.getType('zhengzai_order_status')}]];
var getTicketTypeDic = [[${@dict.getType('zhengzai_get_ticket_type')}]]; var getTicketTypeDic = [[${@dict.getType('zhengzai_get_ticket_type')}]];
...@@ -201,6 +202,7 @@ ...@@ -201,6 +202,7 @@
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>详细</a>'); actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>详细</a>');
actions.push('<a class="btn btn-warning btn-xs ' + transferFlag + '" href="javascript:void(0)" onclick="f(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>初始化</a>');
return actions.join(''); return actions.join('');
} }
}] }]
...@@ -219,6 +221,12 @@ ...@@ -219,6 +221,12 @@
}).on('onUnsetSelectValue', function (e) { }).on('onUnsetSelectValue', function (e) {
console.log("onUnsetSelectValue"); console.log("onUnsetSelectValue");
}); });
function f(id) {
$.post(prefix + "/kylin/initTransfer",{orderId:id},function (res) {
alert(res.msg)
});
}
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</div> </div>
</div> </div>
</div> </div>
<table class="col-sm-12 select-table table-bordered"> <table class="col-sm-12 select-table table-bordered table table-stripped small m-t-md">
<thead> <thead>
<tr> <tr>
<th> <th>
......
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