Browse Source

fix car pay

release_toaliyun_real
lin 3 years ago
parent
commit
6dfce4b9bd
4 changed files with 22 additions and 5 deletions
  1. +12
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java
  3. +3
    -2
      mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java
  4. +6
    -1
      mallinkService/src/main/resources/mapper/WxCarPayOrderMapper.xml

+ 12
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java View File

@@ -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;
}
}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java View File

@@ -29,7 +29,7 @@ public interface WxParkPayService {
public String handlePaidCallBack(String tenantId,Map<String, String> 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);


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java View File

@@ -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);


+ 6
- 1
mallinkService/src/main/resources/mapper/WxCarPayOrderMapper.xml View File

@@ -14,6 +14,7 @@
<result column="pay_time" jdbcType="TIMESTAMP" property="payTime"/>
<result column="transaction_id" jdbcType="VARCHAR" property="transactionId"/>
<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="park_notify" jdbcType="INTEGER" property="parkNotify"/>
<result column="notify_fail_reason" jdbcType="VARCHAR" property="notifyFailReason"/>
@@ -23,7 +24,7 @@

<sql id="allColumns">
`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`
</sql>

@@ -69,6 +70,10 @@
<if test=" null != parkOrderNo ">
and `park_order_no` = #{parkOrderNo}
</if>
<if test=" null != merchantAccountType ">
and `merchant_account_type` = #{merchantAccountType}
</if>

<if test=" null != merchantAccount ">
and `merchant_account` like concat('%', #{merchantAccount},'%')


Loading…
Cancel
Save