chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug:归零时，修改订单状态失败

Browse Source
This commit is contained in:
墨大叔 2024-09-18 09:54:44 +08:00
parent 156e36c26d
commit 0aa9ea1a61
4 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
View File

@ -85,7 +85,7 @@ public class HttpUtils
{ {
result.append(line); result.append(line);
} }
log.info("recv - {}", result); log.debug("recv - {}", result);
} }
catch (ConnectException e) catch (ConnectException e)
{ {
@ -153,7 +153,7 @@ public class HttpUtils
{ {
result.append(line); result.append(line);
} }
log.info("recv - {}", result); log.debug("recv - {}", result);
} }
catch (ConnectException e) catch (ConnectException e)
{ {
@ -224,7 +224,7 @@ public class HttpUtils
result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8)); result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8));
} }
} }
log.info("recv - {}", result); log.debug("recv - {}", result);
conn.disconnect(); conn.disconnect();
br.close(); br.close();
} }
@ -329,7 +329,7 @@ public class HttpUtils
{ {
result.append(line); result.append(line);
} }
log.info("recv - {}", result); log.debug("recv - {}", result);
} }
catch (ConnectException e) catch (ConnectException e)
{ {
@ -396,7 +396,7 @@ public class HttpUtils
{ {
result.append(line); result.append(line);
} }
log.info("recv - {}", result); log.debug("recv - {}", result);
} }
catch (ConnectException e) catch (ConnectException e)
{ {

22
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
View File

@ -975,11 +975,12 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
TransactionBillQuery query = new TransactionBillQuery(); TransactionBillQuery query = new TransactionBillQuery();
query.setBillId(order.getBillId()); query.setBillId(order.getBillId());
query.setStatus(TransactionBillStatus.SUCCESS.getStatus()); query.setStatus(TransactionBillStatus.SUCCESS.getStatus());
if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) { query.setIsFinished(false);
query.setStartSuitEndTime(endTime); // 计时的话，需要结束时间在这之后的订单 // if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) {
} else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) { // query.setStartSuitEndTime(endTime); // 计时的话，需要结束时间在这之后的订单
query.setStartSuitEndEle(totalEle); // 计量的话，需要结束电量比这个大的订单 // } else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) {
} // query.setStartSuitEndEle(totalEle); // 计量的话，需要结束电量比这个大的订单
// }
int update = this.updateByQuery(data, query); int update = this.updateByQuery(data, query);
ServiceUtil.assertion(update != 1, "修改订单信息失败，请重试：" + order.getBillNo()); ServiceUtil.assertion(update != 1, "修改订单信息失败，请重试：" + order.getBillNo());
@ -1071,11 +1072,12 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
TransactionBillQuery query = new TransactionBillQuery(); TransactionBillQuery query = new TransactionBillQuery();
query.setBillId(order.getBillId()); query.setBillId(order.getBillId());
query.setStatus(TransactionBillStatus.SUCCESS.getStatus()); query.setStatus(TransactionBillStatus.SUCCESS.getStatus());
if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) { query.setIsFinished(false);
query.setStartSuitEndTime(endTime); // 计时的话，需要结束时间在这之后的订单 // if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) {
} else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) { // query.setStartSuitEndTime(endTime); // 计时的话，需要结束时间在这之后的订单
query.setStartSuitEndEle(totalEle); // 计量的话，需要结束电量比这个大的订单 // } else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) {
} // query.setStartSuitEndEle(totalEle); // 计量的话，需要结束电量比这个大的订单
// }
int update = this.updateByQuery(data, query); int update = this.updateByQuery(data, query);
ServiceUtil.assertion(update != 1, "修改订单信息失败，请重试：" + order.getBillNo()); ServiceUtil.assertion(update != 1, "修改订单信息失败，请重试：" + order.getBillNo());

3
smart-switch-web/src/main/resources/application-dev.yml
View File

@ -26,7 +26,8 @@ wx:
# 转账回调地址 # 转账回调地址
transferNotifyUrl: https://kg-dev.chuangtewl.com/dev-api/app/pay/notify/wx/transfer transferNotifyUrl: https://kg-dev.chuangtewl.com/dev-api/app/pay/notify/wx/transfer
# 密钥所在位置 # 密钥所在位置
privateKeyPath: H:/project/创特/证书/wxpay-kg/apiclient_key.pem # privateKeyPath: H:/project/创特/证书/wxpay-kg/apiclient_key.pem
privateKeyPath: D:/project/证书/wxpay-kg/apiclient_key.pem
# 证书序列号 # 证书序列号
merchantSerialNumber: 6AD69237C0F22A9AE51A64F1927E3A0962AC1FB0 merchantSerialNumber: 6AD69237C0F22A9AE51A64F1927E3A0962AC1FB0

6
smart-switch-web/src/main/resources/logback.xml
View File

@ -19,8 +19,8 @@
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 --> <!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern> <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 --> <!-- 日志最大的历史 7天 -->
<maxHistory>60</maxHistory> <maxHistory>7</maxHistory>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${log.pattern}</pattern>
@ -64,7 +64,7 @@
<!-- 按天回滚 daily --> <!-- 按天回滚 daily -->
<fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern> <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 --> <!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory> <maxHistory>30</maxHistory>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${log.pattern}</pattern>