三方支付

src/main/java/com/poteviohealth/ym/ipos/service/impl/MerchantServiceImpl.java

@@ -284,9 +284,9 @@ public class MerchantServiceImpl implements IMerchantService {
         if(source.equals(3)){
             vaultsResponse =  customerFeignClient.updateMerchantId(operatorIdParams);
         }else{
-            if(proportion != null){
+           /* if(proportion != null){
                 operatorIdParams.setProportion(proportion.divide(new BigDecimal(100.0)));
-            }
+            }*/
             vaultsResponse =  partnerFeignClient.updateMerchantId(operatorIdParams);
         }
 

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

@@ -243,6 +243,7 @@ public class PaymentServiceImpl implements IPaymentService {
                     pr.setTradeNo(payNotification.getTrade_no());
                     pr.setChargeAmount(payNotification.getCharge_amount());
                     pr.setFundFreezeStat(payNotification.getFund_freeze_stat());
+                    pr.setNotifyType(payNotification.getNotify_type());
                     PayReceive payReceive = new PayReceive();
                     payReceive.setPayId(pr.getPayId());
                     payReceive.setPaySn(pr.getPaySn());