autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 02:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-12-21 15:28:42 +08:00
parent 668f6778f5
commit cae36cab43
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -726,11 +726,11 @@ public class SpringBootTestController {
*/
@Test
public void test() {
String paymentId = "002212023102621451610563612286923030528";
String paymentId = "002212023111222070910569778388115099648";
AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount();
adapayMemberAccount.setAdapayMemberId("0");
BigDecimal deductionAmount = new BigDecimal("23.78");
String orderCode = "C23610900688";
adapayMemberAccount.setAdapayMemberId("ACM25743626");
BigDecimal deductionAmount = new BigDecimal("14.28");
String orderCode = "C27669197498";
// 延时分账，使用确认交易API
PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(paymentId,
adapayMemberAccount, deductionAmount, orderCode, wechatAppId1);
@@ -746,7 +746,7 @@ public class SpringBootTestController {
// TODO 获取默认结算账户，如需分给对应商户就填写正确的汇付会员id
// AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.getDefault();
AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount();
adapayMemberAccount.setAdapayMemberId("ACM69460507");
adapayMemberAccount.setAdapayMemberId("ACM25743626");
for (int i = 0; i < paymentList.size(); i++) {
JSONObject jsonObject = (JSONObject) paymentList.get(i);
BigDecimal confirmAmt = jsonObject.getBigDecimal("settleAmount"); // 确认金额就是结算金额
@@ -763,8 +763,7 @@ public class SpringBootTestController {
// 需要重新分账的订单信息（针对未分账的订单）
public JSONArray getPaymentList() {
String jsonArrayString = "[" +
"{\"orderCode\":\"C42071068210\", \"settleAmount\":\"1.85\", \"paymentId\":\"002212023102519093110563210700862242816\"}" +
"{\"orderCode\":\"C48910624476\", \"settleAmount\":\"64.39\", \"paymentId\":\"002212023102523125710563271965594312704\"}" +
"{\"orderCode\":\"C27669197498\", \"settleAmount\":\"14.28\", \"paymentId\":\"002212023111222070910569778388115099648\"}" +
"]";
return JSONArray.parseArray(jsonArrayString);
}

2
jsowell-netty/src/main/java/com/jsowell/netty/server/mqtt/MqttSever.java
View File

@@ -26,7 +26,7 @@ public class MqttSever implements CommandLineRunner {
@Override
public void run(String... args) throws Exception {
InetSocketAddress address = new InetSocketAddress(Constants.SOCKET_IP, 1883);
this.start(address);
// this.start(address);
}
public void start(InetSocketAddress address) {