|
|
@@ -1,6 +1,7 @@
|
|
|
package modules.deposit;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
+import com.jfinal.kit.StrKit;
|
|
|
import com.jfinal.plugin.activerecord.Db;
|
|
|
import common.model.Deposit;
|
|
|
import common.model.User;
|
|
|
@@ -55,7 +56,7 @@ public class DepositService {
|
|
|
amount.longValue(), // 交易金额(分)
|
|
|
tlOrderNo, // 商户订单号
|
|
|
"购买大连特别火商品", // 订单标题
|
|
|
- (amount / 100.0) + "元", // 订单备注
|
|
|
+ (amount / 100.0) + "元", // 订单备注
|
|
|
notifyUrl, // 异步通知地址
|
|
|
returnUrl, // 同步跳转地址
|
|
|
"UTF-8", // 字符编码
|
|
|
@@ -88,9 +89,14 @@ public class DepositService {
|
|
|
if (shortageAmount != null) resultData.put("shortage_amount", shortageAmount);
|
|
|
if (currentBalance != null) resultData.put("current_balance", currentBalance);
|
|
|
if (requiredAmount != null) resultData.put("required_amount", requiredAmount);
|
|
|
- if (message != null) resultData.put("message", message);
|
|
|
|
|
|
- return MyRet.ok("通联支付订单创建成功").setData(resultData);
|
|
|
+ if (StrKit.notBlank(message)) {
|
|
|
+ resultData.put("message", "通联支付订单创建成功");
|
|
|
+
|
|
|
+ return MyRet.ok(message).setData(resultData);
|
|
|
+ } else {
|
|
|
+ return MyRet.ok("通联支付订单创建成功").setData(resultData);
|
|
|
+ }
|
|
|
} else {
|
|
|
return MyRet.fail("通联支付订单创建失败:充值记录入库失败");
|
|
|
}
|