diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java index d95e780d..f9c18ee3 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java @@ -1,5 +1,6 @@ package com.dxhy.order.consumer.dao; +import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoTotalAmountVO; import com.dxhy.order.model.OrderProcessInfo; import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountBO; import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountTotalBO; @@ -78,6 +79,8 @@ public interface OrderProcessInfoMapper { */ List queryOrderInfo(@Param("map") Map map, @Param("shList") List shList, @Param("entList") List entList); + OrderInfoTotalAmountVO queryOrderInfoTotalAmount(@Param("map") Map map, @Param("shList") List shList, @Param("entList") List entList); + /** * 通过orderId查询处理表 * diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java index efb5a4cf..857a82ef 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java @@ -10,6 +10,7 @@ import com.dxhy.order.constant.OrderInfoContentEnum; import com.dxhy.order.constant.OrderInfoEnum; import com.dxhy.order.constant.OrderManagementConstant; import com.dxhy.order.consumer.modules.order.model.dto.RewriteBzdhDTO; +import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoTotalAmountVO; import com.dxhy.order.consumer.modules.order.service.OrderBzdhService; import com.dxhy.order.exception.OrderReceiveException; import com.dxhy.order.model.*; @@ -151,8 +152,11 @@ public class OrderInfoController { //查询数据库 PageUtils page = orderInfoService.selectOrderInfo(paramMap, null, entList); + + // 统计金额税额 + OrderInfoTotalAmountVO totalAmountVO = orderInfoService.selectOrderSum(paramMap, null, entList); - return R.ok().put(OrderManagementConstant.DATA, page); + return R.ok().put(OrderManagementConstant.DATA, page).put("total", totalAmountVO); } catch (Exception e) { log.error("{}列表查询异常:{}", LOGGER_MSG, e); return R.error(OrderInfoContentEnum.INTERNAL_SERVER_ERROR); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/vo/OrderInfoTotalAmountVO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/vo/OrderInfoTotalAmountVO.java new file mode 100644 index 00000000..ce5b36cd --- /dev/null +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/vo/OrderInfoTotalAmountVO.java @@ -0,0 +1,29 @@ +package com.dxhy.order.consumer.modules.order.model.vo; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 发票申请单管理 发票处理中心金额、税额、价税合计统计VO + */ +@Data +public class OrderInfoTotalAmountVO { + + /** + * 开票合计金额 + */ + private BigDecimal kphjje; + + /** + * 合计不含税金额 + */ + private BigDecimal hjbhsje; + + /** + * 开票税额 + */ + private BigDecimal kpse; + + +} diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java index 96be588f..3fffd087 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java @@ -3,6 +3,7 @@ package com.dxhy.order.consumer.modules.order.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.dxhy.order.consumer.model.page.PageRequestVO; +import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoTotalAmountVO; import com.dxhy.order.exception.OrderReceiveException; import com.dxhy.order.model.*; import com.dxhy.base.constant.OrderSeparationException; @@ -14,6 +15,7 @@ import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountTotalBO; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestParam; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -35,6 +37,15 @@ public interface OrderInfoService { */ PageUtils selectOrderInfo(Map map, List shList, List entList); + /** + * 查询订单列表金额统计 + * @param map + * @param shList + * @param entList + * @return + */ + OrderInfoTotalAmountVO selectOrderSum(Map map, List shList, List entList); + /** * 根据发票请求流水号 查询订单信息和订单明细 * diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 544dd9c4..2f5ede7e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -33,6 +33,7 @@ import com.dxhy.order.consumer.modules.order.model.PageInvoiceItem; import com.dxhy.order.consumer.modules.order.model.PageKySlReq; import com.dxhy.order.consumer.modules.order.model.PageKySlRsp; import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountTotalBO; +import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoTotalAmountVO; import com.dxhy.order.consumer.modules.order.service.*; import com.dxhy.order.consumer.modules.validate.service.ValidateOrderInfoService; import com.dxhy.order.consumer.openapi.service.CommonInterfaceService; @@ -178,6 +179,11 @@ public class OrderInfoServiceImpl implements OrderInfoService { return orderProcessService.selectOrderInfo(map, shList, entList); } + @Override + public OrderInfoTotalAmountVO selectOrderSum(Map map, List shList, List entList) { + return orderProcessInfoMapper.queryOrderInfoTotalAmount(map, shList, entList); + } + @Override public OderDetailInfo selectOrderDetailByFpqqlsh(String fpqqlsh, List shList) { /** diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index 2c5ff953..a63c124f 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -1317,6 +1317,295 @@ +