Przeglądaj źródła

update

release_toaliyun_real
xiaohanzi 5 lat temu
rodzic
commit
5b959d3582
4 zmienionych plików z 8 dodań i 8 usunięć
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java
  2. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/miniApp/wx/maPay/WxMiniMaPayAdapterService.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java Wyświetl plik

@@ -85,7 +85,7 @@ public interface WxPayOrderService {
* @param record
* @param transactionId
*/
void handleMicroOrderPaySuccess(Object result,String transcationId,WxPayOrder record ,WxMerchantBUser user,WxAppinfo appInfo,PayExtraParam params);
void handleMicroOrderPaySuccess(Object result,String transcationId,EnumPayWay payWay,WxPayOrder record ,WxMerchantBUser user,WxAppinfo appInfo,PayExtraParam params);

/**
* 券支付成功处理


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java Wyświetl plik

@@ -485,7 +485,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
//支付失败,更新record,支付成功,则调用
if (payResult.isSuccess()) {
handleMicroOrderPaySuccess(payResult.getData(), payResult.getTransactionId(),record,user, appInfo, params);
handleMicroOrderPaySuccess(payResult.getData(), payResult.getTransactionId(),payWay,record,user, appInfo, params);
return new ResultData(Result.SUCCESS, "创建支付订单成功", payResult.getData());
}else {
try {
@@ -552,7 +552,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
handleOrderPaySuccess(record, apiResult.getTransactionId());
//C端被动支付
}else if (payService instanceof CPassivePayService) {
handleMicroOrderPaySuccess(apiResult.getData(),apiResult.getTransactionId(), record,user,appInfo,null);
handleMicroOrderPaySuccess(apiResult.getData(),apiResult.getTransactionId(),payWay, record,user,appInfo,null);
}
return new ResultData(Result.SUCCESS, "success",apiResult.getData());
}else if (status == EnumPayStatus.PAY_STATUS_ORDER_NOT_EXISTS.getCode().intValue()) {
@@ -1094,11 +1094,11 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public void handleMicroOrderPaySuccess(Object result,String transcationId, WxPayOrder record ,WxMerchantBUser user,WxAppinfo appInfo,PayExtraParam params) {
public void handleMicroOrderPaySuccess(Object result,String transcationId,EnumPayWay payWay, WxPayOrder record ,WxMerchantBUser user,WxAppinfo appInfo,PayExtraParam params) {
//B端操作,需要生成cUser
Long cUserId;
try {
cUserId = payServiceFactory.getCPassivePayService(1).createCUserAfterPay(result, appInfo);
cUserId = payServiceFactory.getCPassivePayService(payWay.getCode()).createCUserAfterPay(result, appInfo);
} catch (Exception e1) {
logger.error("创建C端用户失败: " ,e1);
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "创建C端用户失败: " + e1.getMessage());


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java Wyświetl plik

@@ -15,7 +15,7 @@ import com.iformall.service.pay.service.CDrivingPayService;
import com.iformall.service.pay.service.CPassivePayService;
import com.iformall.service.pay.service.PayAdapterService;
import com.iformall.service.pay.service.miniApp.wx.appPay.WxMiniAppPayAdapterService;
import com.iformall.service.pay.service.miniApp.wx.maPay.WxMaPayAdapterService;
import com.iformall.service.pay.service.miniApp.wx.maPay.WxMiniMaPayAdapterService;

/**
* 支付方式工厂
@@ -29,7 +29,7 @@ public class PayServiceFactory {
@Autowired
WxMiniAppPayAdapterService wxMiniAppPayService;
@Autowired
WxMaPayAdapterService wxMiniAppMaPayService;
WxMiniMaPayAdapterService wxMiniAppMaPayService;
@Autowired
WxPayOrderService wxPayOrderService;


mallinkService/src/main/java/com/iformall/service/pay/service/miniApp/wx/maPay/WxMaPayAdapterService.java → mallinkService/src/main/java/com/iformall/service/pay/service/miniApp/wx/maPay/WxMiniMaPayAdapterService.java Wyświetl plik

@@ -34,7 +34,7 @@ import lombok.extern.slf4j.Slf4j;

@Slf4j
@Service
public class WxMaPayAdapterService extends BaseWxPayAdapterService implements CPassivePayService{
public class WxMiniMaPayAdapterService extends BaseWxPayAdapterService implements CPassivePayService{

private WxMicroPayOrderP generateWxMicroPayOrderP(WxPayAccount payAccount, WxOrder order, WxPayOrder record, EnumPayShare isShare,
WxAppinfo appInfo, Date currentDate,String bAppId,String bUserPhone) throws Exception {

Ładowanie…
Anuluj
Zapisz