qin 9 mesi fa
parent
commit
e3cfdcc657

+ 5 - 5
src/main/java/com/poteviohealth/ym/ipos/model/payment/PaymentRecords.java

@@ -76,17 +76,17 @@ public class PaymentRecords extends BaseEntity {
     private Integer chargeAmount;
 
     @ApiModelProperty(value = "1:交易结果通知;3:资金解冻通知")
-    private String notify_type;
+    private String notifyType;
 
     @ApiModelProperty(value = "资金冻结状态 01:冻结 02:解冻")
-    private String fund_freeze_stat;
+    private String fundFreezeStat;
 
     @ApiModelProperty(value = "冻结时间 格式:yyyyMMddHHmmss")
-    private String freeze_time;
+    private String freezeTime;
 
     @ApiModelProperty(value = "解冻金额 单位:分")
-    private String unfreeze_amt;
+    private String unfreezeAmt;
 
     @ApiModelProperty(value = "解冻时间 格式:yyyyMMddHHmmss")
-    private String unfreeze_time;
+    private String unfreezeTime;
 }

+ 6 - 6
src/main/java/com/poteviohealth/ym/ipos/service/impl/PaymentServiceImpl.java

@@ -242,7 +242,7 @@ public class PaymentServiceImpl implements IPaymentService {
                     pr.setTransType(payNotification.getTrans_type());
                     pr.setTradeNo(payNotification.getTrade_no());
                     pr.setChargeAmount(payNotification.getCharge_amount());
-                    pr.setFund_freeze_stat(payNotification.getFund_freeze_stat());
+                    pr.setFundFreezeStat(payNotification.getFund_freeze_stat());
                     PayReceive payReceive = new PayReceive();
                     payReceive.setPayId(pr.getPayId());
                     payReceive.setPaySn(pr.getPaySn());
@@ -260,11 +260,11 @@ public class PaymentServiceImpl implements IPaymentService {
                 }
             }else{
                 //解冻通知
-                if(pr.getFund_freeze_stat().equals("01")){
-                    pr.setFund_freeze_stat(payNotification.getFund_freeze_stat());
-                    pr.setFreeze_time(payNotification.getFreeze_time());
-                    pr.setUnfreeze_amt(payNotification.getUnfreeze_amt());
-                    pr.setUnfreeze_time(payNotification.getUnfreeze_time());
+                if(pr.getFundFreezeStat().equals("01")){
+                    pr.setFundFreezeStat(payNotification.getFund_freeze_stat());
+                    pr.setFreezeTime(payNotification.getFreeze_time());
+                    pr.setUnfreezeAmt(payNotification.getUnfreeze_amt());
+                    pr.setUnfreezeTime(payNotification.getUnfreeze_time());
                     //调用分账通知
                     paymentRecordsService.updateById(pr);
                 }else{