Merge branch 'feature/yangpeifeng' into 'master'

<新功能> 乐动电子化合同

See merge request !1

api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.jiejing.fitness</groupId>
     <artifactId>fit-finance</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
   </parent>
   <artifactId>finance-api</artifactId>
   <name>finance-api</name>

api/src/main/java/com/jiejing/fitness/finance/api/pay/request/AppPayRequest.java

 package com.jiejing.fitness.finance.api.pay.request;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.jiejing.common.swagger.EnumMapping;
 import com.jiejing.fitness.enums.finance.PayOrderTypeEnum;
 import com.jiejing.paycenter.common.enums.common.PayChannelEnums;
 import io.swagger.annotations.ApiModel;
@@ -35,7 +37,8 @@ public class AppPayRequest {
 
   @ApiModelProperty(name = "业务订单类型", required = true)
   @NotNull(message = "业务订单类型不能为空")
-  private PayOrderTypeEnum orderType;
+  @EnumMapping(enumClass = PayOrderTypeEnum.class)
+  private String orderType;
 
   @ApiModelProperty(name = "商品名称", required = true)
   @NotBlank(message = "商品名称不能为空")

api/src/main/java/com/jiejing/fitness/finance/api/pay/request/NativePayRequest.java

 package com.jiejing.fitness.finance.api.pay.request;
 
 import com.alibaba.fastjson.JSONObject;
+import com.jiejing.common.swagger.EnumMapping;
 import com.jiejing.fitness.enums.finance.PayOrderTypeEnum;
 import com.jiejing.paycenter.common.enums.common.PayChannelEnums;
 import io.swagger.annotations.ApiModel;
@@ -35,7 +36,8 @@ public class NativePayRequest {
 
   @ApiModelProperty(name = "业务订单类型", required = true)
   @NotNull(message = "业务订单类型不能为空")
-  private PayOrderTypeEnum orderType;
+  @EnumMapping(enumClass = PayOrderTypeEnum.class)
+  private String orderType;
 
   @ApiModelProperty(name = "商品名称", required = true)
   @NotBlank(message = "商品名称不能为空")

app/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.jiejing.fitness</groupId>
     <artifactId>fit-finance</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
   </parent>
   <artifactId>app</artifactId>
   <name>app</name>

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.jiejing.fitness</groupId>
   <artifactId>fit-finance</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>0.0.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>fit-finance</name>
   <url>http://maven.apache.org</url>

repository/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.jiejing.fitness</groupId>
     <artifactId>fit-finance</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
   </parent>
   <artifactId>repository</artifactId>
   <name>repository</name>

service/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.jiejing.fitness</groupId>
     <artifactId>fit-finance</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
   </parent>
   <artifactId>service</artifactId>
   <name>service</name>

service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java

@@ -227,7 +227,7 @@ public class PayConvert {
     req.setPayType(PayTypeEnums.NATIVE);
     req.setGoods(params.getGoods());
     req.setOrderNo(params.getOrderNo());
-    req.setOrderType(params.getOrderType().getCode());
+    req.setOrderType(params.getOrderType());
     req.setTimeExpire(params.getTimeExpire());
     req.setTradingTime(new Date());
     req.setExtra(params.getExtra());
@@ -242,7 +242,7 @@ public class PayConvert {
     req.setPayType(PayTypeEnums.APP);
     req.setGoods(params.getGoods());
     req.setOrderNo(params.getOrderNo());
-    req.setOrderType(params.getOrderType().getCode());
+    req.setOrderType(params.getOrderType());
     req.setTimeExpire(params.getTimeExpire());
     req.setTradingTime(new Date());
     req.setExtra(params.getExtra());

service/src/main/java/com/jiejing/fitness/finance/service/pay/params/AppPayParams.java

@@ -35,7 +35,7 @@ public class AppPayParams {
 
   @ApiModelProperty(name = "业务订单类型", required = true)
   @NotNull(message = "业务订单类型不能为空")
-  private PayOrderTypeEnum orderType;
+  private String orderType;
 
   @ApiModelProperty(name = "商品名称", required = true)
   @NotBlank(message = "商品名称不能为空")

service/src/main/java/com/jiejing/fitness/finance/service/pay/params/NativePayParams.java

 package com.jiejing.fitness.finance.service.pay.params;
 
 import com.alibaba.fastjson.JSONObject;
+import com.jiejing.common.swagger.EnumMapping;
 import com.jiejing.fitness.enums.finance.PayOrderTypeEnum;
 import com.jiejing.paycenter.common.enums.common.PayChannelEnums;
 import io.swagger.annotations.ApiModel;
@@ -35,7 +36,8 @@ public class NativePayParams {
 
   @ApiModelProperty(name = "业务订单类型", required = true)
   @NotNull(message = "业务订单类型不能为空")
-  private PayOrderTypeEnum orderType;
+  @EnumMapping(enumClass = PayOrderTypeEnum.class)
+  private String orderType;
 
   @ApiModelProperty(name = "商品名称", required = true)
   @NotBlank(message = "商品名称不能为空")