|
|
@@ -887,9 +887,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
|
String outRefundNo = "";
|
|
|
if (OrderDon.Type.EX_CODE != orderDon.getType()) {
|
|
|
- if (orderDon.getPopularizeId() == null) {
|
|
|
- orderDon.setShopId(null);
|
|
|
- }
|
|
|
//支付宝退款
|
|
|
AlipayClient alipayClient = AliPayClientFactory.getAlipayClient(Optional.ofNullable(orderDon.getShopId()).orElse(ShopConfig.ZFB_DEFAULT_APP_ID));
|
|
|
AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
|
|
|
@@ -907,7 +904,11 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
//退款请求号
|
|
|
model.setOutRequestNo(outRefundNo);
|
|
|
request.setBizModel(model);
|
|
|
- response = alipayClient.execute(request);
|
|
|
+ if (orderDon.getShopId() != null && orderDon.getShopId().equals(ShopConfig.DISTRIBUTE_ZFB_DEFAULT_APP_ID)) {
|
|
|
+ response = alipayClient.certificateExecute(request);
|
|
|
+ }else {
|
|
|
+ response = alipayClient.execute(request);
|
|
|
+ }
|
|
|
}
|
|
|
final String outNo = outRefundNo;
|
|
|
if (response.isSuccess()) {
|