From 6dfce4b9bda75082d6ffa542f87eeaafe1465adc Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 20 Feb 2023 12:37:47 +0800 Subject: [PATCH] fix car pay --- .../java/com/iformall/domain/po/WxCarPayOrder.java | 13 ++++++++++++- .../iformall/service/park/pay/WxParkPayService.java | 2 +- .../service/park/pay/WxParkPayServiceImpl.java | 5 +++-- .../main/resources/mapper/WxCarPayOrderMapper.xml | 7 ++++++- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java index 205af9eec..4b3ebd583 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java @@ -3,6 +3,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumCarPayAmountType; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; @@ -89,5 +90,15 @@ public class WxCarPayOrder extends TenantEntity { @TableField(exist = false) private Long merchantId = 111111111L; @TableField(exist = false) - private String merchantName = "停车商户"; + private String merchantName; + + public String getMerchantName() { + if (null != merchantAccountType) { + EnumCarPayAmountType at = EnumCarPayAmountType.getEnum(merchantAccountType); + if (null != at) { + return at.getMessage(); + } + } + return null; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java b/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java index 23711c040..350b0da3c 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java @@ -29,7 +29,7 @@ public interface WxParkPayService { public String handlePaidCallBack(String tenantId,Map paramMap); public void handlePaidSuccess(WxPark wxPark,Long cUserId,Integer carVendor,String carNumber,String parkOrderNo, - Integer fee,Date paidTime,String transcationId,String merchantAccount,String userPhone) throws Exception; + Integer fee,Date paidTime,String transcationId,Integer merchantAccountType,String merchantAccount,String userPhone) throws Exception; public WxCarPayOrder detailWxCarPayOrder(Long id,String tenantId); diff --git a/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java index cb41664b3..6aad05355 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java @@ -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); diff --git a/mallinkService/src/main/resources/mapper/WxCarPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCarPayOrderMapper.xml index b80c694ef..10fd54fc4 100644 --- a/mallinkService/src/main/resources/mapper/WxCarPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarPayOrderMapper.xml @@ -14,6 +14,7 @@ + @@ -23,7 +24,7 @@ `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`c_user_id`,`c_user_phone`,`car_number`,`pay_amount`, - `pay_time`,`transaction_id`,`park_order_no`,`merchant_account`,`park_notify`, + `pay_time`,`transaction_id`,`park_order_no`,`merchant_account_type`,`merchant_account`,`park_notify`, `notify_fail_reason`,`notify_count`,`car_vendor` @@ -69,6 +70,10 @@ and `park_order_no` = #{parkOrderNo} + + + and `merchant_account_type` = #{merchantAccountType} + and `merchant_account` like concat('%', #{merchantAccount},'%')