[fix]修改微信支付
This commit is contained in:
parent
c7d71811b6
commit
773a93b5ff
@ -270,7 +270,7 @@ wechat:
|
|||||||
mch-serial-no: 6BA681D9B219034D6F7851F57D61BE9317AB48FD # 商户证书序列号
|
mch-serial-no: 6BA681D9B219034D6F7851F57D61BE9317AB48FD # 商户证书序列号
|
||||||
api-v3-key: T9iE71aHSmjtM35z4bDLuU3gFX8s2I2h # APIv3密钥
|
api-v3-key: T9iE71aHSmjtM35z4bDLuU3gFX8s2I2h # APIv3密钥
|
||||||
private-key-path: "/java/cert/apiclient_key.pem" # 商户私钥文件路径
|
private-key-path: "/java/cert/apiclient_key.pem" # 商户私钥文件路径
|
||||||
transfer-notify-url: https://wuzhongjie.com.cn/prod-api/api/transfer/callback # 转账回调地址
|
transfer-notify-url: https://wuzhongjie.com.cn/prod-api/trans/withdraw/callback # 转账回调地址
|
||||||
app-id: wxebcdaea31881caab # 应用ID
|
app-id: wxebcdaea31881caab # 应用ID
|
||||||
secret: 71826d76bad096ec5407897c6ed1391f # 应用密钥
|
secret: 71826d76bad096ec5407897c6ed1391f # 应用密钥
|
||||||
mini-program:
|
mini-program:
|
||||||
|
@ -98,7 +98,6 @@ public class WithdrawController {
|
|||||||
//更新提现状态
|
//更新提现状态
|
||||||
service.withdrawCallback(id);
|
service.withdrawCallback(id);
|
||||||
return R.ok();
|
return R.ok();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -97,32 +97,6 @@ public class WxPayController {
|
|||||||
}
|
}
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
/**
|
|
||||||
* 微信商户零线转账 - 回调通知
|
|
||||||
* @Context注解 把HTTP请求上下文对象注入进来,HttpServletRequest、HttpServletResponse、UriInfo 等
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@Operation(summary = "微信商户零线转账 - 回调通知")
|
|
||||||
@RequestMapping(value = "/callback", method = {RequestMethod.GET, RequestMethod.POST})
|
|
||||||
@Log(title = "微信商户零线转账 - 回调通知", businessType = BusinessType.INSERT)
|
|
||||||
public ResponseEntity<Map<String, String>> wxPayCallback(@Context HttpServletRequest request) {
|
|
||||||
Map<String,String> errMap = new HashMap<>();
|
|
||||||
try {
|
|
||||||
log.info("微信商户零线转账 - 回调通知 /wxpay/callback");
|
|
||||||
Map<String, String> resMap = (Map<String, String>) wxPayService.wxPaySuccessCallback(request);
|
|
||||||
return new ResponseEntity<>(resMap, HttpStatus.OK);
|
|
||||||
} catch (ServiceException e){
|
|
||||||
errMap.put("code", "FAIL");
|
|
||||||
errMap.put("message", e.getMessage());
|
|
||||||
return new ResponseEntity<>(errMap, HttpStatus.BAD_REQUEST);
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("微信商户零线转账 - 回调通知 /wxpay/callback:异常!", e);
|
|
||||||
errMap.put("code", "FAIL");
|
|
||||||
errMap.put("message", "服务器内部错误");
|
|
||||||
return new ResponseEntity<>(errMap, HttpStatus.INTERNAL_SERVER_ERROR);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 商家转账 - 商户单号查询转账单
|
* 商家转账 - 商户单号查询转账单
|
||||||
* @param outBillNo 商户系统内部的商家单号
|
* @param outBillNo 商户系统内部的商家单号
|
||||||
|
@ -84,6 +84,7 @@ docker run -d \
|
|||||||
|
|
||||||
docker run -d \
|
docker run -d \
|
||||||
--name minio \
|
--name minio \
|
||||||
|
--restart always \
|
||||||
-p 9000:9000 \
|
-p 9000:9000 \
|
||||||
-p 9001:9001 \
|
-p 9001:9001 \
|
||||||
-e TZ=Asia/Shanghai \
|
-e TZ=Asia/Shanghai \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user