|
|
|
@@ -182,7 +182,7 @@ public class WxParkPayServiceImpl implements WxParkPayService { |
|
|
|
} |
|
|
|
handlePaidSuccess(wxPark,cUserId,carVendor,carNumber,parkOrderNo,Integer.parseInt(cashFeeStr), |
|
|
|
DateUtils.string2Date(time_end, DateUtils.DATE_PATTERN_ALL_NOSPACE).getTime(),transcationId, |
|
|
|
merchantAccount,userPhone); |
|
|
|
accountType,merchantAccount,userPhone); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("handlePaidCallBackError.",e); |
|
|
|
return notifyErrorResult(e.getMessage()); |
|
|
|
@@ -201,7 +201,7 @@ public class WxParkPayServiceImpl implements WxParkPayService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public void handlePaidSuccess(WxPark wxPark,Long cUserId,Integer carVendor,String carNumber, |
|
|
|
String parkOrderNo,Integer fee,Date paidTime,String transcationId,String merchantAccount, |
|
|
|
String parkOrderNo,Integer fee,Date paidTime,String transcationId,Integer merchantAccountType,String merchantAccount, |
|
|
|
String userPhone) throws Exception{ |
|
|
|
//查询该笔订单是否已经存在 |
|
|
|
WxCarPayOrder payOrder = wxCarPayOrderMapper.findOneByParkOderNo(parkOrderNo, wxPark.getTenantId()); |
|
|
|
@@ -227,6 +227,7 @@ public class WxParkPayServiceImpl implements WxParkPayService { |
|
|
|
payOrder.setPayTime(paidTime); |
|
|
|
payOrder.setTransactionId(transcationId); |
|
|
|
payOrder.setParkOrderNo(parkOrderNo); |
|
|
|
payOrder.setMerchantAccountType(merchantAccountType); |
|
|
|
payOrder.setMerchantAccount(merchantAccount); |
|
|
|
payOrder.setCarVendor(carVendor); |
|
|
|
payOrder.setcUserPhone(userPhone); |
|
|
|
|