wuxw пре 2 година
родитељ
комит
041ae19ae1

+ 2 - 2
service-acct/src/main/java/com/java110/acct/cmd/payment/QrCodePaymentCmd.java

@@ -60,10 +60,10 @@ public class QrCodePaymentCmd extends Cmd {
             int pre = Integer.parseInt(authCode.substring(0, 2));
             if (pre > 24 && pre < 31) { // 支付宝
                 qrCodePaymentSMOImpl = ApplicationContextFactory.getBean("qrCodeAliPaymentAdapt", IQrCodePaymentSMO.class);
-                reqJson.put("primeRate", FeeDetailDto.PRIME_REATE_WECHAT_QRCODE);
+                reqJson.put("primeRate", FeeDetailDto.PRIME_REATE_ALI_QRCODE);
             } else {
                 qrCodePaymentSMOImpl = ApplicationContextFactory.getBean("qrCodeWechatPaymentAdapt", IQrCodePaymentSMO.class);
-                reqJson.put("primeRate", FeeDetailDto.PRIME_REATE_ALI_QRCODE);
+                reqJson.put("primeRate", FeeDetailDto.PRIME_REATE_WECHAT_QRCODE);
             }
         } else {
             qrCodePaymentSMOImpl = ApplicationContextFactory.getBean(payQrAdapt, IQrCodePaymentSMO.class);

+ 4 - 0
service-fee/src/main/java/com/java110/fee/convertOnce/CycleConvertOnceFeeImpl.java

@@ -2,6 +2,7 @@ package com.java110.fee.convertOnce;
 
 import com.java110.dto.fee.FeeDto;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeRuleV1InnerServiceSMO;
 import com.java110.po.fee.PayFeePo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,6 +20,9 @@ public class CycleConvertOnceFeeImpl implements ICycleConvertOnceFee {
     @Autowired
     private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
 
+    @Autowired
+    private IPayFeeRuleV1InnerServiceSMO payFeeRuleV1InnerServiceSMOImpl;
+
     @Override
     public int convertPayFees(List<PayFeePo> payFeePos) {