diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java b/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java index 1103a9c88..04d17aab6 100644 --- a/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java +++ b/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java @@ -13,8 +13,8 @@ public enum ConnectEnum { */ QQ("QQ登录"), WEIBO("微博联合登录"), - WECHAT("微信联合登录"), //只存放unionid + WECHAT("微信联合登录"), WECHAT_OPEN_ID("微信openid登录"), WECHAT_MP_OPEN_ID("微信openid登录"), ALIPAY("支付宝登录"), diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java index ad023ae27..76b51b4d8 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java @@ -274,9 +274,9 @@ public class AfterSaleServiceImpl extends ServiceImpl().eq(RefundLog::getPaymentReceivableNo, transactionId)); - if (refundLog != null) { - refundLog.setIsRefund(true); - refundLog.setReceivableNo(refundId); - refundLogService.saveOrUpdate(refundLog); + if (("REFUND.SUCCESS").equals(ciphertext.getStr("event_type"))) { + 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().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().eq(RefundLog::getPaymentReceivableNo, transactionId)); + if (refundLog != null) { + refundLog.setReceivableNo(refundId); + refundLog.setErrorMessage(ciphertext.getStr("summary")); + refundLogService.saveOrUpdate(refundLog); + } } } catch (Exception e) { log.error("微信退款失败", e);