推送bug fix,退款异常处理
This commit is contained in:
parent
0bd5297ea7
commit
c0e6215f36
@ -146,10 +146,10 @@ public class UniCloudPushServiceImpl implements UniCloudPushService {
|
||||
|
||||
request.put("push_clientid", distinctClientIds)
|
||||
.put("title", title)
|
||||
.put("content", content)
|
||||
.put("message_id", messageId); // 添加唯一消息ID
|
||||
.put("content", content); // 添加唯一消息ID
|
||||
|
||||
if (payload != null) {
|
||||
payload.set("message_id", messageId);
|
||||
request.put("payload", payload);
|
||||
}
|
||||
|
||||
|
||||
@ -1433,7 +1433,7 @@ public class PayConsumeTradeServiceImpl extends BaseServiceImpl<PayConsumeTradeM
|
||||
// throw new ApiException(I18nUtil._("用户退款失败!"));
|
||||
// }
|
||||
|
||||
throw new ApiException(I18nUtil._("退款原路返回失败!"));
|
||||
throw new ApiException(I18nUtil._("退款失败,请联系客服后重试"));
|
||||
}
|
||||
}
|
||||
|
||||
@ -1594,7 +1594,8 @@ public class PayConsumeTradeServiceImpl extends BaseServiceImpl<PayConsumeTradeM
|
||||
}
|
||||
} catch (ApiException e) {
|
||||
// 捕获业务异常,记录日志并继续处理下一个退货单
|
||||
log.error("处理退货单异常, returnRow:{}, error:{}", returnRow, e.getMessage());
|
||||
log.error("处理退货单异常 returnRow:{}, error:{}", returnRow, e.getMessage());
|
||||
throw new ApiException(I18nUtil._("退款失败,请联系客服后重试"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1726,7 +1726,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
|
||||
// 卖家账户扣款,买家账户增加
|
||||
// 佣金问题
|
||||
|
||||
shopOrderReturn.setReturn_is_paid(1); // 0-退货未完成;1-退货完成
|
||||
shopOrderReturn.setReturn_is_paid(CommonConstant.Enable); // 0-退货未完成;1-退货完成
|
||||
shopOrderReturn.setReturn_finish_time(now);
|
||||
|
||||
List<ShopOrderReturn> returnOrder = new ArrayList<>();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user