Commit b1735022 authored by suntao's avatar suntao

审批

parent e106e7db
......@@ -32,7 +32,6 @@ public class OrderController {
}
@ChannelIdInit
@CheckChannelRole
@PostMapping("/approve")
public Result approveOpt(@RequestBody @Valid ApproveVo approveVo) {
return Result.buildSuccess(orderService.approveOpt(approveVo));
......
......@@ -2,6 +2,8 @@ package cn.quantgroup.cashloanflowboss.api.order.model;
import lombok.Data;
import java.util.List;
/**
* function:
* date: 2019/8/8
......@@ -19,7 +21,7 @@ public class OrderVo {
/**
* [ {action:"audit",name:"审核"},{},{}... ]
*/
private String opt;
private List<OptButton> opt;
private String message;
......
......@@ -78,8 +78,11 @@ public class OrderService {
button.setAction(OrderVo.OptButtonAction.audit.name());
button.setName(OrderVo.OptButtonAction.audit.getDesc());
List<OrderVo.OptButton> buttonList = new ArrayList<>();
buttonList.add(button);
orderVo.setStatus(OrderVo.OptButtonAction.audit.getDesc());
orderVo.setOpt(JSONTools.serialize(button));
orderVo.setOpt(buttonList);
orderVo.setMessage("");
return orderVo;
});
......@@ -141,8 +144,10 @@ public class OrderService {
String approveResult = clothoCenter.approve(data);
if ("success".equals(approveResult)) {
log.info("审批申请成功,channelOrderNumber={}", orderMapping.getChannelOrderNo());
return true;
} else {
log.info("审批申请失败,channelOrderNumber={}", orderMapping.getChannelOrderNo());
return false;
}
}
......
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