Merge remote-tracking branch 'origin/v1' into v1

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/util/ChannelConfUtil.java

@@ -200,4 +200,12 @@ public class ChannelConfUtil {
 
         return list;
     }
+
+    public static Integer getFundIdByType(Integer fundType, ChannelConf channelConf) {
+        if (fundType == 0) {
+            return channelConf.getFundId();
+        } else {
+            return channelConf.getP2pFundId();
+        }
+    }
 }

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

@@ -25,6 +25,14 @@ public class OrderController {
     @Autowired
     private OrderService orderService;
 
+    /**
+     * 订单查询接口
+     * @param channelId
+     * @param channelOrderNumber
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
     @ChannelIdInit
     @CheckChannelRole
     @GetMapping("/info")
@@ -32,6 +40,12 @@ public class OrderController {
         return Result.buildSuccess(orderService.getOrders(channelId, channelOrderNumber, pageNumber, pageSize));
     }
 
+
+    /**
+     * 审批接口
+     * @param approveVo
+     * @return
+     */
     @ChannelIdInit
     @PostMapping("/approve")
     public Result approveOpt(@RequestBody @Valid ApproveVo approveVo) {

src/main/java/cn/quantgroup/cashloanflowboss/api/order/entity/Order.java

+package cn.quantgroup.cashloanflowboss.api.order.entity;
+
+import cn.quantgroup.cashloanflowboss.core.persistence.Primary;
+import lombok.Data;
+
+import javax.persistence.Column;
+
+/**
+ * function:
+ * date: 2019/8/12
+ *
+ * @author: suntao
+ */
+
+@Data
+public class Order extends Primary {
+    @Column(name = "channel_order_number")
+    private String channelOrderNumber;
+    @Column(name = "credit_number")
+    private String creditNumber;
+    @Column(name = "channel_id")
+    private Long channelId;
+    @Column(name = "fund_id")
+    private Integer fundId;
+    @Column(name = "fund_type")
+    private Integer fundType;
+    @Column(name = "ext_data")
+    private String extData;
+}

src/main/java/cn/quantgroup/cashloanflowboss/api/order/repository/OrderRepository.java

+package cn.quantgroup.cashloanflowboss.api.order.repository;
+
+import cn.quantgroup.cashloanflowboss.api.order.entity.Order;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * function:
+ * date: 2019/8/12
+ *
+ * @author: suntao
+ */
+public interface OrderRepository extends JpaRepository<Order, Long> {
+}

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

 package cn.quantgroup.cashloanflowboss.api.order.service;
+import java.util.Date;
 
 import cn.quantgroup.cashloanflowboss.api.channel.entity.ChannelConf;
 import cn.quantgroup.cashloanflowboss.api.channel.repository.ChannelConfRepository;
+import cn.quantgroup.cashloanflowboss.api.channel.util.ChannelConfUtil;
+import cn.quantgroup.cashloanflowboss.api.order.entity.Order;
 import cn.quantgroup.cashloanflowboss.api.order.model.ApproveVo;
 import cn.quantgroup.cashloanflowboss.api.order.model.OrderVo;
+import cn.quantgroup.cashloanflowboss.api.order.repository.OrderRepository;
 import cn.quantgroup.cashloanflowboss.api.order.util.OrderUtil;
 import cn.quantgroup.cashloanflowboss.core.Application;
 import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfOrderMapping;
@@ -39,6 +43,9 @@ public class OrderService {
 
     @Autowired
     private ChannelConfRepository channelConfRepository;
+    @Autowired
+    private OrderRepository orderRepository;
+
     @Autowired
     private ClfOrderMappingRepository clfOrderMappingRepository;
     @Autowired
@@ -123,18 +130,25 @@ public class OrderService {
         calendar.setTime(new Date());
         calendar.add(Calendar.DAY_OF_YEAR, 7);
 
+
+        Integer fundId = ChannelConfUtil.getFundIdByType(approveVo.getFundType(), channelConf);
         // 资方 及 期数额度规则
-        Integer fundType = approveVo.getFundType();
-        Integer fundId;
-        if (fundType == 0) {
-            fundId = channelConf.getFundId();
-        } else {
-            fundId = channelConf.getP2pFundId();
-        }
         String fundFormat = String.format(OrderUtil.financeProductsFormat, approveVo.getAmount(), approveVo.getAmount(),
                 approveVo.getPeriod(), fundId);
 
 
+        Order order = new Order();
+        order.setChannelOrderNumber(approveVo.getChannelOrderNumber());
+        order.setCreditNumber(orderMapping.getApplyNo());
+        order.setChannelId(orderMapping.getRegisteredFrom());
+        order.setFundId(fundId);
+        order.setFundType(approveVo.getFundType());
+        order.setCreateTime(new Date());
+        order.setUpdateTime(new Date());
+        orderRepository.save(order);
+
+
+
         Map<String, Object> data = new HashMap<>(16);
         data.put("code", 0);
         data.put("msg", "success");
@@ -147,6 +161,7 @@ public class OrderService {
         data.put("deadLine", calendar.getTime().getTime());
         data.put("financeProducts", fundFormat);
 
+        // 发起审批
         String approveResult = clothoCenter.approve(data);
         if ("success".equals(approveResult)) {
             log.info("审批申请成功，channelOrderNumber={}", orderMapping.getChannelOrderNo());