| Pass |
- 22:32:27 |
+ 0:19:02 |
Test passed
|
@@ -128,13 +128,13 @@
Started
-
十月 15, 2024 22:32:27
+
ʮ 16, 2024 00:19:02
Ended
-
十月 15, 2024 22:32:27
+
ʮ 16, 2024 00:19:02
diff --git a/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java b/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java
index e4c9b80b..c3deb130 100644
--- a/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java
+++ b/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java
@@ -378,6 +378,8 @@ public class SecurityUtil {
public LogiticsCompany getCurrCompany() {
final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+ boolean authenticated = authentication.isAuthenticated();
+ String name = authentication.getName();
if (authentication == null || !authentication.isAuthenticated() || authentication.getName() == null
|| authentication instanceof AnonymousAuthenticationToken) {
throw new HiverException("未检测到登录用户");
diff --git a/hiver-core/src/main/java/cc/hiver/core/common/vo/TokenCompany.java b/hiver-core/src/main/java/cc/hiver/core/common/vo/TokenCompany.java
index 5e14b43d..d06ba50e 100644
--- a/hiver-core/src/main/java/cc/hiver/core/common/vo/TokenCompany.java
+++ b/hiver-core/src/main/java/cc/hiver/core/common/vo/TokenCompany.java
@@ -47,11 +47,6 @@ public class TokenCompany implements UserDetails, Serializable {
return null;
}
- @Override
- public String getUsername() {
- return null;
- }
-
@Override
public boolean isAccountNonExpired() {
return true;
diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/service/impl/LogisticsEntruckingLogServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/service/impl/LogisticsEntruckingLogServiceImpl.java
index 05552a34..92feb0e9 100644
--- a/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/service/impl/LogisticsEntruckingLogServiceImpl.java
+++ b/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/service/impl/LogisticsEntruckingLogServiceImpl.java
@@ -11,6 +11,7 @@ import cc.hiver.core.utils.DateUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -54,6 +55,9 @@ public class LogisticsEntruckingLogServiceImpl extends ServiceImpl getDateLogisticsEntruckingLogPageList(LogisticsEntruckingLogQueryVo logisticsEntruckingLogQueryVo) {
+ if(StringUtils.isNotEmpty(logisticsEntruckingLogQueryVo.getEndDate())){
+ logisticsEntruckingLogQueryVo.setEndDate(DateUtil.addDay(logisticsEntruckingLogQueryVo.getEndDate(), 1));
+ }
final Page page = new Page<>(logisticsEntruckingLogQueryVo.getPageNum(), logisticsEntruckingLogQueryVo.getPageSize());
// 获取日期
final IPage dateLogisticsEntruckingLogPageList = logisticsEntruckingLogMapper.getDateLogisticsEntruckingLogPageList(page, logisticsEntruckingLogQueryVo);
diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/controller/LogisticsOrderController.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/controller/LogisticsOrderController.java
index 948ca77d..720a9641 100644
--- a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/controller/LogisticsOrderController.java
+++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/controller/LogisticsOrderController.java
@@ -111,11 +111,11 @@ public class LogisticsOrderController {
//如果更新成功，把修改记录保存一下
Gson gson = new Gson();
LogisticsOrderChangeLog logisticsOrderChangeLog = new LogisticsOrderChangeLog();
+ logisticsOrderChangeLog.setCreateBy(logiticsCompany.getId());
+ logisticsOrderChangeLog.setCreateByName(logiticsCompany.getContacts());
logisticsOrderChangeLog.setOldData(gson.toJson(oldLogisticsOrder));
logisticsOrderChangeLog.setNewData(gson.toJson(logisticsOrder));
logisticsOrderChangeLog.setOrderId(logisticsOrder.getId());
- logisticsOrderChangeLog.setCreateBy(logisticsOrder.getCreateBy());
- logisticsOrderChangeLog.setCreateByName(logisticsOrder.getCreateByName());
logisticsOrderChangeLog.setCreateTime(new Date());
int status = logisticsOrderService.saveLogisticsOrderChangeLog(logisticsOrderChangeLog);
if(status == 0){
diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java
index 0ee8746f..3d996975 100644
--- a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java
+++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java
@@ -130,7 +130,7 @@ public class LogisticsOrder{
@ApiModelProperty(value = "到达站名称")
private String arrivalStationName;
- @CompareField(name = "货物类型")
+ @CompareField(name = "重量")
@ApiModelProperty(value = "重量")
private BigDecimal weight;
@@ -138,7 +138,7 @@ public class LogisticsOrder{
@ApiModelProperty(value = "件数")
private Integer count;
- @CompareField(name = "体积")
+ @CompareField(name = "落地费")
@ApiModelProperty(value = "运费")
private BigDecimal freight;