|
@@ -48,147 +48,153 @@ public class YeepayController {
|
|
|
|
|
|
|
|
@PostMapping("/invite")
|
|
@PostMapping("/invite")
|
|
|
@ApiOperation("商户入驻")
|
|
@ApiOperation("商户入驻")
|
|
|
- public R invite(@RequestBody InvitationDto invitationDto){
|
|
|
|
|
|
|
+ public R invite(@RequestBody InvitationDto invitationDto) {
|
|
|
return R.data(yeepaySaasService.inviteMerchant(invitationDto));
|
|
return R.data(yeepaySaasService.inviteMerchant(invitationDto));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @PostMapping("/inviteMicro")
|
|
|
|
|
+ @ApiOperation("小微入驻")
|
|
|
|
|
+ public R inviteMicro(@RequestBody MicroInvitationDto microInvitationDto) {
|
|
|
|
|
+ return R.data(yeepaySaasService.inviteMicro(microInvitationDto));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
@PostMapping("wechatApply")
|
|
@PostMapping("wechatApply")
|
|
|
@ApiOperation("微信实名认证")
|
|
@ApiOperation("微信实名认证")
|
|
|
- public R wechatApply(@RequestBody WechatApplyDto wechatApplyDto){
|
|
|
|
|
|
|
+ public R wechatApply(@RequestBody WechatApplyDto wechatApplyDto) {
|
|
|
return R.data(yeepaySaasService.wechatApply(wechatApplyDto));
|
|
return R.data(yeepaySaasService.wechatApply(wechatApplyDto));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("querywechatApply")
|
|
@PostMapping("querywechatApply")
|
|
|
@ApiOperation("微信实名认证查询")
|
|
@ApiOperation("微信实名认证查询")
|
|
|
- public R querywechatApply(WechatAuthDto wechatAuthDtow){
|
|
|
|
|
|
|
+ public R querywechatApply(WechatAuthDto wechatAuthDtow) {
|
|
|
return R.data(yeepaySaasService.wechatAuthQuery(wechatAuthDtow));
|
|
return R.data(yeepaySaasService.wechatAuthQuery(wechatAuthDtow));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("cancelWechatApply")
|
|
@PostMapping("cancelWechatApply")
|
|
|
@ApiOperation("撤销微信实名认证")
|
|
@ApiOperation("撤销微信实名认证")
|
|
|
- public R cancelWechatApply(WechatAuthDto wechatAuthDtow){
|
|
|
|
|
|
|
+ public R cancelWechatApply(WechatAuthDto wechatAuthDtow) {
|
|
|
return R.data(yeepaySaasService.wechatAuthCancel(wechatAuthDtow));
|
|
return R.data(yeepaySaasService.wechatAuthCancel(wechatAuthDtow));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("queryShopStatus")
|
|
@PostMapping("queryShopStatus")
|
|
|
@ApiOperation("商户开户意愿查询")
|
|
@ApiOperation("商户开户意愿查询")
|
|
|
- public R queryShopStatus(AuthStateQueryDto authStateQueryDto){
|
|
|
|
|
|
|
+ public R queryShopStatus(AuthStateQueryDto authStateQueryDto) {
|
|
|
return R.data(yeepaySaasService.authStateQuery(authStateQueryDto));
|
|
return R.data(yeepaySaasService.authStateQuery(authStateQueryDto));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("queryInvitation")
|
|
@PostMapping("queryInvitation")
|
|
|
@ApiOperation("入驻查询")
|
|
@ApiOperation("入驻查询")
|
|
|
- public R queryInvitation(String requestId){
|
|
|
|
|
|
|
+ public R queryInvitation(String requestId) {
|
|
|
return R.data(yeepaySaasService.queryInvitation(requestId));
|
|
return R.data(yeepaySaasService.queryInvitation(requestId));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("orderInit")
|
|
@PostMapping("orderInit")
|
|
|
@ApiOperation("聚合支付下单")
|
|
@ApiOperation("聚合支付下单")
|
|
|
- public R orderInit(@RequestBody InitOrderDto initOrderDto){
|
|
|
|
|
|
|
+ public R orderInit(@RequestBody InitOrderDto initOrderDto) {
|
|
|
return R.data(yeepaySaasService.aggPrepay(initOrderDto));
|
|
return R.data(yeepaySaasService.aggPrepay(initOrderDto));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("payLinkOrder")
|
|
@PostMapping("payLinkOrder")
|
|
|
@ApiOperation("聚合码支付下单")
|
|
@ApiOperation("聚合码支付下单")
|
|
|
- public R payLinkOrder(@RequestBody PayLinkOrderDto payLinkOrderDto){
|
|
|
|
|
|
|
+ public R payLinkOrder(@RequestBody PayLinkOrderDto payLinkOrderDto) {
|
|
|
return R.data(yeepaySaasService.payLinkOrder(payLinkOrderDto));
|
|
return R.data(yeepaySaasService.payLinkOrder(payLinkOrderDto));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("configApp")
|
|
@PostMapping("configApp")
|
|
|
@ApiOperation("配置小程序")
|
|
@ApiOperation("配置小程序")
|
|
|
- public R configApp(@RequestBody ConfigAppDto configAppDto){
|
|
|
|
|
|
|
+ public R configApp(@RequestBody ConfigAppDto configAppDto) {
|
|
|
return R.data(yeepayCommonService.configApp(configAppDto));
|
|
return R.data(yeepayCommonService.configApp(configAppDto));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@GetMapping("queryAppStatus")
|
|
@GetMapping("queryAppStatus")
|
|
|
@ApiOperation("查询小程序配置信息")
|
|
@ApiOperation("查询小程序配置信息")
|
|
|
- public R queryAppStatus(String appIdType,String parentMerchantNo,String merchantNo){
|
|
|
|
|
- return R.data(yeepayCommonService.queryApp(parentMerchantNo,merchantNo,appIdType));
|
|
|
|
|
|
|
+ public R queryAppStatus(String appIdType, String parentMerchantNo, String merchantNo) {
|
|
|
|
|
+ return R.data(yeepayCommonService.queryApp(parentMerchantNo, merchantNo, appIdType));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/upload")
|
|
@PostMapping("/upload")
|
|
|
@ApiOperation("上传文件")
|
|
@ApiOperation("上传文件")
|
|
|
- public R upload( MultipartFile file){
|
|
|
|
|
- return R.data(yeepayCommonService.addFileToYeepay(file));
|
|
|
|
|
|
|
+ public R upload(MultipartFile file) {
|
|
|
|
|
+ return R.data(yeepayCommonService.addFileToYeepay(file));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@GetMapping("/queryBalance")
|
|
@GetMapping("/queryBalance")
|
|
|
@ApiOperation("账户余额查询")
|
|
@ApiOperation("账户余额查询")
|
|
|
- public JSONObject queryBalance(String merchant){
|
|
|
|
|
|
|
+ public JSONObject queryBalance(String merchant) {
|
|
|
return JSON.parseObject(yeepaySaasService.accountInfosQuery(merchant).getStringResult());
|
|
return JSON.parseObject(yeepaySaasService.accountInfosQuery(merchant).getStringResult());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
@PostMapping("/withdrawCardBind")
|
|
@PostMapping("/withdrawCardBind")
|
|
|
@ApiOperation("银行卡绑卡")
|
|
@ApiOperation("银行卡绑卡")
|
|
|
- public R withdrawCardBind(@RequestBody WithdrawCardBindDto withdrawCardBindDto){
|
|
|
|
|
|
|
+ public R withdrawCardBind(@RequestBody WithdrawCardBindDto withdrawCardBindDto) {
|
|
|
return R.data(yeepaySaasService.withdrawCardBind(withdrawCardBindDto));
|
|
return R.data(yeepaySaasService.withdrawCardBind(withdrawCardBindDto));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@GetMapping("/withdrawCardQuery")
|
|
@GetMapping("/withdrawCardQuery")
|
|
|
@ApiOperation("提现卡查询")
|
|
@ApiOperation("提现卡查询")
|
|
|
- public R withdrawCardQuery(String merchantNo){
|
|
|
|
|
|
|
+ public R withdrawCardQuery(String merchantNo) {
|
|
|
return R.data(yeepaySaasService.withdrawCardQuery(merchantNo));
|
|
return R.data(yeepaySaasService.withdrawCardQuery(merchantNo));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@GetMapping("/settleBalanceQuery")
|
|
@GetMapping("/settleBalanceQuery")
|
|
|
@ApiOperation("待结算金额查询")
|
|
@ApiOperation("待结算金额查询")
|
|
|
- public R settleBalanceQuery(SettleBalanceQueryDto settleBalanceQueryDto){
|
|
|
|
|
|
|
+ public R settleBalanceQuery(SettleBalanceQueryDto settleBalanceQueryDto) {
|
|
|
return R.data(yeepaySaasService.settleBalanceQuery(settleBalanceQueryDto));
|
|
return R.data(yeepaySaasService.settleBalanceQuery(settleBalanceQueryDto));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/withdraw")
|
|
@PostMapping("/withdraw")
|
|
|
@ApiOperation("提现")
|
|
@ApiOperation("提现")
|
|
|
- public R withdraw(WithdrawOrderDto withdrawOrderDto){
|
|
|
|
|
|
|
+ public R withdraw(WithdrawOrderDto withdrawOrderDto) {
|
|
|
return R.data(yeepaySaasService.withdrawOrder(withdrawOrderDto));
|
|
return R.data(yeepaySaasService.withdrawOrder(withdrawOrderDto));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/withdrawQuery")
|
|
@PostMapping("/withdrawQuery")
|
|
|
@ApiOperation("提现查询")
|
|
@ApiOperation("提现查询")
|
|
|
- public R withdrawQuery(WithdrawQueryDto withdrawQueryDto){
|
|
|
|
|
|
|
+ public R withdrawQuery(WithdrawQueryDto withdrawQueryDto) {
|
|
|
return R.data(yeepaySaasService.withdrawQuery(withdrawQueryDto));
|
|
return R.data(yeepaySaasService.withdrawQuery(withdrawQueryDto));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/settle")
|
|
@PostMapping("/settle")
|
|
|
@ApiOperation("结算")
|
|
@ApiOperation("结算")
|
|
|
- public R settle(SettleSelfSettleApplyDto settleSelfSettleApplyDto){
|
|
|
|
|
|
|
+ public R settle(SettleSelfSettleApplyDto settleSelfSettleApplyDto) {
|
|
|
return R.data(yeepaySaasService.settleSelfSettleApply(settleSelfSettleApplyDto));
|
|
return R.data(yeepaySaasService.settleSelfSettleApply(settleSelfSettleApplyDto));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@GetMapping("/feeQuery")
|
|
@GetMapping("/feeQuery")
|
|
|
@ApiOperation("产品费率查询")
|
|
@ApiOperation("产品费率查询")
|
|
|
- public JSONObject feeQuery(ProductFeeQueryDto productFeeQueryDto){
|
|
|
|
|
|
|
+ public JSONObject feeQuery(ProductFeeQueryDto productFeeQueryDto) {
|
|
|
return JSON.parseObject(yeepaySaasService.productFeeQuery(productFeeQueryDto).getStringResult());
|
|
return JSON.parseObject(yeepaySaasService.productFeeQuery(productFeeQueryDto).getStringResult());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@GetMapping("/feeUpdate")
|
|
@GetMapping("/feeUpdate")
|
|
|
@ApiOperation("产品费率修改")
|
|
@ApiOperation("产品费率修改")
|
|
|
- public JSONObject feeUpdate(ProductFeeModifyDto productFeeModifyDto){
|
|
|
|
|
|
|
+ public JSONObject feeUpdate(ProductFeeModifyDto productFeeModifyDto) {
|
|
|
return JSON.parseObject(yeepaySaasService.productFeeModify(productFeeModifyDto).getStringResult());
|
|
return JSON.parseObject(yeepaySaasService.productFeeModify(productFeeModifyDto).getStringResult());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/transfer")
|
|
@PostMapping("/transfer")
|
|
|
@ApiOperation("商户转账")
|
|
@ApiOperation("商户转账")
|
|
|
- public JSONObject transfer(TransferOrderDto transferOrderDto){
|
|
|
|
|
|
|
+ public JSONObject transfer(TransferOrderDto transferOrderDto) {
|
|
|
return JSON.parseObject(yeepaySaasService.transferOrder(transferOrderDto).getStringResult());
|
|
return JSON.parseObject(yeepaySaasService.transferOrder(transferOrderDto).getStringResult());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/reCharge")
|
|
@PostMapping("/reCharge")
|
|
|
@ApiOperation("充值")
|
|
@ApiOperation("充值")
|
|
|
- public JSONObject reCharge(OnlineBankRechargeOrderDto onlineBankRechargeOrderDto){
|
|
|
|
|
|
|
+ public JSONObject reCharge(OnlineBankRechargeOrderDto onlineBankRechargeOrderDto) {
|
|
|
return JSON.parseObject(yeepaySaasService.onlineBankRechargeOrder(onlineBankRechargeOrderDto).getStringResult());
|
|
return JSON.parseObject(yeepaySaasService.onlineBankRechargeOrder(onlineBankRechargeOrderDto).getStringResult());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/queryOrder")
|
|
@PostMapping("/queryOrder")
|
|
|
@ApiOperation("查询订单")
|
|
@ApiOperation("查询订单")
|
|
|
@ApiLog
|
|
@ApiLog
|
|
|
- public JSONObject queryOrder(TradeOrderQueryDto orderQueryDto){
|
|
|
|
|
|
|
+ public JSONObject queryOrder(TradeOrderQueryDto orderQueryDto) {
|
|
|
return JSON.parseObject(yeepaySaasService.tradeOrderQuery(orderQueryDto).getStringResult());
|
|
return JSON.parseObject(yeepaySaasService.tradeOrderQuery(orderQueryDto).getStringResult());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@GetMapping("/bill/tradedaydownload")
|
|
@GetMapping("/bill/tradedaydownload")
|
|
|
@ApiOperation("对账")
|
|
@ApiOperation("对账")
|
|
|
- public YopResponse tradedaydownload(BillTradeDayDownloadDto billTradeDayDownloadDto){
|
|
|
|
|
|
|
+ public YopResponse tradedaydownload(BillTradeDayDownloadDto billTradeDayDownloadDto) {
|
|
|
return yeepaySaasService.billTradeDayDownload(billTradeDayDownloadDto);
|
|
return yeepaySaasService.billTradeDayDownload(billTradeDayDownloadDto);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -196,7 +202,7 @@ public class YeepayController {
|
|
|
@ApiOperation("测试")
|
|
@ApiOperation("测试")
|
|
|
@ApiLog
|
|
@ApiLog
|
|
|
public R test() {
|
|
public R test() {
|
|
|
- logger.info("log","asdf");
|
|
|
|
|
|
|
+ logger.info("log", "asdf");
|
|
|
return R.success("s");
|
|
return R.success("s");
|
|
|
}
|
|
}
|
|
|
|
|
|