Merge branch 'develop'

src/main/java/com/mmc/oms/model/vo/demand/CommonPaymentVO.java

@@ -29,4 +29,7 @@ public class CommonPaymentVO {
 
     @ApiModelProperty(value = "金额：单位（分）")
     private Integer amount;
+
+    @ApiModelProperty(value = "聊天包类型id")
+    private Integer chatType;
 }

src/main/java/com/mmc/oms/model/vo/demand/OrderRequestParamsVO.java

 package com.mmc.oms.model.vo.demand;
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -28,4 +29,6 @@ public class OrderRequestParamsVO implements Serializable {
     private Integer orderPort;
     @ApiModelProperty(value = "附加数据，在查询API和支付通知中原样返回，可作为自定义参数使用，实际情况下只有支付完成状态才会返回该字段。")
     private String attach;
+    @ApiModelProperty(value = "聊天包类型id")
+    private Integer chatType;
 }

src/main/java/com/mmc/oms/service/demand/Impl/DemandReleaseOrderServiceImpl.java

@@ -114,11 +114,26 @@ public class DemandReleaseOrderServiceImpl implements DemandReleaseOrderService
                 return topUpOrder(commonPaymentVO, token, userAccountId);
             case "6":
                 return payCurriculumOrder(commonPaymentVO, token);
+            case "7":
+                return chatOrder(commonPaymentVO, token);
             default:
                 return ResultBody.error("无效的订单类型操作！");
         }
     }
 
+
+    private ResultBody chatOrder(CommonPaymentVO commonPaymentVO, String token) {
+        OrderRequestParamsVO orderRequestParamsVO = new OrderRequestParamsVO();
+        orderRequestParamsVO.setOrderNo(commonPaymentVO.getOrderNumber());
+        orderRequestParamsVO.setAmount(commonPaymentVO.getAmount());
+        orderRequestParamsVO.setAttach("CHAT_ORDER");
+        orderRequestParamsVO.setOrderPort(commonPaymentVO.getOrderPort());
+        orderRequestParamsVO.setChatType(commonPaymentVO.getChatType());
+        orderRequestParamsVO.setDescription("聊天订单" + commonPaymentVO.getOrderNumber());
+        ResultBody resultBody = releaseOrder(orderRequestParamsVO, token);
+        return resultBody;
+    }
+
     private ResultBody payCurriculumOrder(CommonPaymentVO commonPaymentVO, String token) {
         if ("6".equals(commonPaymentVO.getOrderPort().toString())) {
             try {