diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java index c1c3f549b..06d6361d1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java @@ -11,10 +11,7 @@ import com.jsowell.pile.vo.nanrui.NROrderInfoVO; import com.jsowell.pile.vo.uniapp.OrderVO; import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO; import com.jsowell.pile.vo.uniapp.SendMessageVO; -import com.jsowell.pile.vo.web.IndexOrderInfoVO; -import com.jsowell.pile.vo.web.OrderListVO; -import com.jsowell.pile.vo.web.OrderPayDetailVO; -import com.jsowell.pile.vo.web.RefundOrder; +import com.jsowell.pile.vo.web.*; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -266,4 +263,6 @@ public interface OrderBasicInfoMapper { * @return */ List getOrderInfoByNXJT(NXJTQueryOrdersInfoDTO dto); + + OrderTotalDataVO getOrderTotalData(QueryOrderDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 63f273416..7886a7d2b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -373,13 +373,13 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { * @param dto * @return */ - @Override // @DataScope(deptAlias = "t3") - public OrderTotalDataVO getOrderTotalData(QueryOrderDTO dto) { + public OrderTotalDataVO getOrderTotalDataOld(QueryOrderDTO dto) { OrderTotalDataVO vo = new OrderTotalDataVO(); // 只计算订单完成状态的 dto.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue()); // 查询出所有符合条件的订单 + OrderTotalDataVO resultVO = orderBasicInfoMapper.getOrderTotalData(dto); List list = selectOrderBasicInfoList(dto); BigDecimal sumOrderAmount = BigDecimal.ZERO; BigDecimal sumUsedElectricity = BigDecimal.ZERO; @@ -410,6 +410,14 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { return vo; } + @Override + public OrderTotalDataVO getOrderTotalData(QueryOrderDTO dto) { + // 只计算订单完成状态的 + dto.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue()); + OrderTotalDataVO resultVO = orderBasicInfoMapper.getOrderTotalData(dto); + return resultVO; + } + /** * 查询时间段内订单总金额和总用电量V2 * diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 0b7bc7fb9..710047832 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -254,6 +254,64 @@ order by t1.create_time desc + + + + \ No newline at end of file