winter 2 лет назад
Родитель
Сommit
0e55e2cdc5
10 измененных файлов: 25 добавлений и 11 удалений
  1. +8
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/PayAdapterService.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v2/miniApp/TtMiniAppPayAdapterService.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v3/open/TtOpenPayAdapterService.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/h5/WxH5PaySFTService.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/h5/WxH5PayService.java
  8. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java
  9. +9
    -2
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/maPay/WxMiniMaPayAdapterService.java
  10. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java

+ 8
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java Просмотреть файл

@@ -799,8 +799,15 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
if(payAccount == null){
throw new MallinkException(ErrorCode.API_KEY_NOT_FOUND);
}
OrderAdapterService orderAdapterService = orderFactory.getOrderAdapterService(EnumComposeOrder.SINGLE.getCode());
WxComposeOrder composeOrder = orderAdapterService.getComposeOrder(record.getOrderId(), cAppInfo.getTenantId());
if (composeOrder == null) {
logger.error("pay order reverse, no composeOrder " + record.toString());
throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND);
}
try {
PayAdapterResult result = payServiceFactory.getPayAdapterService(record.getPayVendor(),record.getPayVersion()).payOrderReverse(cAppInfo, record, payAccount);
PayAdapterResult result = payServiceFactory.getPayAdapterService(record.getPayVendor(),record.getPayVersion()).payOrderReverse(cAppInfo, record, payAccount,composeOrder);
if (result.isSuccess()) {
record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_REVERSE.getCode());
record.setUpdateTime(new Date());


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/pay/PayAdapterService.java Просмотреть файл

@@ -76,7 +76,7 @@ public interface PayAdapterService {
* @return
* @throws Exception
*/
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record,WxPayAccount payAccount) throws Exception;
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record,WxPayAccount payAccount,WxComposeOrder composeOrder) throws Exception;

/**
* API 订单同步


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v2/miniApp/TtMiniAppPayAdapterService.java Просмотреть файл

@@ -240,7 +240,7 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen
}

@Override
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount)
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount,WxComposeOrder composeOrder)
throws Exception {
return super.payOrderReverse(appInfo, record, payAccount);
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v3/open/TtOpenPayAdapterService.java Просмотреть файл

@@ -105,7 +105,7 @@ public class TtOpenPayAdapterService extends BaseTtPayAdapterService implements
}

@Override
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount)
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount,WxComposeOrder composeOrder)
throws Exception {
return super.payOrderReverse(appInfo, record, payAccount);
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/h5/WxH5PaySFTService.java Просмотреть файл

@@ -53,7 +53,7 @@ public class WxH5PaySFTService extends BaseWxPaySFTAdapterService implements CDr
}

@Override
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount)
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount,WxComposeOrder composeOrder)
throws Exception {
// TODO Auto-generated method stub
return null;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java Просмотреть файл

@@ -277,7 +277,7 @@ public class WxMiniAppPaySFTAdapterService extends BaseWxPaySFTAdapterService i
}

@Override
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount)
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount,WxComposeOrder composeOrder)
throws Exception {
return super.payOrderReverse(appInfo, record, payAccount, payAccount.getSubMchId());
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/h5/WxH5PayService.java Просмотреть файл

@@ -50,7 +50,7 @@ public class WxH5PayService extends BaseWxPayV2AdapterService implements CDrivi
}

@Override
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount)
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount,WxComposeOrder composeOrder)
throws Exception {
// TODO Auto-generated method stub
return null;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java Просмотреть файл

@@ -320,7 +320,7 @@ public class WxMiniAppPayAdapterService extends BaseWxPayV2AdapterService implem
}

@Override
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount)
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount,WxComposeOrder composeOrder)
throws Exception {
return super.payOrderReverse(appInfo, record, payAccount,payAccount.getSubMchId());
}


+ 9
- 2
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/maPay/WxMiniMaPayAdapterService.java Просмотреть файл

@@ -271,9 +271,16 @@ public class WxMiniMaPayAdapterService extends BaseWxPayV2AdapterService impleme
}

@Override
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount)
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount,WxComposeOrder composeOrder)
throws Exception {
return super.payOrderReverse(appInfo, record, payAccount,payAccount.getSubMchId());
String mchId = payAccount.getSubMchId();
if (record.getMchType() == EnumPayMchType.DIRECT.getCode()) {
mchId = getMerchantUid(record,composeOrder.getSingleOrder());
//总分
}else if (record.getMchType() == EnumPayMchType.TOTAL.getCode()) {
mchId = payAccount.getSubMchId();
}
return super.payOrderReverse(appInfo, record, payAccount,mchId);
}

@Override


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java Просмотреть файл

@@ -317,7 +317,7 @@ public class WxMiniAppPayV3AdapterService extends BaseWxPayV3AdapterService impl
}

@Override
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount)
public PayAdapterResult payOrderReverse(WxAppinfo appInfo, WxPayOrder record, WxPayAccount payAccount,WxComposeOrder composeOrder)
throws Exception {
return super.payOrderReverse(appInfo, record, payAccount,payAccount.getSubMchId());
}


Загрузка…
Отмена
Сохранить