移除过时方法,工具类迁移

This commit is contained in:
egan
2021-08-01 23:33:02 +08:00
parent d40efb21c5
commit 4d1ad05fa8
19 changed files with 113 additions and 188 deletions

View File

@@ -460,11 +460,11 @@ public class PayController {
* @param order 订单的请求体
* @return 返回支付方下载对账单的结果
*/
@RequestMapping("downloadbill")
public Object downloadbill(QueryOrder order) {
@RequestMapping("downloadBill")
public Object downloadBill(QueryOrder order) {
PayResponse payResponse = service.getPayResponse(order.getPayId());
return payResponse.getService().downloadbill(order.getBillDate(), order.getBillType());
return payResponse.getService().downloadBill(order.getBillDate(), order.getBillType());
}

View File

@@ -8,6 +8,7 @@ import com.egzosn.pay.common.bean.MethodType;
import com.egzosn.pay.common.bean.PayOrder;
import com.egzosn.pay.common.bean.RefundOrder;
import com.egzosn.pay.common.http.HttpConfigStorage;
import com.egzosn.pay.common.util.sign.SignTextUtils;
import com.egzosn.pay.common.util.sign.SignUtils;
import com.egzosn.pay.demo.request.QueryOrder;
import com.egzosn.pay.union.api.UnionPayConfigStorage;
@@ -130,7 +131,7 @@ public class UnionPayController {
public Map<String, Object> app() {
Map<String, Object> data = new HashMap<>();
data.put("code", 0);
PayOrder order = new PayOrder("订单title", "摘要", BigDecimal.valueOf(0.01), SignUtils.randomStr());
PayOrder order = new PayOrder("订单title", "摘要", BigDecimal.valueOf(0.01), SignTextUtils.randomStr());
//App支付
order.setTransactionType(UnionTransactionType.APP);
@@ -178,7 +179,7 @@ public class UnionPayController {
public Map<String, Object> microPay(BigDecimal price, String authCode) {
//获取对应的支付账户操作工具可根据账户id
//条码付
PayOrder order = new PayOrder("egan order", "egan order", null == price ? BigDecimal.valueOf(0.01) : price, SignUtils.randomStr(), UnionTransactionType.CONSUME);
PayOrder order = new PayOrder("egan order", "egan order", null == price ? BigDecimal.valueOf(0.01) : price, SignTextUtils.randomStr(), UnionTransactionType.CONSUME);
//设置授权码,条码等
order.setAuthCode(authCode);
//支付结果
@@ -275,9 +276,9 @@ public class UnionPayController {
* @param order 订单的请求体
* @return 返回支付方下载对账单的结果
*/
@RequestMapping("downloadbill")
public Object downloadbill(QueryOrder order) {
return service.downloadbill(order.getBillDate(), order.getBillType());
@RequestMapping("downloadBill")
public Object downloadBill(QueryOrder order) {
return service.downloadBill(order.getBillDate(), order.getBillType());
}

View File

@@ -47,7 +47,7 @@ public class ApyAccountRepository {
ApyAccount apyAccount2 = new ApyAccount();
apyAccount2.setPayId(2);
apyAccount2.setPartner("1469188802");
apyAccount2.setAppId("wx3344f4aed352deae");
apyAccount2.setAppId("wx3344f4aed352de09");
// TODO 2017/2/9 16:20 author: egan sign_type只有单一key时public_key与private_key相等比如sign_type=MD5的情况
apyAccount2.setPublicKey("991ded080***************f7fc61095");
apyAccount2.setPrivateKey("991ded080***************f7fc61095");