提交 dc313d57 authored 作者: liuhaiquan's avatar liuhaiquan

Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'…

Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into v10.7_borrowing_and_repayment_20240118
......@@ -59,5 +59,8 @@ public class CarrierTransferPaymentDetailVO {
@ApiModelProperty("付款最后时间")
public String finalPaymentTime;
@ApiModelProperty("借款单号")
private Long loanNo;
}
......@@ -69,5 +69,7 @@ public class OwnerTransferPaymentDetailVO {
@ApiModelProperty("付款最后时间")
public String finalPaymentTime;
@ApiModelProperty("还款单号")
private Long repaymentNo;
}
......@@ -132,5 +132,14 @@ public class CarrierOwnerLoanRecordController {
return Result.ok(token);
}
@ApiOperation(value = "订单支付短信", notes = "<br>By:姜文业")
@GetMapping("/sendOrderPaySms")
public Result<String> sendOrderPaySms(@RequestParam("mobile") @NotBlank(message = "通知的手机号码不能为空") String mobile,
@Param("payee") @NotBlank(message = "收款方不能为空") String payee,
@Param("payeeAccount") @NotBlank(message = "收款账户不能为空") String payeeAccount) {
String token = ownerLoanRecordService.sendOrderPaySms(mobile,payee,payeeAccount);
return Result.ok(token);
}
}
......@@ -87,6 +87,15 @@ public class OwnerRepaymentController {
return Result.ok(token);
}
@ApiOperation(value = "订单支付短信", notes = "<br>By:姜文业")
@GetMapping("/sendOrderPaySms")
public Result<String> sendOrderPaySms(@RequestParam("mobile") @NotBlank(message = "通知的手机号码不能为空") String mobile,
@Param("payee") @NotBlank(message = "收款方不能为空") String payee,
@Param("payeeAccount") @NotBlank(message = "收款账户不能为空") String payeeAccount) {
String token = ownerRepaymentService.sendOrderPaySms(mobile,payee,payeeAccount);
return Result.ok(token);
}
}
......@@ -395,7 +395,8 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
.payeeAccount(payeeMap.getAccount()).payeeBank(payeeMap.getBank()).payeeBankNo(payeeMap.getBankNo())
.loanBalance(ownerLoanRecord.getLoanBalance())
.remittanceIdentificationCode(ownerLoanRecord.getRemittanceIdentificationCode())
.status(ownerLoanRecord.getStatus()).finalPaymentTime(ownerLoanRecord.getCloseOrderTime()).build();
.status(ownerLoanRecord.getStatus()).finalPaymentTime(ownerLoanRecord.getCloseOrderTime())
.loanNo(ownerLoanRecord.getLoanNo()).build();
}
@Override
......@@ -714,5 +715,22 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
return UUID.randomUUID().toString();
}
@Override
public String sendOrderPaySms(String mobile,String payee, String payeeAccount) {
AliSmsMessageReq req = new AliSmsMessageReq();
req.setTemplateCode(messageConfig.getOrderPayTemplateCode());
JSONObject jsonObject = new JSONObject();
jsonObject.set("companyName", payee);
jsonObject.set("bankAccount", payeeAccount);
jsonObject.set("bankName", "");
req.setChannelId(messageConfig.getChannelId());
req.setAppId(messageConfig.getAppId().toString());
req.setMobile(mobile);
req.setContent(jsonObject.toString());
req.setExpire(300L);
clxMessageOpenapiFeign.sendAliSms(req);
return UUID.randomUUID().toString();
}
}
......@@ -142,7 +142,8 @@ public class OwnerRepaymentServiceImpl implements OwnerRepaymentService {
.payeeAccount(payeeMap.getAccount()).payeeBank(payeeMap.getBank()).payeeBankNo(payeeMap.getBankNo())
.repaymentBalance(ownerRepayment.getRepaymentBalance())
.remittanceIdentificationCode(ownerRepayment.getRemittanceIdentificationCode())
.status(ownerRepayment.getStatus()).finalPaymentTime(ownerRepayment.getCloseOrderTime()).build();
.status(ownerRepayment.getStatus()).finalPaymentTime(ownerRepayment.getCloseOrderTime())
.repaymentNo(ownerRepayment.getRepaymentNo()).build();
}
@Override
......@@ -170,7 +171,6 @@ public class OwnerRepaymentServiceImpl implements OwnerRepaymentService {
AliSmsMessageReq req = new AliSmsMessageReq();
req.setTemplateCode(messageConfig.getRepaymentTemplateCode());
JSONObject jsonObject = new JSONObject();
//随机生成4位数字
jsonObject.set("repaymentNo", repaymentNo);
req.setChannelId(messageConfig.getChannelId());
req.setAppId(messageConfig.getAppId().toString());
......@@ -181,4 +181,23 @@ public class OwnerRepaymentServiceImpl implements OwnerRepaymentService {
return UUID.randomUUID().toString();
}
@Override
public String sendOrderPaySms(String mobile,String payee, String payeeAccount) {
AliSmsMessageReq req = new AliSmsMessageReq();
req.setTemplateCode(messageConfig.getOrderPayTemplateCode());
JSONObject jsonObject = new JSONObject();
jsonObject.set("companyName", payee);
jsonObject.set("bankAccount", payeeAccount);
jsonObject.set("bankName", "");
req.setChannelId(messageConfig.getChannelId());
req.setAppId(messageConfig.getAppId().toString());
req.setMobile(mobile);
req.setContent(jsonObject.toString());
req.setExpire(300L);
clxMessageOpenapiFeign.sendAliSms(req);
return UUID.randomUUID().toString();
}
}
......@@ -51,4 +51,6 @@ public interface OwnerLoanRecordService {
void ownerLoanRecordCancelPay(String loanNo);
String sendLoanSms(String mobile,Long loanNo);
String sendOrderPaySms(String mobile,String payee, String payeeAccount);
}
......@@ -31,4 +31,5 @@ public interface OwnerRepaymentService {
String savePaymentApplicationForm(ExportPaymentApplicationFormParam param);
String sendPaymentSms(String mobile,Long repaymentNo);
String sendOrderPaySms(String mobile,String payee, String payeeAccount);
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论