|
|
|
@@ -54,7 +54,7 @@ public class WxMicroPayController extends BaseController { |
|
|
|
@Autowired |
|
|
|
WxAppinfoService wxAppinfoService; |
|
|
|
|
|
|
|
@ApiOperation(value = "刷卡支付订单", notes = "params:{\"authCode\":\"String\",\"totalFee\":\"String\"},\n" + |
|
|
|
@ApiOperation(value = "付款码支付订单", notes = "params:{\"authCode\":\"String\",\"totalFee\":\"String\"},\n" + |
|
|
|
"注意:\n" + |
|
|
|
"提醒1:提交支付请求后微信会同步返回支付结果。当返回结果为“系统错误”时,商户系统等待5秒后调用【查询订单API】,查询支付实际交易结果;当返回结果为“USERPAYING”时,商户系统可设置间隔时间(建议10秒)重新查询支付结果,直到支付成功或超时(建议30秒);\n" + |
|
|
|
"提醒2:在调用查询接口返回后,如果交易状况不明晰,请调用【撤销订单API】,此时如果交易失败则关闭订单,该单不能再支付成功;如果交易成功,则将扣款退回到用户账户。当撤销无返回或错误时,请再次调用。注意:请勿扣款后立即调用【撤销订单API】,建议至少15秒后再调用。撤销订单API需要双向证书。") |
|
|
|
@@ -108,7 +108,7 @@ public class WxMicroPayController extends BaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation(value = "查询刷卡支付订单", notes = "{\"payOrderId\":\"String\",\"orderId\":\"String\"}") |
|
|
|
@ApiOperation(value = "查询付款码支付订单", notes = "{\"payOrderId\":\"String\",\"orderId\":\"String\"}") |
|
|
|
@PostMapping("order_query") |
|
|
|
public ResultData queryMicopayOrder(@RequestBody Map<String, String> paramMap) { |
|
|
|
logger.info("queryMicopayOrder: " + paramMap.toString()); |
|
|
|
@@ -160,7 +160,7 @@ public class WxMicroPayController extends BaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation(value = "撤销刷卡支付订单", notes = "{\"payOrderId\":\"String\",\"orderId\":\"String\"}") |
|
|
|
@ApiOperation(value = "撤销付款码支付订单", notes = "{\"payOrderId\":\"String\",\"orderId\":\"String\"}") |
|
|
|
@PostMapping("order_reverse") |
|
|
|
public ResultData reverseMicopayOrder(@RequestBody Map<String, String> paramMap) { |
|
|
|
logger.info("reverseMicopayOrder: " + paramMap.toString()); |
|
|
|
@@ -212,7 +212,7 @@ public class WxMicroPayController extends BaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("刷卡支付交易流水分页列表接口") |
|
|
|
@ApiOperation("付款码支付交易流水分页列表接口") |
|
|
|
@GetMapping("listMicroPay") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query"), |
|
|
|
@@ -222,7 +222,7 @@ public class WxMicroPayController extends BaseController { |
|
|
|
return wxOrderService.microPayListOnDateAsPage(getUser().getId(), EnumOrderType.MICROPAY.getCode(), date, pageNum, pageSize); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("刷卡支付某日期交易总流水") |
|
|
|
@ApiOperation("付款码支付某日期交易总流水") |
|
|
|
@GetMapping("getMicroPayAmountOnDate") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query")}) |
|
|
|
@@ -231,7 +231,7 @@ public class WxMicroPayController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "刷卡支付退款", notes = "{\"orderId\":\"string\"}") |
|
|
|
@ApiOperation(value = "付款码支付退款", notes = "{\"orderId\":\"string\"}") |
|
|
|
@PostMapping("/microPayRefund") |
|
|
|
public ResultData create(@RequestBody Map<String, String> paramMap) { |
|
|
|
//Assert.notNull(wxRefundOrder.getName(), "角色名不能为空"); |
|
|
|
|