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

update 占桩订单逻辑

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-18 15:52:52 +08:00
parent f7fc5ea8e2
commit 29a60ec560
5 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java
View File

@@ -99,4 +99,6 @@ public interface OrderPileOccupyMapper {
* @return
*/
OrderPileOccupy getOrderInfoByPile(@Param("pileSn") String pileSn, @Param("connectorCode") String connectorCode);
List<OrderPileOccupy> getDraftOccupyOrder(@Param("pileSn") String pileSn, @Param("connectorCode") String connectorCode);
}

2
jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java
View File

@@ -71,7 +71,7 @@ public interface OrderPileOccupyService{
* @param connectorCode
* @return
*/
OrderPileOccupy getOrderInfoByPile(String pileSn, String connectorCode);
OrderPileOccupy getDraftOccupyOrder(String pileSn, String connectorCode);
/**
* 控制地锁方法

15
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
View File

@@ -26,6 +26,7 @@ import com.jsowell.pile.vo.web.BillingTemplateVO;
import com.jsowell.pile.vo.web.OrderListVO;
import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,6 +35,7 @@ import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Slf4j
@Service
@@ -312,13 +314,22 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
/**
* 根据桩编号、枪口号查询最近一条占桩订单
* draft
* @param pileSn
* @param connectorCode
* @return
*/
@Override
public OrderPileOccupy getOrderInfoByPile(String pileSn, String connectorCode) {
return orderPileOccupyMapper.getOrderInfoByPile(pileSn, connectorCode);
public OrderPileOccupy getDraftOccupyOrder(String pileSn, String connectorCode) {
List<OrderPileOccupy> list = orderPileOccupyMapper.getDraftOccupyOrder(pileSn, connectorCode);
if (CollectionUtils.isEmpty(list)) {
return null;
}
if (list.size() > 1) {
List<Integer> collect = list.stream().map(OrderPileOccupy::getId).collect(Collectors.toList());
log.info("根据pileSn:{}, connectorCode:{}, 查询出多条占桩订单, ids:{}", pileSn, connectorCode, collect);
}
return list.get(0);
}
@Override