Merge branch 'hotfix/1.0.18'
diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CommonSendMessageParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CommonSendMessageParam.java
index f63b88f..b0695f1 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CommonSendMessageParam.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CommonSendMessageParam.java
@@ -17,6 +17,10 @@
private String content;
@Sign
private String title;
+ @Sign
+ private String msgtype;
+ @Sign
+ private String url;
@Override
public boolean checkParam() throws RequestParamCheckException {
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/sendmsg_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/sendmsg_api_controller.kt
index 4408895..575a570 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/sendmsg_api_controller.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/sendmsg_api_controller.kt
@@ -31,7 +31,9 @@
* */
@PostMapping("/sendmsg")
fun doSend(@RequestBody param: CommonSendMessageParam): ResponseEntity<Any> {
- kafkaSendMsgService.sendJpushMessage(param.userid,param.title,param.content,"",mutableMapOf(),"")
+ val map = mutableMapOf<String, String>()
+ map["msgtype"] = param.msgtype
+ kafkaSendMsgService.sendJpushMessage(param.userid,param.title,param.content,"",map,"")
return ResponseEntity.ok(ResponseBodyBuilder.create()
.success("发送成功"))
diff --git a/ynrcc-agent/src/main/java/com/supwisdom/agent/api/bean/DlpayReq.java b/ynrcc-agent/src/main/java/com/supwisdom/agent/api/bean/DlpayReq.java
index c1b8ca5..dd5b1fd 100644
--- a/ynrcc-agent/src/main/java/com/supwisdom/agent/api/bean/DlpayReq.java
+++ b/ynrcc-agent/src/main/java/com/supwisdom/agent/api/bean/DlpayReq.java
@@ -174,7 +174,7 @@
.append("<TRANSTIME>").append(transtime).append("</TRANSTIME>")
.append("<SN>").append(sn).append("</SN>")
.append("<STLTRXDATE>").append(stltrxdate).append("</STLTRXDATE>")
- .append("<STLAMT>").append(stlamt/100.00).append("</STLAMT>")
+ .append("<STLAMT>").append(stlamt).append("</STLAMT>")
.append("<JNLCOUNT>").append(jnlcount).append("</JNLCOUNT>")
.append("</root>");
return String.format("%08d", xml.toString().getBytes("GBK").length) + xml.toString();