Skip to content

F
fit-finance
Commit 10077151 by 程裕兵
Options

feat:pay

parent 3b08cd46
Showing with 25 additions and 21 deletions
app/src/main/java/com/jiejing/fitness/finance/app/FitnessFinanceApplication.java
...@@ -2,7 +2,6 @@ package com.jiejing.fitness.finance.app; ...@@ -2,7 +2,6 @@ package com.jiejing.fitness.finance.app;
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
import com.jiejing.common.config.idgen.EnableLeaseIdWorker; import com.jiejing.common.config.idgen.EnableLeaseIdWorker;
import com.jiejing.filecenter.api.common.event.ResourceEvent;
import com.jiejing.fitness.finance.service.event.ListenerService; import com.jiejing.fitness.finance.service.event.ListenerService;
import com.jiejing.paycenter.common.event.MerchantEvent; import com.jiejing.paycenter.common.event.MerchantEvent;
import com.jiejing.paycenter.common.event.PayEvent; import com.jiejing.paycenter.common.event.PayEvent;
......
service/src/main/java/com/jiejing/fitness/finance/service/config/PayChannelConfiguration.java 0 → 100644
package com.jiejing.fitness.finance.service.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @author chengyubing
* @since 2024/4/15 15:30
*/
@Configuration
public class PayChannelConfiguration {
@Bean
public PayChannelProperties payChannelProperties() {
return new PayChannelProperties();
}
}
service/src/main/java/com/jiejing/fitness/finance/service/config/PayChannelConfig.java → service/src/main/java/com/jiejing/fitness/finance/service/config/PayChannelProperties.java
...@@ -2,8 +2,6 @@ package com.jiejing.fitness.finance.service.config; ...@@ -2,8 +2,6 @@ package com.jiejing.fitness.finance.service.config;
import lombok.Data; import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;
/** /**
* 支付渠道配置 * 支付渠道配置
...@@ -12,10 +10,8 @@ import org.springframework.context.annotation.Configuration; ...@@ -12,10 +10,8 @@ import org.springframework.context.annotation.Configuration;
* @since 2024/4/15 14:14 * @since 2024/4/15 14:14
*/ */
@Data @Data
@Configuration
@EnableConfigurationProperties(PayChannelConfig.class)
@ConfigurationProperties(prefix = "finance.channel") @ConfigurationProperties(prefix = "finance.channel")
public class PayChannelConfig { public class PayChannelProperties {
private String cashier; private String cashier;
......
service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/BrandMerchantServiceImpl.java
...@@ -8,7 +8,7 @@ import com.jiejing.fitness.finance.repository.entity.PartyToMerchant; ...@@ -8,7 +8,7 @@ import com.jiejing.fitness.finance.repository.entity.PartyToMerchant;
import com.jiejing.fitness.finance.repository.entity.StudioMerchantApply; import com.jiejing.fitness.finance.repository.entity.StudioMerchantApply;
import com.jiejing.fitness.finance.repository.service.PartyToMerchantRpService; import com.jiejing.fitness.finance.repository.service.PartyToMerchantRpService;
import com.jiejing.fitness.finance.repository.service.StudioMerchantApplyRpService; import com.jiejing.fitness.finance.repository.service.StudioMerchantApplyRpService;
import com.jiejing.fitness.finance.service.config.PayChannelConfig; import com.jiejing.fitness.finance.service.config.PayChannelProperties;
import com.jiejing.fitness.finance.service.global.ConfigService; import com.jiejing.fitness.finance.service.global.ConfigService;
import com.jiejing.fitness.finance.service.merchant.BrandMerchantService; import com.jiejing.fitness.finance.service.merchant.BrandMerchantService;
import com.jiejing.fitness.finance.service.merchant.convert.MerchantConvert; import com.jiejing.fitness.finance.service.merchant.convert.MerchantConvert;
...@@ -21,7 +21,6 @@ import java.util.Map; ...@@ -21,7 +21,6 @@ import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.Resource; import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -35,7 +34,7 @@ import org.springframework.stereotype.Service; ...@@ -35,7 +34,7 @@ import org.springframework.stereotype.Service;
public class BrandMerchantServiceImpl implements BrandMerchantService { public class BrandMerchantServiceImpl implements BrandMerchantService {
@Resource @Resource
private PayChannelConfig config; private PayChannelProperties config;
@Resource @Resource
private StudioMerchantApplyRpService studioMerchantApplyRpService; private StudioMerchantApplyRpService studioMerchantApplyRpService;
......
service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java
...@@ -18,7 +18,7 @@ import com.jiejing.fitness.finance.repository.entity.StudioMerchantApply; ...@@ -18,7 +18,7 @@ import com.jiejing.fitness.finance.repository.entity.StudioMerchantApply;
import com.jiejing.fitness.finance.repository.query.PageStudioMerchantApplyQuery; import com.jiejing.fitness.finance.repository.query.PageStudioMerchantApplyQuery;
import com.jiejing.fitness.finance.repository.service.PartyToMerchantRpService; import com.jiejing.fitness.finance.repository.service.PartyToMerchantRpService;
import com.jiejing.fitness.finance.repository.service.StudioMerchantApplyRpService; import com.jiejing.fitness.finance.repository.service.StudioMerchantApplyRpService;
import com.jiejing.fitness.finance.service.config.PayChannelConfig; import com.jiejing.fitness.finance.service.config.PayChannelProperties;
import com.jiejing.fitness.finance.service.enums.FinanceErrorEnums; import com.jiejing.fitness.finance.service.enums.FinanceErrorEnums;
import com.jiejing.fitness.finance.service.global.ConfigService; import com.jiejing.fitness.finance.service.global.ConfigService;
import com.jiejing.fitness.finance.service.global.dto.SubChannelInfoDTO; import com.jiejing.fitness.finance.service.global.dto.SubChannelInfoDTO;
...@@ -53,7 +53,6 @@ import java.util.concurrent.Executor; ...@@ -53,7 +53,6 @@ import java.util.concurrent.Executor;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.Resource; import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
...@@ -68,7 +67,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -68,7 +67,7 @@ import org.springframework.transaction.annotation.Transactional;
public class StudioMerchantServiceImpl implements StudioMerchantService { public class StudioMerchantServiceImpl implements StudioMerchantService {
@Resource @Resource
private PayChannelConfig config; private PayChannelProperties config;
@Resource @Resource
private StudioRpcService studioRpcService; private StudioRpcService studioRpcService;
......
service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/PayServiceImpl.java
...@@ -4,8 +4,6 @@ import static java.util.stream.Collectors.toList; ...@@ -4,8 +4,6 @@ import static java.util.stream.Collectors.toList;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayConfig;
import com.alipay.api.AlipayRequest;
import com.alipay.api.DefaultAlipayClient; import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.request.AlipaySystemOauthTokenRequest; import com.alipay.api.request.AlipaySystemOauthTokenRequest;
import com.alipay.api.response.AlipaySystemOauthTokenResponse; import com.alipay.api.response.AlipaySystemOauthTokenResponse;
...@@ -15,12 +13,9 @@ import com.jiejing.common.exception.BizException; ...@@ -15,12 +13,9 @@ import com.jiejing.common.exception.BizException;
import com.jiejing.common.utils.collection.CollectionUtil; import com.jiejing.common.utils.collection.CollectionUtil;
import com.jiejing.common.utils.time.TimeUtil; import com.jiejing.common.utils.time.TimeUtil;
import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum; import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum;
import com.jiejing.fitness.enums.finance.PartyTypeEnum;
import com.jiejing.fitness.finance.api.pay.request.NativePayRequest;
import com.jiejing.fitness.finance.repository.entity.GlobalConfig; import com.jiejing.fitness.finance.repository.entity.GlobalConfig;
import com.jiejing.fitness.finance.repository.entity.StudioCashierRecord; import com.jiejing.fitness.finance.repository.entity.StudioCashierRecord;
import com.jiejing.fitness.finance.repository.entity.PartyToMerchant; import com.jiejing.fitness.finance.repository.entity.PartyToMerchant;
import com.jiejing.fitness.finance.repository.entity.StudioCheckSettleRecord;
import com.jiejing.fitness.finance.repository.entity.StudioMerchantApply; import com.jiejing.fitness.finance.repository.entity.StudioMerchantApply;
import com.jiejing.fitness.finance.repository.entity.StudioSettleRecord; import com.jiejing.fitness.finance.repository.entity.StudioSettleRecord;
import com.jiejing.fitness.finance.repository.service.GlobalConfigRpService; import com.jiejing.fitness.finance.repository.service.GlobalConfigRpService;
...@@ -29,7 +24,7 @@ import com.jiejing.fitness.finance.repository.service.PartyToMerchantRpService; ...@@ -29,7 +24,7 @@ import com.jiejing.fitness.finance.repository.service.PartyToMerchantRpService;
import com.jiejing.fitness.finance.repository.service.StudioCheckSettleRecordRpService; import com.jiejing.fitness.finance.repository.service.StudioCheckSettleRecordRpService;
import com.jiejing.fitness.finance.repository.service.StudioMerchantApplyRpService; import com.jiejing.fitness.finance.repository.service.StudioMerchantApplyRpService;
import com.jiejing.fitness.finance.repository.service.StudioSettleRecordRpService; import com.jiejing.fitness.finance.repository.service.StudioSettleRecordRpService;
import com.jiejing.fitness.finance.service.config.PayChannelConfig; import com.jiejing.fitness.finance.service.config.PayChannelProperties;
import com.jiejing.fitness.finance.service.enums.FinanceErrorEnums; import com.jiejing.fitness.finance.service.enums.FinanceErrorEnums;
import com.jiejing.fitness.finance.service.enums.GlobalConfigEnums; import com.jiejing.fitness.finance.service.enums.GlobalConfigEnums;
import com.jiejing.fitness.finance.service.pay.PayService; import com.jiejing.fitness.finance.service.pay.PayService;
...@@ -43,7 +38,6 @@ import com.jiejing.fitness.finance.service.rpc.StudioRpcService; ...@@ -43,7 +38,6 @@ 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.fitness.finance.service.utils.FeeUtil;
import com.jiejing.fitness.finance.service.utils.MoneyUtil; import com.jiejing.fitness.finance.service.utils.MoneyUtil;
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;
...@@ -71,7 +65,6 @@ import javax.annotation.PostConstruct; ...@@ -71,7 +65,6 @@ import javax.annotation.PostConstruct;
import javax.annotation.Resource; import javax.annotation.Resource;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -84,7 +77,7 @@ import org.springframework.stereotype.Service; ...@@ -84,7 +77,7 @@ import org.springframework.stereotype.Service;
public class PayServiceImpl implements PayService { public class PayServiceImpl implements PayService {
@Resource @Resource
private PayChannelConfig config; private PayChannelProperties config;
@Resource @Resource
private PartyToMerchantRpService partyToMerchantRpService; private PartyToMerchantRpService partyToMerchantRpService;
......
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