修复支付bug

yn-bftl-byx / thirdparty

Browse code 修复支付bug master
1 parent 8c52fbe commit 1824d4381d016d367c51df966cb140a4b1e12b76 steven authored on 27 Sep

Patch

Showing 9 changed files

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/common/service/impl/ByxTradeWayServiceImpl.java
package com.yn.bftl.thirdparty.common.service.impl; import com.alibaba.fastjson.JSON; import com.yn.bftl.thirdparty.common.dto.BaseSecretDTO; import com.yn.bftl.thirdparty.common.service.ByxTradeWayService; import com.yn.bftl.thirdparty.common.util.CryptoUtils; import com.yn.bftl.thirdparty.modules.chinaums.util.ByxChinaumsUtil; import com.yn.bftl.thirdparty.modules.secret.service.RandomKeyService; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.HashMap; import java.util.Map; @Component public class ByxTradeWayServiceImpl implements ByxTradeWayService { @Resource private RandomKeyService randomKeyService; @Resource private ByxChinaumsUtil byxChinaumsUtil; public void setTradeWayInPassword(BaseSecretDTO param) { Map<String, String> tradeWayFields = new HashMap<>(); // 支付密码验证，实际应用中，由密码控件加密支付密码 param.setTradeWayCode("b_pass"); tradeWayFields.put("encryptType", "2"); tradeWayFields.put("encryptPwd", param.getEncryptPwd()); tradeWayFields.put("plugRandomKey", param.getPlugRandomKey()); param.setTradeWayFeilds(JSON.toJSONString(tradeWayFields)); } public void setTradeWayInCert(BaseSecretDTO param, String walletId) { Map<String, String> tradeWayFields = new HashMap<>(); // 交易证书签名 param.setTradeWayCode("b_certificate"); String plugRandKey = randomKeyService.getOneKey(); String signSource = walletId + "," + plugRandKey; tradeWayFields.put("plugRandomKey", plugRandKey); tradeWayFields.put("certSign", CryptoUtils.sign("SHA256withRSA", signSource, byxChinaumsUtil.getTransactionPrivateKey(), "UTF-8")); param.setTradeWayFeilds(JSON.toJSONString(tradeWayFields)); } @Override public void setCert(BaseSecretDTO param, String walletId) { // 交易证书签名 String plugRandKey = randomKeyService.getOneKey(); String signSource = walletId + "," + plugRandKey; param.setPlugRandomKey(plugRandKey); param.setCertSign(CryptoUtils.sign("SHA256withRSA", signSource, byxChinaumsUtil.getTransactionPrivateKey(), "UTF-8")); } } package com.yn.bftl.thirdparty.common.service.impl; import com.alibaba.fastjson.JSON; import com.yn.bftl.thirdparty.common.dto.BaseSecretDTO; import com.yn.bftl.thirdparty.common.service.ByxTradeWayService; import com.yn.bftl.thirdparty.common.util.CryptoUtils; import com.yn.bftl.thirdparty.modules.chinaums.util.ByxChinaumsUtil; import com.yn.bftl.thirdparty.modules.secret.service.RandomKeyService; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.HashMap; import java.util.Map; @Component public class ByxTradeWayServiceImpl implements ByxTradeWayService { @Resource private RandomKeyService randomKeyService; @Resource private ByxChinaumsUtil byxChinaumsUtil; public void setTradeWayInPassword(BaseSecretDTO param) { Map<String, String> tradeWayFields = new HashMap<>(); // 支付密码验证，实际应用中，由密码控件加密支付密码 param.setTradeWayCode("b_pass"); tradeWayFields.put("encryptType", "2"); tradeWayFields.put("encryptPwd", param.getEncryptPwd()); tradeWayFields.put("plugRandomKey", param.getPlugRandomKey()); param.setTradeWayFeilds(JSON.toJSONString(tradeWayFields)); } public void setTradeWayInCert(BaseSecretDTO param, String walletId) { Map<String, String> tradeWayFields = new HashMap<>(); // 交易证书签名 param.setTradeWayCode("b_certificate"); String plugRandKey = randomKeyService.getOneKey(); String signSource = walletId + "," + plugRandKey; tradeWayFields.put("plugRandomKey", plugRandKey); tradeWayFields.put("certSign", CryptoUtils.sign("SHA256withRSA", signSource, byxChinaumsUtil.getPrivateKey(), "UTF-8")); param.setTradeWayFeilds(JSON.toJSONString(tradeWayFields)); } @Override public void setCert(BaseSecretDTO param, String walletId) { // 交易证书签名 String plugRandKey = randomKeyService.getOneKey(); String signSource = walletId + "," + plugRandKey; param.setPlugRandomKey(plugRandKey); param.setCertSign(CryptoUtils.sign("SHA256withRSA", signSource, byxChinaumsUtil.getPrivateKey(), "UTF-8")); } }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/common/service/impl/ByxTradeWayServiceImpl.java

package com.yn.bftl.thirdparty.common.service.impl;

import com.alibaba.fastjson.JSON;
import com.yn.bftl.thirdparty.common.dto.BaseSecretDTO;
import com.yn.bftl.thirdparty.common.service.ByxTradeWayService;
import com.yn.bftl.thirdparty.common.util.CryptoUtils;
import com.yn.bftl.thirdparty.modules.chinaums.util.ByxChinaumsUtil;
import com.yn.bftl.thirdparty.modules.secret.service.RandomKeyService;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;

@Component
public class ByxTradeWayServiceImpl implements ByxTradeWayService {

@Resource
    private RandomKeyService randomKeyService;

@Resource
    private ByxChinaumsUtil byxChinaumsUtil;

public void setTradeWayInPassword(BaseSecretDTO param) {
 Map<String, String> tradeWayFields = new HashMap<>();
 // 支付密码验证，实际应用中，由密码控件加密支付密码
 param.setTradeWayCode("b_pass");
 tradeWayFields.put("encryptType", "2");
 tradeWayFields.put("encryptPwd", param.getEncryptPwd());
 tradeWayFields.put("plugRandomKey", param.getPlugRandomKey());
 param.setTradeWayFeilds(JSON.toJSONString(tradeWayFields));
 }

public void setTradeWayInCert(BaseSecretDTO param, String walletId) {
 Map<String, String> tradeWayFields = new HashMap<>();
 // 交易证书签名
 param.setTradeWayCode("b_certificate");
 String plugRandKey = randomKeyService.getOneKey();
 String signSource = walletId + "," + plugRandKey;
 tradeWayFields.put("plugRandomKey", plugRandKey);
 tradeWayFields.put("certSign", CryptoUtils.sign("SHA256withRSA", signSource, byxChinaumsUtil.getTransactionPrivateKey(), "UTF-8"));
 param.setTradeWayFeilds(JSON.toJSONString(tradeWayFields));
 }

@Override
    public void setCert(BaseSecretDTO param, String walletId) {
        // 交易证书签名
        String plugRandKey = randomKeyService.getOneKey();
        String signSource = walletId + "," + plugRandKey;
        param.setPlugRandomKey(plugRandKey);
        param.setCertSign(CryptoUtils.sign("SHA256withRSA", signSource, byxChinaumsUtil.getTransactionPrivateKey(), "UTF-8"));
    }
}

package com.yn.bftl.thirdparty.common.service.impl;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;

@Component
public class ByxTradeWayServiceImpl implements ByxTradeWayService {

@Resource
    private RandomKeyService randomKeyService;

@Resource
    private ByxChinaumsUtil byxChinaumsUtil;

public void setTradeWayInCert(BaseSecretDTO param, String walletId) {
 Map<String, String> tradeWayFields = new HashMap<>();
 // 交易证书签名
 param.setTradeWayCode("b_certificate");
 String plugRandKey = randomKeyService.getOneKey();
 String signSource = walletId + "," + plugRandKey;
 tradeWayFields.put("plugRandomKey", plugRandKey);
 tradeWayFields.put("certSign", CryptoUtils.sign("SHA256withRSA", signSource, byxChinaumsUtil.getPrivateKey(), "UTF-8"));
 param.setTradeWayFeilds(JSON.toJSONString(tradeWayFields));
 }

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/common/util/CryptoUtils.java
package com.yn.bftl.thirdparty.common.util; import org.bouncycastle.util.encoders.Hex; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; import java.security.KeyStore; import java.security.PrivateKey; import java.security.PublicKey; import java.security.Signature; /** * 加密工具类 * * @author huabiao * @create 2022/9/7 10:36 / public class CryptoUtils { / * 生成签名 * * @param algorithm 签名算法 * @param content 原文 * @param priKey 私钥 * @param charset 字符编码 * @return 签名 / public static String sign(String algorithm, String content, PrivateKey priKey, String charset) { try { Signature signature = Signature.getInstance(algorithm); signature.initSign(priKey); signature.update(content.getBytes(charset)); return Hex.toHexString(signature.sign()); } catch (Exception e) { throw new RuntimeException(e); } } /* * 验证签名 * * @param algorithm 签名算法 * @param content 原文 * @param sign 签名 * @param pubKey 公钥 * @param charset 字符编码 * @return 是否验签通过 / public static boolean verifySign(String algorithm, String content, String sign, PublicKey pubKey, String charset) { try { Signature signature = Signature.getInstance(algorithm); signature.initVerify(pubKey); signature.update(content.getBytes(charset)); return signature.verify(Hex.decode(sign)); } catch (Exception e) { //验签失败 throw new RuntimeException(e); } } public static PrivateKey initPrivateKeyFromFile(File file, String pwd){ try{ KeyStore ks = KeyStore.getInstance("PKCS12"); FileInputStream fin = new FileInputStream(file); ks.load(fin, pwd.toCharArray()); return (PrivateKey)ks.getKey(ks.aliases().nextElement(),pwd.toCharArray()); }catch (Exception e){ throw new RuntimeException(e); } } public static PrivateKey initPrivateKeyFromByteArray(byte[] byteArray, String pwd){ try{ ByteArrayInputStream bais = new ByteArrayInputStream(byteArray); KeyStore ks = KeyStore.getInstance("PKCS12"); ks.load(bais, pwd.toCharArray()); return (PrivateKey)ks.getKey(ks.aliases().nextElement(),pwd.toCharArray()); }catch (Exception e){ throw new RuntimeException(e); } } } package com.yn.bftl.thirdparty.common.util; import org.bouncycastle.util.encoders.Base64; import org.bouncycastle.util.encoders.Hex; import java.io.File; import java.io.FileInputStream; import java.security.; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.security.spec.X509EncodedKeySpec; /** * 加密工具类 * * @author huabiao * @create 2022/9/7 10:36 / public class CryptoUtils { / * 生成签名 * * @param algorithm 签名算法 * @param content 原文 * @param priKey 私钥 * @param charset 字符编码 * @return 签名 / public static String sign(String algorithm, String content, PrivateKey priKey, String charset) { try { Signature signature = Signature.getInstance(algorithm); signature.initSign(priKey); signature.update(content.getBytes(charset)); return Hex.toHexString(signature.sign()); } catch (Exception e) { throw new RuntimeException(e); } } /* * 验证签名 * * @param algorithm 签名算法 * @param content 原文 * @param sign 签名 * @param pubKey 公钥 * @param charset 字符编码 * @return 是否验签通过 */ public static boolean verifySign(String algorithm, String content, String sign, PublicKey pubKey, String charset) { try { Signature signature = Signature.getInstance(algorithm); signature.initVerify(pubKey); signature.update(content.getBytes(charset)); return signature.verify(Hex.decode(sign)); } catch (Exception e) { //验签失败 throw new RuntimeException(e); } } public static PrivateKey initPrivateKeyFromFile(File file, String pwd){ try{ KeyStore ks = KeyStore.getInstance("PKCS12"); FileInputStream fin = new FileInputStream(file); ks.load(fin, pwd.toCharArray()); return (PrivateKey)ks.getKey(ks.aliases().nextElement(),pwd.toCharArray()); }catch (Exception e){ throw new RuntimeException(e); } } }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/common/util/CryptoUtils.java

package com.yn.bftl.thirdparty.common.util;

import org.bouncycastle.util.encoders.Hex;

import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.security.KeyStore;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.Signature;

/**
 * 加密工具类
 *
 * @author huabiao
 * @create 2022/9/7  10:36
 **/
public class CryptoUtils {

/**
     * 生成签名
     *
     * @param algorithm 签名算法
     * @param content   原文
     * @param priKey    私钥
     * @param charset   字符编码
     * @return 签名
     */
    public static String sign(String algorithm, String content, PrivateKey priKey, String charset) {
        try {
            Signature signature = Signature.getInstance(algorithm);
            signature.initSign(priKey);
            signature.update(content.getBytes(charset));
            return Hex.toHexString(signature.sign());
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }

/**
     * 验证签名
     *
     * @param algorithm 签名算法
     * @param content   原文
     * @param sign      签名
     * @param pubKey    公钥
     * @param charset   字符编码
     * @return 是否验签通过
     */
    public static boolean verifySign(String algorithm, String content, String sign, PublicKey pubKey, String charset) {
        try {
            Signature signature = Signature.getInstance(algorithm);
            signature.initVerify(pubKey);
            signature.update(content.getBytes(charset));
            return signature.verify(Hex.decode(sign));
        } catch (Exception e) {
            //验签失败
            throw new RuntimeException(e);
        }
    }

public static PrivateKey initPrivateKeyFromFile(File file, String pwd){
        try{
            KeyStore ks = KeyStore.getInstance("PKCS12");
            FileInputStream fin = new FileInputStream(file);
            ks.load(fin, pwd.toCharArray());
            return  (PrivateKey)ks.getKey(ks.aliases().nextElement(),pwd.toCharArray());
        }catch (Exception e){
            throw new RuntimeException(e);
        }
    }

public static PrivateKey initPrivateKeyFromByteArray(byte[] byteArray, String pwd){
        try{
            ByteArrayInputStream bais = new ByteArrayInputStream(byteArray);
            KeyStore ks = KeyStore.getInstance("PKCS12");
            ks.load(bais, pwd.toCharArray());
            return  (PrivateKey)ks.getKey(ks.aliases().nextElement(),pwd.toCharArray());
        }catch (Exception e){
            throw new RuntimeException(e);
        }
    }

}

package com.yn.bftl.thirdparty.common.util;

import org.bouncycastle.util.encoders.Base64;
import org.bouncycastle.util.encoders.Hex;

import java.io.File;
import java.io.FileInputStream;
import java.security.*;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.security.spec.X509EncodedKeySpec;

/**
 * 加密工具类
 *
 * @author huabiao
 * @create 2022/9/7  10:36
 **/
public class CryptoUtils {

}

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/modules/chinaums/controller/ProfitSharingController.java
package com.yn.bftl.thirdparty.modules.chinaums.controller; import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxCreateMemberDTO; import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxCreateMemberRuleDTO; import com.yn.bftl.thirdparty.modules.chinaums.service.ProfitSharingService; import com.yn.bftl.thirdparty.modules.chinaums.vo.byx.ByxChinaumsProfitSharingPartnerVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @Api(value = "ProfitSharingController", tags = "分账相关业务") @RestController @RequestMapping("/chinaums/profit_sharing") public class ProfitSharingController { @Resource private ProfitSharingService profitSharingService; // 百业兴业务 @ApiOperation(value = "添加关联分账方, 一般在项目上线前调用完成之后，不予调用，实时调用") @RequestMapping(value = "/statement/create_partner", method = RequestMethod.POST) public void addPartner(ByxCreateMemberDTO byxCreateMemberDTO) { profitSharingService.addPartner(byxCreateMemberDTO); } @ApiOperation(value = "查询关联分账方") @RequestMapping(value = "/statement/query_partner", method = RequestMethod.POST) public ByxChinaumsProfitSharingPartnerVO queryPartner() { return profitSharingService.queryPartner(); } @ApiOperation(value = "添加分账规则, 一般在项目上线前调用完成之后，不予调用，非实时，需要银行审核") @RequestMapping(value = "/statement/create_rules", method = RequestMethod.POST) public void addRules(ByxCreateMemberRuleDTO byxCreateMemberRuleDTO) { profitSharingService.addRules(byxCreateMemberRuleDTO); } @ApiOperation(value = "同步更新审核状态") @RequestMapping(value = "/statement/rules/syn_status", method = RequestMethod.POST) public void synApproveStatus() { profitSharingService.synApproveStatus(); } } package com.yn.bftl.thirdparty.modules.chinaums.controller; import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxCreateMemberDTO; import com.yn.bftl.thirdparty.modules.chinaums.service.ProfitSharingService; import com.yn.bftl.thirdparty.modules.chinaums.vo.byx.ByxChinaumsProfitSharingPartnerVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @Api(value = "ProfitSharingController", tags = "分账相关业务") @RestController @RequestMapping("/chinaums/profit_sharing") public class ProfitSharingController { @Resource private ProfitSharingService profitSharingService; // 百业兴业务 @ApiOperation(value = "添加关联分账方, 一般在项目上线前调用完成之后，不予调用，实时调用") @RequestMapping(value = "/statement/create_partner", method = RequestMethod.POST) public void addPartner(ByxCreateMemberDTO byxCreateMemberDTO) { profitSharingService.addPartner(byxCreateMemberDTO); } @ApiOperation(value = "查询关联分账方") @RequestMapping(value = "/statement/query_partner", method = RequestMethod.POST) public ByxChinaumsProfitSharingPartnerVO queryPartner(ByxCreateMemberDTO byxCreateMemberDTO) { return profitSharingService.queryPartner(byxCreateMemberDTO); } @ApiOperation(value = "添加分账规则, 一般在项目上线前调用完成之后，不予调用，非实时，需要银行审核") @RequestMapping(value = "/statement/create_rules", method = RequestMethod.POST) public void addRules(ByxCreateMemberDTO byxCreateMemberDTO) { profitSharingService.addRules(byxCreateMemberDTO); } @ApiOperation(value = "同步更新审核状态") @RequestMapping(value = "/statement/rules/syn_status", method = RequestMethod.POST) public void synApproveStatus() { profitSharingService.synApproveStatus(); } }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/modules/chinaums/controller/ProfitSharingController.java

package com.yn.bftl.thirdparty.modules.chinaums.controller;

import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxCreateMemberDTO;
import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxCreateMemberRuleDTO;
import com.yn.bftl.thirdparty.modules.chinaums.service.ProfitSharingService;
import com.yn.bftl.thirdparty.modules.chinaums.vo.byx.ByxChinaumsProfitSharingPartnerVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

@Api(value = "ProfitSharingController", tags = "分账相关业务")
@RestController
@RequestMapping("/chinaums/profit_sharing")
public class ProfitSharingController {

@Resource
    private ProfitSharingService profitSharingService;

// 百业兴业务
    @ApiOperation(value = "添加关联分账方, 一般在项目上线前调用完成之后，不予调用，实时调用")
    @RequestMapping(value = "/statement/create_partner", method = RequestMethod.POST)
    public void addPartner(ByxCreateMemberDTO byxCreateMemberDTO) {
        profitSharingService.addPartner(byxCreateMemberDTO);
    }

@ApiOperation(value = "查询关联分账方")
    @RequestMapping(value = "/statement/query_partner", method = RequestMethod.POST)
    public ByxChinaumsProfitSharingPartnerVO queryPartner() {
        return profitSharingService.queryPartner();
    }

@ApiOperation(value = "添加分账规则, 一般在项目上线前调用完成之后，不予调用，非实时，需要银行审核")
    @RequestMapping(value = "/statement/create_rules", method = RequestMethod.POST)
    public void addRules(ByxCreateMemberRuleDTO byxCreateMemberRuleDTO) {
        profitSharingService.addRules(byxCreateMemberRuleDTO);
    }

@ApiOperation(value = "同步更新审核状态")
    @RequestMapping(value = "/statement/rules/syn_status", method = RequestMethod.POST)
    public void synApproveStatus() {
        profitSharingService.synApproveStatus();
    }
}

package com.yn.bftl.thirdparty.modules.chinaums.controller;

import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxCreateMemberDTO;
import com.yn.bftl.thirdparty.modules.chinaums.service.ProfitSharingService;
import com.yn.bftl.thirdparty.modules.chinaums.vo.byx.ByxChinaumsProfitSharingPartnerVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

@Api(value = "ProfitSharingController", tags = "分账相关业务")
@RestController
@RequestMapping("/chinaums/profit_sharing")
public class ProfitSharingController {

@Resource
    private ProfitSharingService profitSharingService;

@ApiOperation(value = "查询关联分账方")
    @RequestMapping(value = "/statement/query_partner", method = RequestMethod.POST)
    public ByxChinaumsProfitSharingPartnerVO queryPartner(ByxCreateMemberDTO byxCreateMemberDTO) {
        return profitSharingService.queryPartner(byxCreateMemberDTO);
    }

@ApiOperation(value = "添加分账规则, 一般在项目上线前调用完成之后，不予调用，非实时，需要银行审核")
    @RequestMapping(value = "/statement/create_rules", method = RequestMethod.POST)
    public void addRules(ByxCreateMemberDTO byxCreateMemberDTO) {
        profitSharingService.addRules(byxCreateMemberDTO);
    }

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/modules/chinaums/dto/byx/ByxCreateMemberRuleDTO.java 0 → 100644
package com.yn.bftl.thirdparty.modules.chinaums.dto.byx; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.List; @Data @EqualsAndHashCode(callSuper = false) @ApiModel(value = "ByxCreateMemberRuleDTO", description="创建分账规则DTO") public class ByxCreateMemberRuleDTO { // 添加分账规则的公司列表 private List<Long> targetCompanyIdList; }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/modules/chinaums/dto/byx/ByxCreateMemberRuleDTO.java 0 → 100644

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/ProfitSharingService.java
package com.yn.bftl.thirdparty.modules.chinaums.service; import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxCreateMemberDTO; import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxCreateMemberRuleDTO; import com.yn.bftl.thirdparty.modules.chinaums.vo.byx.ByxChinaumsProfitSharingPartnerVO; public interface ProfitSharingService { /** * 分账关联方-添加关联方 * @param byxCreateMemberDTO byxCreateMemberDTO / void addPartner(ByxCreateMemberDTO byxCreateMemberDTO); /* * 分账关联方-查询关联方 / ByxChinaumsProfitSharingPartnerVO queryPartner(); /* * 添加分账规则, 一般在项目上线前调用完成之后，不予调用，非实时，需要银行审核 * @param byxCreateMemberRuleDTO / void addRules(ByxCreateMemberRuleDTO byxCreateMemberRuleDTO); /* * 同步更新审核状态 * @param byxCreateMemberDTO / void synApproveStatus(); } package com.yn.bftl.thirdparty.modules.chinaums.service; import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxCreateMemberDTO; import com.yn.bftl.thirdparty.modules.chinaums.vo.byx.ByxChinaumsProfitSharingPartnerVO; public interface ProfitSharingService { /* * 分账关联方-添加关联方 * @param byxCreateMemberDTO byxCreateMemberDTO / void addPartner(ByxCreateMemberDTO byxCreateMemberDTO); /* * 分账关联方-查询关联方 * @param byxCreateMemberDTO byxCreateMemberDTO / ByxChinaumsProfitSharingPartnerVO queryPartner(ByxCreateMemberDTO byxCreateMemberDTO); /* * 添加分账规则, 一般在项目上线前调用完成之后，不予调用，非实时，需要银行审核 * @param byxCreateMemberDTO / void addRules(ByxCreateMemberDTO byxCreateMemberDTO); /* * 同步更新审核状态 * @param byxCreateMemberDTO */ void synApproveStatus(); }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/ProfitSharingService.java

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/WalletService.java
package com.yn.bftl.thirdparty.modules.chinaums.service; import com.yn.bftl.common.modules.account.dto.AccountPaymentsDTO; import com.yn.bftl.common.modules.account.dto.ExternalIncomeDTO; import com.yn.bftl.common.modules.account.dto.WithdrawalsDTO; import com.yn.bftl.common.modules.account.vo.AccountPaymentsVO; import com.yn.bftl.common.modules.account.vo.BalanceAcctsVO; import com.yn.bftl.common.modules.account.vo.BalanceTransactionsPageVO; import com.yn.bftl.common.modules.account.vo.WithdrawalsVO; import com.yn.bftl.common.modules.order.dto.SubaccountRefundDTO; import com.yn.bftl.common.modules.order.dto.WalletRefundDTO; import com.yn.bftl.common.modules.order.entity.Order; import com.yn.bftl.common.modules.order.vo.RefundVO; import com.yn.bftl.common.modules.order.vo.SubaccountRefundVO; import com.yn.bftl.common.modules.subaccount.entity.ChinaumsPayment; import com.yn.bftl.thirdparty.modules.chinaums.dto.TradeResultDTO; import com.yn.bftl.thirdparty.modules.chinaums.dto.WalletCreateByCompanyDTO; import com.yn.bftl.thirdparty.modules.chinaums.dto.WalletOrderPayDTO; import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxChinaumsGuaranteePayConfirmsDTO; import com.yn.bftl.thirdparty.modules.chinaums.dto.chinaums.ChinaumsAllocationsDTO; import com.yn.bftl.thirdparty.modules.chinaums.dto.chinaums.ChinaumsGuaranteePayConfirmsDTO; import com.yn.bftl.thirdparty.modules.chinaums.vo.ChinaumsRechargeAccountVO; import com.yn.bftl.thirdparty.modules.chinaums.vo.ElectronicReceiptVO; import com.yn.bftl.thirdparty.modules.chinaums.vo.byx.ByxChinaumsGuaranteePayVO; import com.yn.bftl.thirdparty.modules.chinaums.vo.chinaums.ChinaumsAllocationsVO; import com.yn.bftl.thirdparty.modules.chinaums.vo.chinaums.ChinaumsGuaranteePayConfirmsVO; import com.yn.bftl.thirdparty.modules.chinaums.vo.chinaums.ChinaumsGuaranteePayVO; import java.util.List; /** * 电子账簿服务 * * @author huabiao * @create 2022/12/5 20:24 / public interface WalletService { / * 电子账簿查询（电子账簿 ID） * * @param balanceAcctId * @return / BalanceAcctsVO balanceAcctsQryByAcctId(String balanceAcctId); /* * 电子账簿流水查询 * * @param balanceAcctId * @param startAt * @param endAt * @return / BalanceTransactionsPageVO balanceTransactions(String balanceAcctId, String startAt, String endAt); /* * 电子账簿-获取充值账号 * * @return 充值账号 * @author huabiao * @create 2022/12/8 15:13 / ChinaumsRechargeAccountVO getWalletRechargeAccount(); /* * 消费(转账) * * @param accountPaymentsDTO * @return / AccountPaymentsVO payments(AccountPaymentsDTO accountPaymentsDTO); /* * 交易结果通知 * * @param tradeResultDTO * @return / boolean tradeResult(TradeResultDTO tradeResultDTO); /* * 消费订单查询（平台订单号） * * @param outOrderNo * @return / AccountPaymentsVO paymentsByOutOrderNo(String outOrderNo); /* * 提现创建 * * @param withdrawalsDTO * @return / WithdrawalsVO withdrawals(WithdrawalsDTO withdrawalsDTO); /* * 提现订单查询（平台订单号） * * @param outOrderNo * @return / WithdrawalsVO withdrawalsByOutOrderNo(String outOrderNo); /* * 电子账簿-订单支付 * * @param walletOrderPayDTO:订单支付DTO * @return 第三方支付单号 * @author huabiao * @create 2022/12/9 16:01 / String orderPay(WalletOrderPayDTO walletOrderPayDTO); /* * 电子账簿-分账确认 * * @param chinaumsGuaranteePayConfirmsDTO:分账参数 * @return 分账单号 * @author huabiao * @create 2022/12/16 9:52 / ChinaumsGuaranteePayConfirmsVO paySettlement(ChinaumsGuaranteePayConfirmsDTO chinaumsGuaranteePayConfirmsDTO); /* * 电子账簿-处理银联支付单 * * @param order:订单 * @author huabiao * @create 2022/12/16 16:47 / List<ChinaumsPayment> handleChinaumsPayment(Order order); /* * 转账入金 * * @param externalIncomeDTO * @return / Boolean transferDeposit(ExternalIncomeDTO externalIncomeDTO); /* * 电子账簿-退款 * * @param walletRefundDTO 账簿退款DTO * @return 银联退款VO * @author huabiao * @create 2022/12/20 9:10 / RefundVO refund(WalletRefundDTO walletRefundDTO); /* * 电子账簿-创建分账 * * @param chinaumsAllocationsDTO:分账参数 * @return * @author huabiao * @create 2023/2/10 9:50 / ChinaumsAllocationsVO createSubaccount(ChinaumsAllocationsDTO chinaumsAllocationsDTO); /* * POS充值转账 / void posTransfer(); /* * 扫码充值转账 / void scanTransfer(); /* * 电子账簿-分账退款 * * @param subaccountRefundDTO 分账退款DTO * @return SubaccountRefundVO * @author huabiao * @create 2023/4/26 10:46 / SubaccountRefundVO subaccountRefund(SubaccountRefundDTO subaccountRefundDTO); /* * 电子回单 * * @param tradeId * @return / ElectronicReceiptVO electronicReceipts(String tradeId); /* * 电子账簿-通过惬意创建 * * @param walletCreateByCompanyDTO 电子账簿通过企业创建DTO * @author huabiao * @create 2023/5/25 19:28 / void createWalletByCompany(WalletCreateByCompanyDTO walletCreateByCompanyDTO); /* * 创建授信还款电子账簿 / void createWalletCreditRefund(); /** * 通过支付单号查询银联支付信息 * * @param mctOrderNo 支付单号 * @return ByxChinaumsGuaranteePayVO * @author huabiao * @create 2023/10/18 15:45 / ByxChinaumsGuaranteePayVO orderPaymentsByOutOrderNo(String mctOrderNo, String platformWalletId); /* * 担保支付消息推送 * @param tradeResultDTO * @return / boolean payCallback(TradeResultDTO tradeResultDTO); /* * 担保支付确认结算 * @param byxChinaumsGuaranteePayConfirmsDTO---byxChinaumsGuaranteePayConfirmsDTO * @return String----确认结算单号（也叫分账号） / String paySettlementConfirms(ByxChinaumsGuaranteePayConfirmsDTO byxChinaumsGuaranteePayConfirmsDTO); } package com.yn.bftl.thirdparty.modules.chinaums.service; import com.yn.bftl.common.modules.account.dto.AccountPaymentsDTO; import com.yn.bftl.common.modules.account.dto.ExternalIncomeDTO; import com.yn.bftl.common.modules.account.dto.WithdrawalsDTO; import com.yn.bftl.common.modules.account.vo.AccountPaymentsVO; import com.yn.bftl.common.modules.account.vo.BalanceAcctsVO; import com.yn.bftl.common.modules.account.vo.BalanceTransactionsPageVO; import com.yn.bftl.common.modules.account.vo.WithdrawalsVO; import com.yn.bftl.common.modules.order.dto.SubaccountRefundDTO; import com.yn.bftl.common.modules.order.dto.WalletRefundDTO; import com.yn.bftl.common.modules.order.entity.Order; import com.yn.bftl.common.modules.order.vo.RefundVO; import com.yn.bftl.common.modules.order.vo.SubaccountRefundVO; import com.yn.bftl.common.modules.subaccount.entity.ChinaumsPayment; import com.yn.bftl.thirdparty.modules.chinaums.dto.TradeResultDTO; import com.yn.bftl.thirdparty.modules.chinaums.dto.WalletCreateByCompanyDTO; import com.yn.bftl.thirdparty.modules.chinaums.dto.WalletOrderPayDTO; import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxChinaumsGuaranteePayConfirmsDTO; import com.yn.bftl.thirdparty.modules.chinaums.dto.chinaums.ChinaumsAllocationsDTO; import com.yn.bftl.thirdparty.modules.chinaums.dto.chinaums.ChinaumsGuaranteePayConfirmsDTO; import com.yn.bftl.thirdparty.modules.chinaums.vo.ChinaumsRechargeAccountVO; import com.yn.bftl.thirdparty.modules.chinaums.vo.ElectronicReceiptVO; import com.yn.bftl.thirdparty.modules.chinaums.vo.byx.ByxChinaumsGuaranteePayVO; import com.yn.bftl.thirdparty.modules.chinaums.vo.chinaums.ChinaumsAllocationsVO; import com.yn.bftl.thirdparty.modules.chinaums.vo.chinaums.ChinaumsGuaranteePayConfirmsVO; import com.yn.bftl.thirdparty.modules.chinaums.vo.chinaums.ChinaumsGuaranteePayVO; import java.util.List; /* * 电子账簿服务 * * @author huabiao * @create 2022/12/5 20:24 / public interface WalletService { / * 电子账簿查询（电子账簿 ID） * * @param balanceAcctId * @return / BalanceAcctsVO balanceAcctsQryByAcctId(String balanceAcctId); /* * 电子账簿流水查询 * * @param balanceAcctId * @param startAt * @param endAt * @return / BalanceTransactionsPageVO balanceTransactions(String balanceAcctId, String startAt, String endAt); /* * 电子账簿-获取充值账号 * * @return 充值账号 * @author huabiao * @create 2022/12/8 15:13 / ChinaumsRechargeAccountVO getWalletRechargeAccount(); /* * 消费(转账) * * @param accountPaymentsDTO * @return / AccountPaymentsVO payments(AccountPaymentsDTO accountPaymentsDTO); /* * 交易结果通知 * * @param tradeResultDTO * @return / boolean tradeResult(TradeResultDTO tradeResultDTO); /* * 消费订单查询（平台订单号） * * @param outOrderNo * @return / AccountPaymentsVO paymentsByOutOrderNo(String outOrderNo); /* * 提现创建 * * @param withdrawalsDTO * @return / WithdrawalsVO withdrawals(WithdrawalsDTO withdrawalsDTO); /* * 提现订单查询（平台订单号） * * @param outOrderNo * @return / WithdrawalsVO withdrawalsByOutOrderNo(String outOrderNo); /* * 电子账簿-订单支付 * * @param walletOrderPayDTO:订单支付DTO * @return 第三方支付单号 * @author huabiao * @create 2022/12/9 16:01 / String orderPay(WalletOrderPayDTO walletOrderPayDTO); /* * 电子账簿-分账确认 * * @param chinaumsGuaranteePayConfirmsDTO:分账参数 * @return 分账单号 * @author huabiao * @create 2022/12/16 9:52 / ChinaumsGuaranteePayConfirmsVO paySettlement(ChinaumsGuaranteePayConfirmsDTO chinaumsGuaranteePayConfirmsDTO); /* * 电子账簿-处理银联支付单 * * @param order:订单 * @author huabiao * @create 2022/12/16 16:47 / List<ChinaumsPayment> handleChinaumsPayment(Order order); /* * 转账入金 * * @param externalIncomeDTO * @return / Boolean transferDeposit(ExternalIncomeDTO externalIncomeDTO); /* * 电子账簿-退款 * * @param walletRefundDTO 账簿退款DTO * @return 银联退款VO * @author huabiao * @create 2022/12/20 9:10 / RefundVO refund(WalletRefundDTO walletRefundDTO); /* * 电子账簿-创建分账 * * @param chinaumsAllocationsDTO:分账参数 * @return * @author huabiao * @create 2023/2/10 9:50 / ChinaumsAllocationsVO createSubaccount(ChinaumsAllocationsDTO chinaumsAllocationsDTO); /* * POS充值转账 / void posTransfer(); /* * 扫码充值转账 / void scanTransfer(); /* * 电子账簿-分账退款 * * @param subaccountRefundDTO 分账退款DTO * @return SubaccountRefundVO * @author huabiao * @create 2023/4/26 10:46 / SubaccountRefundVO subaccountRefund(SubaccountRefundDTO subaccountRefundDTO); /* * 电子回单 * * @param tradeId * @return / ElectronicReceiptVO electronicReceipts(String tradeId); /* * 电子账簿-通过惬意创建 * * @param walletCreateByCompanyDTO 电子账簿通过企业创建DTO * @author huabiao * @create 2023/5/25 19:28 / void createWalletByCompany(WalletCreateByCompanyDTO walletCreateByCompanyDTO); /* * 创建授信还款电子账簿 / void createWalletCreditRefund(); /** * 通过支付单号查询银联支付信息 * * @param paymentSn 支付单号 * @return ByxChinaumsGuaranteePayVO * @author huabiao * @create 2023/10/18 15:45 / ByxChinaumsGuaranteePayVO orderPaymentsByOutOrderNo(String paymentSn); /* * 担保支付消息推送 * @param tradeResultDTO * @return / boolean payCallback(TradeResultDTO tradeResultDTO); /* * 担保支付确认结算 * @param byxChinaumsGuaranteePayConfirmsDTO---byxChinaumsGuaranteePayConfirmsDTO * @return String----确认结算单号（也叫分账号） */ String paySettlementConfirms(ByxChinaumsGuaranteePayConfirmsDTO byxChinaumsGuaranteePayConfirmsDTO); }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/WalletService.java

package com.yn.bftl.thirdparty.modules.chinaums.service;

import com.yn.bftl.common.modules.account.dto.AccountPaymentsDTO;
import com.yn.bftl.common.modules.account.dto.ExternalIncomeDTO;
import com.yn.bftl.common.modules.account.dto.WithdrawalsDTO;
import com.yn.bftl.common.modules.account.vo.AccountPaymentsVO;
import com.yn.bftl.common.modules.account.vo.BalanceAcctsVO;
import com.yn.bftl.common.modules.account.vo.BalanceTransactionsPageVO;
import com.yn.bftl.common.modules.account.vo.WithdrawalsVO;
import com.yn.bftl.common.modules.order.dto.SubaccountRefundDTO;
import com.yn.bftl.common.modules.order.dto.WalletRefundDTO;
import com.yn.bftl.common.modules.order.entity.Order;
import com.yn.bftl.common.modules.order.vo.RefundVO;
import com.yn.bftl.common.modules.order.vo.SubaccountRefundVO;
import com.yn.bftl.common.modules.subaccount.entity.ChinaumsPayment;
import com.yn.bftl.thirdparty.modules.chinaums.dto.TradeResultDTO;
import com.yn.bftl.thirdparty.modules.chinaums.dto.WalletCreateByCompanyDTO;
import com.yn.bftl.thirdparty.modules.chinaums.dto.WalletOrderPayDTO;
import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxChinaumsGuaranteePayConfirmsDTO;
import com.yn.bftl.thirdparty.modules.chinaums.dto.chinaums.ChinaumsAllocationsDTO;
import com.yn.bftl.thirdparty.modules.chinaums.dto.chinaums.ChinaumsGuaranteePayConfirmsDTO;
import com.yn.bftl.thirdparty.modules.chinaums.vo.ChinaumsRechargeAccountVO;
import com.yn.bftl.thirdparty.modules.chinaums.vo.ElectronicReceiptVO;
import com.yn.bftl.thirdparty.modules.chinaums.vo.byx.ByxChinaumsGuaranteePayVO;
import com.yn.bftl.thirdparty.modules.chinaums.vo.chinaums.ChinaumsAllocationsVO;
import com.yn.bftl.thirdparty.modules.chinaums.vo.chinaums.ChinaumsGuaranteePayConfirmsVO;
import com.yn.bftl.thirdparty.modules.chinaums.vo.chinaums.ChinaumsGuaranteePayVO;

import java.util.List;

/**
 * 电子账簿服务
 *
 * @author huabiao
 * @create 2022/12/5  20:24
 **/
public interface WalletService {

/**
     * 电子账簿查询（电子账簿 ID）
     *
     * @param balanceAcctId
     * @return
     */
    BalanceAcctsVO balanceAcctsQryByAcctId(String balanceAcctId);

/**
     * 电子账簿流水查询
     *
     * @param balanceAcctId
     * @param startAt
     * @param endAt
     * @return
     */
    BalanceTransactionsPageVO balanceTransactions(String balanceAcctId, String startAt, String endAt);

/**
     * 电子账簿-获取充值账号
     *
     * @return 充值账号
     * @author huabiao
     * @create 2022/12/8  15:13
     */
    ChinaumsRechargeAccountVO getWalletRechargeAccount();

/**
     * 消费(转账)
     *
     * @param accountPaymentsDTO
     * @return
     */
    AccountPaymentsVO payments(AccountPaymentsDTO accountPaymentsDTO);

/**
     * 交易结果通知
     *
     * @param tradeResultDTO
     * @return
     */
    boolean tradeResult(TradeResultDTO tradeResultDTO);

/**
     * 消费订单查询（平台订单号）
     *
     * @param outOrderNo
     * @return
     */
    AccountPaymentsVO paymentsByOutOrderNo(String outOrderNo);

/**
     * 提现创建
     *
     * @param withdrawalsDTO
     * @return
     */
    WithdrawalsVO withdrawals(WithdrawalsDTO withdrawalsDTO);

/**
     * 提现订单查询（平台订单号）
     *
     * @param outOrderNo
     * @return
     */
    WithdrawalsVO withdrawalsByOutOrderNo(String outOrderNo);

/**
     * 电子账簿-订单支付
     *
     * @param walletOrderPayDTO:订单支付DTO
     * @return 第三方支付单号
     * @author huabiao
     * @create 2022/12/9  16:01
     */
    String orderPay(WalletOrderPayDTO walletOrderPayDTO);

/**
     * 电子账簿-分账确认
     *
     * @param chinaumsGuaranteePayConfirmsDTO:分账参数
     * @return 分账单号
     * @author huabiao
     * @create 2022/12/16  9:52
     */
    ChinaumsGuaranteePayConfirmsVO paySettlement(ChinaumsGuaranteePayConfirmsDTO chinaumsGuaranteePayConfirmsDTO);

/**
 * 电子账簿-处理银联支付单
 *
 * @param order:订单
 * @author huabiao
 * @create 2022/12/16 16:47
 */
 List<ChinaumsPayment> handleChinaumsPayment(Order order);

/**
     * 转账入金
     *
     * @param externalIncomeDTO
     * @return
     */
    Boolean transferDeposit(ExternalIncomeDTO externalIncomeDTO);

/**
     * 电子账簿-退款
     *
     * @param walletRefundDTO 账簿退款DTO
     * @return 银联退款VO
     * @author huabiao
     * @create 2022/12/20  9:10
     */
    RefundVO refund(WalletRefundDTO walletRefundDTO);

/**
     * 电子账簿-创建分账
     *
     * @param chinaumsAllocationsDTO:分账参数
     * @return
     * @author huabiao
     * @create 2023/2/10  9:50
     */
    ChinaumsAllocationsVO createSubaccount(ChinaumsAllocationsDTO chinaumsAllocationsDTO);

/**
     * POS充值转账
     */
    void posTransfer();

/**
     * 扫码充值转账
     */
    void scanTransfer();

/**
     * 电子账簿-分账退款
     *
     * @param subaccountRefundDTO 分账退款DTO
     * @return SubaccountRefundVO
     * @author huabiao
     * @create 2023/4/26  10:46
     */
    SubaccountRefundVO subaccountRefund(SubaccountRefundDTO subaccountRefundDTO);

/**
     * 电子回单
     *
     * @param tradeId
     * @return
     */
    ElectronicReceiptVO electronicReceipts(String tradeId);

/**
     * 电子账簿-通过惬意创建
     *
     * @param walletCreateByCompanyDTO 电子账簿通过企业创建DTO
     * @author huabiao
     * @create 2023/5/25  19:28
     */
    void createWalletByCompany(WalletCreateByCompanyDTO walletCreateByCompanyDTO);

/**
     * 创建授信还款电子账簿
     */
    void createWalletCreditRefund();

/***
     * 通过支付单号查询银联支付信息
     *
     * @param mctOrderNo 支付单号
     * @return ByxChinaumsGuaranteePayVO
     * @author huabiao
     * @create 2023/10/18  15:45
     */
    ByxChinaumsGuaranteePayVO orderPaymentsByOutOrderNo(String mctOrderNo, String platformWalletId);

/**
     * 担保支付消息推送
     * @param tradeResultDTO
     * @return
     */
    boolean payCallback(TradeResultDTO tradeResultDTO);

/**
     * 担保支付确认结算
     * @param byxChinaumsGuaranteePayConfirmsDTO---byxChinaumsGuaranteePayConfirmsDTO
     * @return String----确认结算单号（也叫分账号）
     */
    String paySettlementConfirms(ByxChinaumsGuaranteePayConfirmsDTO byxChinaumsGuaranteePayConfirmsDTO);
}