Commit d82b3984 by xiangkun.gu

修改创建订单需要使用的接口

parent 38fabf89
package cn.freemud.controller;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.vo.GetPayCodeByChanelVo;
import cn.freemud.entities.vo.GetPayConfigVo;
import cn.freemud.entities.vo.GetPayTimeoutVo;
import cn.freemud.entities.vo.PutDeadLetterVo;
import cn.freemud.service.impl.PayServiceImpl;
import cn.freemud.utils.ResponseUtil;
import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
......@@ -23,9 +27,9 @@ public class ExposureOrderController {
* 创建支付单,查询支付配置
*/
@ApiAnnotation(logMessage = "创建支付单,查询支付配置")
@GetMapping("/getPayConfig")
public BaseResponse<String> getPayConfig(@LogParams @RequestParam("partnerId") String partnerId, @RequestParam("appId") String appId) {
String payConfig = payService.getPayConfig(partnerId, appId);
@PostMapping("/getPayConfig")
public BaseResponse<String> getPayConfig(@Validated @LogParams @RequestBody GetPayConfigVo getPayConfigVo) {
String payConfig = payService.getPayConfig(getPayConfigVo.getPartnerId(), getPayConfigVo.getAppId());
return ResponseUtil.success(payConfig);
}
......@@ -33,9 +37,9 @@ public class ExposureOrderController {
* 创建支付单,查询超时时间
*/
@ApiAnnotation(logMessage = "创建支付单,查询超时时间")
@GetMapping("/getPayTimeout")
public BaseResponse<String> getPayTimeout(@LogParams @RequestParam("partnerId") String partnerId) {
String partnerPayOvertime = payService.getPartnerPayOvertime(partnerId);
@PostMapping("/getPayTimeout")
public BaseResponse<String> getPayTimeout(@Validated @LogParams @RequestBody GetPayTimeoutVo getPayTimeoutVo) {
String partnerPayOvertime = payService.getPartnerPayOvertime(getPayTimeoutVo.getPartnerId());
return ResponseUtil.success(partnerPayOvertime);
}
......@@ -43,12 +47,10 @@ public class ExposureOrderController {
* 创建支付单,查询payCode
*/
@ApiAnnotation(logMessage = "创建支付单,查询payCode")
@GetMapping("/getPayCodeByChanel")
public BaseResponse<String> getPayCodeByChanel(@LogParams @RequestParam("appId") String appId,
@RequestParam("storeId") String storeId,
@RequestParam(value = "channel", required = false) String channel) {
@PostMapping("/getPayCodeByChanel")
public BaseResponse<String> getPayCodeByChanel(@Validated @LogParams @RequestBody GetPayCodeByChanelVo getPayCodeByChanelVo) {
String payCodeByCondition = payService.getPayCodeByCondition(appId, storeId, channel);
String payCodeByCondition = payService.getPayCodeByCondition(getPayCodeByChanelVo.getAppId(), getPayCodeByChanelVo.getStoreId(), getPayCodeByChanelVo.getChannel());
return ResponseUtil.success(payCodeByCondition);
}
......@@ -57,7 +59,7 @@ public class ExposureOrderController {
*/
@ApiAnnotation(logMessage = "创建订单,死信队列")
@PostMapping("/deadLetterQueue")
public BaseResponse deadLetterQueue(@LogParams @RequestBody PutDeadLetterVo putDeadLetterVo) {
public BaseResponse deadLetterQueue(@Validated @LogParams @RequestBody PutDeadLetterVo putDeadLetterVo) {
payService.putDelMq(putDeadLetterVo.getPartnerId(), putDeadLetterVo.getStoreId(), putDeadLetterVo.getFmId(), putDeadLetterVo.getOrderId(), putDeadLetterVo.getPayChanelType());
return ResponseUtil.success();
}
......
package cn.freemud.entities.vo;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class GetPayCodeByChanelVo {
@NotBlank(message = "小程序id不能为空")
private String appId;
@NotBlank(message = "门店id不能为空")
private String storeId;
private String channel;
}
package cn.freemud.entities.vo;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class GetPayConfigVo {
@NotBlank(message = "商户号不能为空")
private String partnerId;
@NotBlank(message = "小程序id不能为空")
private String appId;
}
package cn.freemud.entities.vo;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class GetPayTimeoutVo {
@NotBlank(message = "商户号不能为空")
private String partnerId;
}
......@@ -2,15 +2,21 @@ package cn.freemud.entities.vo;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class PutDeadLetterVo {
@NotBlank(message = "商户号不能为空")
private String partnerId;
@NotBlank(message = "门店id不能为空")
private String storeId;
@NotBlank(message = "fmId不能为空")
private String fmId;
@NotBlank(message = "订单号不能为空")
private String orderId;
private Integer payChanelType;
......
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