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

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

@ -27,7 +27,7 @@ import com.ruoyi.common.utils.StringUtils;
/**
* 通用http发送方法
*
*
* @author ruoyi
*/
public class HttpUtils
@ -85,7 +85,7 @@ public class HttpUtils
{
result.append(line);
}
log.info("recv - {}", result);
log.debug("recv - {}", result);
}
catch (ConnectException e)
{
@ -153,7 +153,7 @@ public class HttpUtils
{
result.append(line);
}
log.info("recv - {}", result);
log.debug("recv - {}", result);
}
catch (ConnectException e)
{
@ -224,7 +224,7 @@ public class HttpUtils
result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8));
}
}
log.info("recv - {}", result);
log.debug("recv - {}", result);
conn.disconnect();
br.close();
}
@ -329,7 +329,7 @@ public class HttpUtils
{
result.append(line);
}
log.info("recv - {}", result);
log.debug("recv - {}", result);
}
catch (ConnectException e)
{
@ -396,7 +396,7 @@ public class HttpUtils
{
result.append(line);
}
log.info("recv - {}", result);
log.debug("recv - {}", result);
}
catch (ConnectException e)
{
@ -430,4 +430,4 @@ public class HttpUtils
}
return result.toString();
}
}
}

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

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

@ -11,7 +11,7 @@
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
<!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-info.log</file>
@ -19,8 +19,8 @@
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
<!-- 日志最大的历史 7天 -->
<maxHistory>7</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
@ -34,7 +34,7 @@
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-error.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
@ -56,7 +56,7 @@
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 用户访问日志输出 -->
<appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-user.log</file>
@ -64,13 +64,13 @@
<!-- 按天回滚 daily -->
<fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
<maxHistory>30</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info" />
<!-- Spring日志级别控制 -->
@ -79,15 +79,15 @@
<root level="info">
<appender-ref ref="console" />
</root>
<!--系统操作日志-->
<root level="info">
<appender-ref ref="file_info" />
<appender-ref ref="file_error" />
</root>
<!--系统用户操作日志-->
<logger name="sys-user" level="info">
<appender-ref ref="sys-user"/>
</logger>
</configuration>
</configuration>