czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

进件相关调试

Browse Source
This commit is contained in:
lyf
2023-02-02 15:23:04 +08:00
parent 00b256f4f7
commit b9b0330659
15 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountController.java
View File

@@ -53,7 +53,7 @@ public class AccountController {
}
/**
* 保存商户结算信息, 最新接口
* 保存商户结算信息, 最新接口 最最最新
*
* @return
*/

1
pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
View File

@@ -726,6 +726,7 @@ public class MerchantOrderController {
result = ysPayOldService.tradeQuery(order,channel.getMerchantId());
break;
}
if(result != null){
merchantOrderService.updateOrderStatus(result,order);
String status = result.getString("payStatus");

4
pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java
View File

@@ -629,7 +629,7 @@ public class UserAppController {
opDetail = "商户请求进件"
)
@PostMapping("/merchantAudit")
@ApiOperation(value = "通用进件", notes = "通用进件", httpMethod = "POST")
@ApiOperation(value = "通用进件， 商户进件请求", notes = "通用进件", httpMethod = "POST")
@ApiImplicitParams(
{
@ApiImplicitParam(
@@ -647,7 +647,7 @@ public class UserAppController {
}
@PostMapping("/editMerchantAudit")
@ApiOperation(value = "通用进件", notes = "通用进件", httpMethod = "POST")
@ApiOperation(value = "通用进件，当前特指修改结算信息，只允许修改结算信息", notes = "通用进件", httpMethod = "POST")
@ApiImplicitParams(
{
@ApiImplicitParam(

1
pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.java
View File

@@ -47,6 +47,7 @@ public class AuditCallbackController {
private YsConfigV2 ysConfig;
@PostMapping("sxf")
// TODO 后续需要接sxf的回调
public Map<String, Object> sxfAuditCallback(@RequestBody JSONObject result) throws Exception {
return sxfMerchantAuditService.merchantAuditCallback(result);
}