|
|
|
@@ -167,10 +167,11 @@ public class WxParkPayServiceImpl implements WxParkPayService { |
|
|
|
String merchantAccount = attachObj.getString("ma"); |
|
|
|
Long merchantId = attachObj.getLong("mid"); |
|
|
|
String merchantName = attachObj.getString("mn"); |
|
|
|
String userPhone = attachObj.getString("uh"); |
|
|
|
|
|
|
|
handlePaidSuccess(te,park,cUserId,carVendor,carNumber,payOrderNo,Integer.parseInt(cashFeeStr), |
|
|
|
DateUtils.string2Date(time_end, DateUtils.DATE_PATTERN_ALL_NOSPACE).getTime(),transcationId, |
|
|
|
merchantAccount,merchantId,merchantName); |
|
|
|
merchantAccount,merchantId,merchantName,userPhone); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("handlePaidCallBackError.",e); |
|
|
|
return notifyErrorResult(e.getMessage()); |
|
|
|
@@ -190,7 +191,7 @@ public class WxParkPayServiceImpl implements WxParkPayService { |
|
|
|
@Override |
|
|
|
public void handlePaidSuccess(TenantEntity tenantEntity,WxPark wxPark,Long cUserId,Integer carVendor,String carNumber, |
|
|
|
String payOrderNo,Integer fee,Date paidTime,String transcationId,String merchantAccount, |
|
|
|
Long merchantId,String merchantName) throws Exception{ |
|
|
|
Long merchantId,String merchantName,String userPhone) throws Exception{ |
|
|
|
//查询该笔订单是否已经存在 |
|
|
|
WxCarPayOrder payOrder = wxCarPayOrderMapper.findOneByParkOderNo(payOrderNo, tenantEntity.getTenantId()); |
|
|
|
String parkOrderNo = ParkCreatePayOrder.getRealParkOrderNumber(payOrderNo,EnumCarVendor.getEnum(carVendor)); |
|
|
|
@@ -219,8 +220,8 @@ public class WxParkPayServiceImpl implements WxParkPayService { |
|
|
|
payOrder.setMerchantId(merchantId); |
|
|
|
payOrder.setMerchantName(merchantName); |
|
|
|
payOrder.setCarVendor(carVendor); |
|
|
|
payOrder.setCUserPhone(userPhone); |
|
|
|
wxCarPayOrderMapper.insert(payOrder); |
|
|
|
|
|
|
|
//通知车场支付成功 |
|
|
|
try { |
|
|
|
parkFactory.getParkService(carVendor).notifyPaid(wxPark,new ParkNotifyPaid(tenantEntity.getTenantId(),payOrderNo,parkOrderNo,fee,paidTime)); |
|
|
|
|