| @@ -3,6 +3,7 @@ package com.iformall.domain.po; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.enums.EnumCarPayAmountType; | |||||
| import cn.afterturn.easypoi.excel.annotation.Excel; | import cn.afterturn.easypoi.excel.annotation.Excel; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| @@ -89,5 +90,15 @@ public class WxCarPayOrder extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Long merchantId = 111111111L; | private Long merchantId = 111111111L; | ||||
| @TableField(exist = false) | @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; | |||||
| } | |||||
| } | } | ||||
| @@ -29,7 +29,7 @@ public interface WxParkPayService { | |||||
| public String handlePaidCallBack(String tenantId,Map<String, String> paramMap); | public String handlePaidCallBack(String tenantId,Map<String, String> paramMap); | ||||
| public void handlePaidSuccess(WxPark wxPark,Long cUserId,Integer carVendor,String carNumber,String parkOrderNo, | 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); | public WxCarPayOrder detailWxCarPayOrder(Long id,String tenantId); | ||||
| @@ -182,7 +182,7 @@ public class WxParkPayServiceImpl implements WxParkPayService { | |||||
| } | } | ||||
| handlePaidSuccess(wxPark,cUserId,carVendor,carNumber,parkOrderNo,Integer.parseInt(cashFeeStr), | handlePaidSuccess(wxPark,cUserId,carVendor,carNumber,parkOrderNo,Integer.parseInt(cashFeeStr), | ||||
| DateUtils.string2Date(time_end, DateUtils.DATE_PATTERN_ALL_NOSPACE).getTime(),transcationId, | DateUtils.string2Date(time_end, DateUtils.DATE_PATTERN_ALL_NOSPACE).getTime(),transcationId, | ||||
| merchantAccount,userPhone); | |||||
| accountType,merchantAccount,userPhone); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("handlePaidCallBackError.",e); | logger.error("handlePaidCallBackError.",e); | ||||
| return notifyErrorResult(e.getMessage()); | return notifyErrorResult(e.getMessage()); | ||||
| @@ -201,7 +201,7 @@ public class WxParkPayServiceImpl implements WxParkPayService { | |||||
| @Override | @Override | ||||
| public void handlePaidSuccess(WxPark wxPark,Long cUserId,Integer carVendor,String carNumber, | 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{ | String userPhone) throws Exception{ | ||||
| //查询该笔订单是否已经存在 | //查询该笔订单是否已经存在 | ||||
| WxCarPayOrder payOrder = wxCarPayOrderMapper.findOneByParkOderNo(parkOrderNo, wxPark.getTenantId()); | WxCarPayOrder payOrder = wxCarPayOrderMapper.findOneByParkOderNo(parkOrderNo, wxPark.getTenantId()); | ||||
| @@ -227,6 +227,7 @@ public class WxParkPayServiceImpl implements WxParkPayService { | |||||
| payOrder.setPayTime(paidTime); | payOrder.setPayTime(paidTime); | ||||
| payOrder.setTransactionId(transcationId); | payOrder.setTransactionId(transcationId); | ||||
| payOrder.setParkOrderNo(parkOrderNo); | payOrder.setParkOrderNo(parkOrderNo); | ||||
| payOrder.setMerchantAccountType(merchantAccountType); | |||||
| payOrder.setMerchantAccount(merchantAccount); | payOrder.setMerchantAccount(merchantAccount); | ||||
| payOrder.setCarVendor(carVendor); | payOrder.setCarVendor(carVendor); | ||||
| payOrder.setcUserPhone(userPhone); | payOrder.setcUserPhone(userPhone); | ||||
| @@ -14,6 +14,7 @@ | |||||
| <result column="pay_time" jdbcType="TIMESTAMP" property="payTime"/> | <result column="pay_time" jdbcType="TIMESTAMP" property="payTime"/> | ||||
| <result column="transaction_id" jdbcType="VARCHAR" property="transactionId"/> | <result column="transaction_id" jdbcType="VARCHAR" property="transactionId"/> | ||||
| <result column="park_order_no" jdbcType="VARCHAR" property="parkOrderNo"/> | <result column="park_order_no" jdbcType="VARCHAR" property="parkOrderNo"/> | ||||
| <result column="merchant_account_type" jdbcType="INTEGER" property="merchantAccountType"/> | |||||
| <result column="merchant_account" jdbcType="VARCHAR" property="merchantAccount"/> | <result column="merchant_account" jdbcType="VARCHAR" property="merchantAccount"/> | ||||
| <result column="park_notify" jdbcType="INTEGER" property="parkNotify"/> | <result column="park_notify" jdbcType="INTEGER" property="parkNotify"/> | ||||
| <result column="notify_fail_reason" jdbcType="VARCHAR" property="notifyFailReason"/> | <result column="notify_fail_reason" jdbcType="VARCHAR" property="notifyFailReason"/> | ||||
| @@ -23,7 +24,7 @@ | |||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`c_user_id`,`c_user_phone`,`car_number`,`pay_amount`, | `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` | `notify_fail_reason`,`notify_count`,`car_vendor` | ||||
| </sql> | </sql> | ||||
| @@ -69,6 +70,10 @@ | |||||
| <if test=" null != parkOrderNo "> | <if test=" null != parkOrderNo "> | ||||
| and `park_order_no` = #{parkOrderNo} | and `park_order_no` = #{parkOrderNo} | ||||
| </if> | </if> | ||||
| <if test=" null != merchantAccountType "> | |||||
| and `merchant_account_type` = #{merchantAccountType} | |||||
| </if> | |||||
| <if test=" null != merchantAccount "> | <if test=" null != merchantAccount "> | ||||
| and `merchant_account` like concat('%', #{merchantAccount},'%') | and `merchant_account` like concat('%', #{merchantAccount},'%') | ||||