Commit e304fefc by 程裕兵

feat:app pay and native pay

parent 65a27cdb
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 = "商品名称不能为空")
......
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 = "商品名称不能为空")
......
......@@ -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());
......
......@@ -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 = "商品名称不能为空")
......
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 = "商品名称不能为空")
......
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