Commit 3da35aea by 程裕兵

feat:get fee rate

parent c1314cd8
...@@ -40,6 +40,8 @@ import com.jiejing.fitness.finance.service.rpc.MerchantRpcService; ...@@ -40,6 +40,8 @@ import com.jiejing.fitness.finance.service.rpc.MerchantRpcService;
import com.jiejing.fitness.finance.service.rpc.PayRpcService; import com.jiejing.fitness.finance.service.rpc.PayRpcService;
import com.jiejing.fitness.finance.service.rpc.StudioRpcService; import com.jiejing.fitness.finance.service.rpc.StudioRpcService;
import com.jiejing.fitness.finance.service.utils.DingUtil; import com.jiejing.fitness.finance.service.utils.DingUtil;
import com.jiejing.fitness.finance.service.utils.FeeUtil;
import com.jiejing.paycenter.api.pay.PayApi;
import com.jiejing.paycenter.common.enums.common.PayChannelEnums; import com.jiejing.paycenter.common.enums.common.PayChannelEnums;
import com.jiejing.paycenter.common.enums.common.TransStateEnums; import com.jiejing.paycenter.common.enums.common.TransStateEnums;
import com.jiejing.paycenter.common.enums.pay.PayTypeEnums; import com.jiejing.paycenter.common.enums.pay.PayTypeEnums;
...@@ -164,11 +166,12 @@ public class PayServiceImpl implements PayService { ...@@ -164,11 +166,12 @@ public class PayServiceImpl implements PayService {
} }
MerchantVO merchant = merchantRpcService.getByMerchantId(relation.getMerchantId()); MerchantVO merchant = merchantRpcService.getByMerchantId(relation.getMerchantId());
StudioCashierRecord record = PayConvert.convertPayInit(params, studio, merchant); StudioCashierRecord record = PayConvert.convertPayInit(params, studio, merchant);
studioCashierRecordRpService.insert(record);
PayRequest request = PayConvert.convert(params, record); PayRequest request = PayConvert.convert(params, record);
record.setFeeRate(payRpcService.getFeeRate(request));
record.setFee(FeeUtil.calPayFee(record.getFeeRate(), params.getTransAmount()));
studioCashierRecordRpService.insert(record);
return payRpcService.pay(request); return payRpcService.pay(request);
} }
......
...@@ -55,4 +55,10 @@ public class PayRpcService { ...@@ -55,4 +55,10 @@ public class PayRpcService {
return Optional.ofNullable(result.getResult()) return Optional.ofNullable(result.getResult())
.orElse(SettleVO.builder().transAmount(BigDecimal.ZERO).build()); .orElse(SettleVO.builder().transAmount(BigDecimal.ZERO).build());
} }
public BigDecimal getFeeRate(PayRequest request) {
JsonResult<BigDecimal> result = payApi.getFeeRate(request);
return result.getResult();
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment