Merge remote-tracking branch 'cash-loan-flow-boss/v1' into v1

src/main/java/cn/quantgroup/cashloanflowboss/api/order/controller/OrderController.java

@@ -32,7 +32,6 @@ public class OrderController {
     }
 
     @ChannelIdInit
-    @CheckChannelRole
     @PostMapping("/approve")
     public Result approveOpt(@RequestBody @Valid ApproveVo approveVo) {
         return Result.buildSuccess(orderService.approveOpt(approveVo));

src/main/java/cn/quantgroup/cashloanflowboss/api/order/model/OrderVo.java

@@ -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;
 
 

src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/OrderService.java

@@ -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;
         });
@@ -132,7 +135,7 @@ public class OrderService {
         data.put("msg", "success");
         data.put("bizChannel", orderMapping.getRegisteredFrom());
         data.put("uuid", xUser.getUuid());
-        data.put("bizNo", orderMapping.getChannelOrderNo());
+        data.put("bizNo", orderMapping.getApplyNo());
         data.put("bizType", channelConf.getBizType());
         data.put("auditResult", approveVo.getIsPass());
         data.put("amount", approveVo.getAmount());
@@ -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={}，requestParam={}", orderMapping.getChannelOrderNo(), JSONTools.serialize(data));
             return false;
         }
     }