售后注解问题;
微信支付退款错误日志记录。
This commit is contained in:
parent
8784da3449
commit
7c2234b1a9
@ -13,8 +13,8 @@ public enum ConnectEnum {
|
|||||||
*/
|
*/
|
||||||
QQ("QQ登录"),
|
QQ("QQ登录"),
|
||||||
WEIBO("微博联合登录"),
|
WEIBO("微博联合登录"),
|
||||||
WECHAT("微信联合登录"),
|
|
||||||
//只存放unionid
|
//只存放unionid
|
||||||
|
WECHAT("微信联合登录"),
|
||||||
WECHAT_OPEN_ID("微信openid登录"),
|
WECHAT_OPEN_ID("微信openid登录"),
|
||||||
WECHAT_MP_OPEN_ID("微信openid登录"),
|
WECHAT_MP_OPEN_ID("微信openid登录"),
|
||||||
ALIPAY("支付宝登录"),
|
ALIPAY("支付宝登录"),
|
||||||
|
@ -274,9 +274,9 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
@AfterSaleLogPoint(sn = "#afterSaleSn", description = "'售后-商家收货:单号['+#afterSaleSn+'],物流单号为['+#logisticsNo+']" +
|
@AfterSaleLogPoint(sn = "#afterSaleSn", description = "'售后-商家收货:单号['+#afterSaleSn+'],物流单号为['+#logisticsNo+']" +
|
||||||
",处理结果['+serviceStatus='PASS'?+'商家收货':'商家拒收'+']'")
|
",处理结果['+serviceStatus='PASS'?'商家收货':'商家拒收'+']'")
|
||||||
@SystemLogPoint(description = "售后-商家收货", customerLog = "'售后-商家收货:单号['+#afterSaleSn+'],物流单号为['+#logisticsNo+']" +
|
@SystemLogPoint(description = "售后-商家收货", customerLog = "'售后-商家收货:单号['+#afterSaleSn+'],物流单号为['+#logisticsNo+']" +
|
||||||
",处理结果['+serviceStatus='PASS'?+'商家收货':'商家拒收'+']'")
|
",处理结果['+serviceStatus='PASS'?'商家收货':'商家拒收'+']'")
|
||||||
public AfterSale storeConfirm(String afterSaleSn, String serviceStatus, String remark) {
|
public AfterSale storeConfirm(String afterSaleSn, String serviceStatus, String remark) {
|
||||||
//根据售后单号获取售后单
|
//根据售后单号获取售后单
|
||||||
AfterSale afterSale = OperationalJudgment.judgment(this.getBySn(afterSaleSn));
|
AfterSale afterSale = OperationalJudgment.judgment(this.getBySn(afterSaleSn));
|
||||||
|
@ -552,23 +552,38 @@ public class WechatPlugin implements Payment {
|
|||||||
String result = HttpKit.readData(request);
|
String result = HttpKit.readData(request);
|
||||||
log.info("微信退款通知密文 {}", result);
|
log.info("微信退款通知密文 {}", result);
|
||||||
JSONObject ciphertext = JSONUtil.parseObj(result);
|
JSONObject ciphertext = JSONUtil.parseObj(result);
|
||||||
if (!("REFUND.SUCCESS").equals(ciphertext.getStr("event_type"))) {
|
|
||||||
return;
|
try { //校验服务器端响应¬
|
||||||
}
|
|
||||||
try {
|
|
||||||
//校验服务器端响应¬
|
|
||||||
String plainText = WxPayKit.verifyNotify(serialNo, result, signature, nonce, timestamp,
|
String plainText = WxPayKit.verifyNotify(serialNo, result, signature, nonce, timestamp,
|
||||||
wechatPaymentSetting().getApiKey3(), Objects.requireNonNull(getPlatformCert()));
|
wechatPaymentSetting().getApiKey3(), Objects.requireNonNull(getPlatformCert()));
|
||||||
log.info("微信退款通知明文 {}", plainText);
|
log.info("微信退款通知明文 {}", plainText);
|
||||||
JSONObject jsonObject = JSONUtil.parseObj(plainText);
|
|
||||||
String transactionId = jsonObject.getStr("transaction_id");
|
|
||||||
String refundId = jsonObject.getStr("refund_id");
|
|
||||||
|
|
||||||
RefundLog refundLog = refundLogService.getOne(new LambdaQueryWrapper<RefundLog>().eq(RefundLog::getPaymentReceivableNo, transactionId));
|
if (("REFUND.SUCCESS").equals(ciphertext.getStr("event_type"))) {
|
||||||
if (refundLog != null) {
|
log.info("退款成功 {}", plainText);
|
||||||
refundLog.setIsRefund(true);
|
//校验服务器端响应
|
||||||
refundLog.setReceivableNo(refundId);
|
JSONObject jsonObject = JSONUtil.parseObj(plainText);
|
||||||
refundLogService.saveOrUpdate(refundLog);
|
String transactionId = jsonObject.getStr("transaction_id");
|
||||||
|
String refundId = jsonObject.getStr("refund_id");
|
||||||
|
|
||||||
|
RefundLog refundLog = refundLogService.getOne(new LambdaQueryWrapper<RefundLog>().eq(RefundLog::getPaymentReceivableNo, transactionId));
|
||||||
|
if (refundLog != null) {
|
||||||
|
refundLog.setIsRefund(true);
|
||||||
|
refundLog.setReceivableNo(refundId);
|
||||||
|
refundLogService.saveOrUpdate(refundLog);
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
log.info("退款失败 {}", plainText);
|
||||||
|
JSONObject jsonObject = JSONUtil.parseObj(plainText);
|
||||||
|
String transactionId = jsonObject.getStr("transaction_id");
|
||||||
|
String refundId = jsonObject.getStr("refund_id");
|
||||||
|
|
||||||
|
RefundLog refundLog = refundLogService.getOne(new LambdaQueryWrapper<RefundLog>().eq(RefundLog::getPaymentReceivableNo, transactionId));
|
||||||
|
if (refundLog != null) {
|
||||||
|
refundLog.setReceivableNo(refundId);
|
||||||
|
refundLog.setErrorMessage(ciphertext.getStr("summary"));
|
||||||
|
refundLogService.saveOrUpdate(refundLog);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("微信退款失败", e);
|
log.error("微信退款失败", e);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user