提交代码

yy_dev
胡锐 1 year ago
parent a7f89b841c
commit 2689936d54
  1. 3
      open-api/src/main/java/com/api/controller/v1/FundManageController.java
  2. 2
      service/src/main/java/com/hfkj/openapi/v1/model/request/RequestTransferAccountsModel.java
  3. 4
      service/src/main/java/com/hfkj/openapi/v1/service/impl/OpenApiTransferAccountsServiceImpl.java
  4. 7
      service/src/main/java/com/hfkj/openapi/v1/utils/SignatureUtil.java
  5. 4
      service/src/main/java/com/hfkj/sysenum/TransferAccountsCreateType.java

@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.Map; import java.util.Map;
/** /**
@ -83,7 +84,7 @@ public class FundManageController {
transferAccounts.setMerName(mer.getMerName()); transferAccounts.setMerName(mer.getMerName());
transferAccounts.setMerAbbreviate(mer.getMerAbbreviate()); transferAccounts.setMerAbbreviate(mer.getMerAbbreviate());
transferAccounts.setOrderNo(body.getOrderNo()); transferAccounts.setOrderNo(body.getOrderNo());
transferAccounts.setAmount(body.getAmount()); transferAccounts.setAmount(new BigDecimal(body.getAmount()));
transferAccounts.setContent(body.getContent()); transferAccounts.setContent(body.getContent());
// 转账 // 转账
Map<String, Object> returnParam = openApiTransferAccountsService.transfer(transferAccounts); Map<String, Object> returnParam = openApiTransferAccountsService.transfer(transferAccounts);

@ -34,7 +34,7 @@ public class RequestTransferAccountsModel {
@DecimalMax(value = "99999999", message = "转账最大金额99999999元") @DecimalMax(value = "99999999", message = "转账最大金额99999999元")
@DecimalMin(value = "0.01", message = "转账最小金额0.01元") @DecimalMin(value = "0.01", message = "转账最小金额0.01元")
@NotBlank(message = "转账金额必填项") @NotBlank(message = "转账金额必填项")
private BigDecimal amount; private String amount;
/** /**
* 转账金额 * 转账金额

@ -61,7 +61,7 @@ public class OpenApiTransferAccountsServiceImpl implements OpenApiTransferAccoun
transferAccounts.setReceiverPlatformNo(platform.getPlatformNo()); transferAccounts.setReceiverPlatformNo(platform.getPlatformNo());
transferAccountsService.editData(transferAccounts); transferAccountsService.editData(transferAccounts);
/* // 调用渠道转账 // 调用渠道转账
JSONObject orgTransfer = tianQueFundManageService.orgTransfer( JSONObject orgTransfer = tianQueFundManageService.orgTransfer(
transferAccounts.getReceiverPlatformNo(), transferAccounts.getReceiverPlatformNo(),
transferAccounts.getOrderNo(), transferAccounts.getOrderNo(),
@ -72,7 +72,7 @@ public class OpenApiTransferAccountsServiceImpl implements OpenApiTransferAccoun
transferAccounts.setReceiverPlatformNo(orgTransfer.getString("transactionNo")); transferAccounts.setReceiverPlatformNo(orgTransfer.getString("transactionNo"));
transferAccounts.setSettleDate(DateUtil.format(orgTransfer.getString("clrDt"), "yyyyMMdd")); transferAccounts.setSettleDate(DateUtil.format(orgTransfer.getString("clrDt"), "yyyyMMdd"));
transferAccounts.setTransferTime(DateUtil.format(orgTransfer.getString("transactionTime"), "yyyy-MM-dd HH:mm:ss")); transferAccounts.setTransferTime(DateUtil.format(orgTransfer.getString("transactionTime"), "yyyy-MM-dd HH:mm:ss"));
transferAccountsService.editData(transferAccounts);*/ transferAccountsService.editData(transferAccounts);
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("orderNo", transferAccounts.getOrderNo()); map.put("orderNo", transferAccounts.getOrderNo());

@ -84,12 +84,11 @@ public class SignatureUtil {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
String paramStr = "{\n" + String paramStr = "{\n" +
" \"merchantNo\": \"2023053014340172109\",\n" + " \"merchantNo\": \"2023090616352962600\",\n" +
" \"billDateS\": 1693584000000,\n" + " \"orderNo\": \"100001\"" +
" \"billDateE\": 1693584000000,\n" +
"}"; "}";
String sign = createSign(JSONObject.parseObject(paramStr), "uAZAmX9CLJ3VmPhfi4GN8qpFifyfw0cF"); String sign = createSign(JSONObject.parseObject(paramStr), "tglpZHbMLS8URfGeNqn82MGMcVRU9GtO");
System.out.println(sign); System.out.println(sign);
} }

@ -9,8 +9,8 @@ import java.util.Objects;
* @date: 2023/10/23 * @date: 2023/10/23
**/ **/
public enum TransferAccountsCreateType { public enum TransferAccountsCreateType {
type1(0, "系统自动"), type1(1, "系统自动"),
type2(1, "API"), type2(2, "API"),
; ;
private Integer number; private Integer number;

Loading…
Cancel
Save