From 5931c9b2dd51130b3d73032b79ce15c99033c724 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Wed, 22 Mar 2023 18:30:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=93=E7=AE=97=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=81=94=E8=B0=83=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/controller/UserController.java | 2 +- .../dxhy/order/model/page/OrderListQuery.java | 8 ++++++ .../dxhy/order/utils/PageBeanConvertUtil.java | 13 +++++++++- .../order/consumer/model/OderDetailInfo.java | 5 ++++ .../service/impl/InvoiceServiceImpl.java | 2 +- .../order/controller/OrderInfoController.java | 12 +++++++++ .../modules/order/model/bo/OriginOrderBO.java | 2 ++ .../order/service/OrderInfoService.java | 2 ++ .../GenerateReadyOpenOrderServiceImpl.java | 3 +++ .../impl/OrderExcelReadServiceImpl.java | 1 + .../service/impl/OrderInfoServiceImpl.java | 15 +++++++++++ .../resources/download/NcpImportExcel.xlsx | Bin 11944 -> 11933 bytes .../mapper/OrderOriginExtendInfoMapper.xml | 24 +++++++++++++++++- .../mybatis/mapper/OrderProcessInfoMapper.xml | 6 +++++ 14 files changed, 91 insertions(+), 4 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java index f947ce62..1df0bbd6 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java @@ -58,7 +58,7 @@ public class UserController { public R getUserDetails() { UserInfoQuery userInfoQuery = new UserInfoQuery(); userInfoQuery.setBusinessDataType(OrderInfoEnum.ORDER_USER_INFO_BUSINESS_DATA_TYPE_2.getKey()); - userInfoQuery.setIsFilter(OrderInfoEnum.ORDER_USER_INFO_IS_FILTER_1.getKey()); + userInfoQuery.setIsFilter(OrderInfoEnum.ORDER_USER_INFO_IS_FILTER_2.getKey()); R r = userInfoService.getUserInfo(userInfoQuery); diff --git a/order-management-common/src/main/java/com/dxhy/order/model/page/OrderListQuery.java b/order-management-common/src/main/java/com/dxhy/order/model/page/OrderListQuery.java index c8dda079..c26948b8 100644 --- a/order-management-common/src/main/java/com/dxhy/order/model/page/OrderListQuery.java +++ b/order-management-common/src/main/java/com/dxhy/order/model/page/OrderListQuery.java @@ -267,6 +267,14 @@ public class OrderListQuery { * 凭证过账日期 */ private Date pzgzrq; + /** + * 凭证过账日期起 + */ + private String pzgzrqBegin; + /** + * 凭证过账日期止 + */ + private String pzgzrqEnd; /** * 是否预制发票 */ diff --git a/order-management-common/src/main/java/com/dxhy/order/utils/PageBeanConvertUtil.java b/order-management-common/src/main/java/com/dxhy/order/utils/PageBeanConvertUtil.java index 08f55cd5..5c387e47 100644 --- a/order-management-common/src/main/java/com/dxhy/order/utils/PageBeanConvertUtil.java +++ b/order-management-common/src/main/java/com/dxhy/order/utils/PageBeanConvertUtil.java @@ -198,7 +198,18 @@ public class PageBeanConvertUtil { resultMap.put("originDdh", orderListQuery.getOriginDdh()); resultMap.put("originOrderId", orderListQuery.getOriginOrderId()); resultMap.put("kb", orderListQuery.getKb()); - + if (StringUtils.isNotBlank(orderListQuery.getPzgzrqBegin())) { + Date parse = DateUtil.parse(orderListQuery.getPzgzrqBegin(), "yyyy-MM-dd"); + parse = DateUtil.beginOfDay(parse); + String startTime = DateUtil.format(parse, "yyyy-MM-dd"); + resultMap.put("pzgzrqBegin", startTime); + } + if (StringUtils.isNotBlank(orderListQuery.getPzgzrqEnd())) { + Date parse = DateUtil.parse(orderListQuery.getPzgzrqEnd(), "yyyy-MM-dd"); + parse = DateUtil.endOfDay(parse); + String endTime = DateUtil.format(parse, "yyyy-MM-dd"); + resultMap.put("pzgzrqEnd", endTime); + } return resultMap; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java index 42ff4c03..dec25734 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java @@ -233,5 +233,10 @@ public class OderDetailInfo { private List pageOrderExts; + /** + * 报账单号 + */ + private String bzdh; + } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index 16fd1c3b..b4e4eac4 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -149,7 +149,7 @@ public class InvoiceServiceImpl implements InvoiceService { }); } }); - return R.ok("生成预制发票成功,请到开票处理页面查看"); + return R.ok("生成预制发票成功,请到发票处理页面查看"); } @Override 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 896271f5..0629a2e5 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 @@ -262,6 +262,18 @@ public class OrderInfoController { return R.error(ConfigureConstant.STRING_9999, "订单编辑异常"); } } + + /** + * @Description: 填写冲红信息 + * @Param: [param] + * @Return: com.dxhy.order.model.R + * @Author: liufeilong + * @Date: 2023-03-16 + */ + @PostMapping("/fillRedMessage") + public R fillRedMessage(@RequestBody Map param){ + return orderInfoService.fillRedMessage(param); + } /** * 订单详情 diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/bo/OriginOrderBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/bo/OriginOrderBO.java index ac897924..30cebfa1 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/bo/OriginOrderBO.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/bo/OriginOrderBO.java @@ -25,5 +25,7 @@ public class OriginOrderBO { private Integer isdel; private String originOrderId; private String bzdh; + private String kb; + private String pzgzrq; } 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 1463f7d9..8fa86114 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 @@ -194,4 +194,6 @@ public interface OrderInfoService { * @return */ List queryAvailableSlList(PageKySlReq pageKySlReq) throws OrderReceiveException; + + R fillRedMessage(Map param); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java index 24428cac..50fe6558 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java @@ -623,6 +623,9 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder orderProcessInfo.setNum(commonOrderInfo.getNum()); orderProcessInfo.setDdly(commonOrderInfo.getProcessInfo().getDdly()); orderProcessInfo.setDdzt(commonOrderInfo.getProcessInfo().getDdzt()); + orderProcessInfo.setBzdh(commonOrderInfo.getProcessInfo().getBzdh()); + orderProcessInfo.setYzfp(commonOrderInfo.getProcessInfo().getYzfp()); + orderProcessInfo.setKb(orderItemInfos.get(0).getKb()); //原始订单到最终订单的关系 diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java index 35a19485..aea57c26 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java @@ -1903,6 +1903,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { processInfo.setDdly(OrderInfoEnum.ORDER_SOURCE_0.getKey()); processInfo.setDdzt(OrderInfoEnum.ORDER_STATUS_0.getKey()); processInfo.setBzdh(newOrderExcel.getBzdh()); + processInfo.setYzfp(ConfigureConstant.STRING_0); orderExcel2CommonOrderInfo.setProcessInfo(processInfo); orderExcel2CommonOrderInfo.getOrderInfo().setDdlx(OrderInfoEnum.ORDER_SOURCE_0.getKey()); orderExcel2CommonOrderInfo.setNum(i); 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 24d85111..d5fb6d80 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 @@ -392,6 +392,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { oderDetailInfo.setEditStatus(orderProcessInfo.getEditStatus()); oderDetailInfo.setCheckStatus(orderProcessInfo.getCheckStatus()); oderDetailInfo.setCheckTime(DateUtil.format(orderProcessInfo.getCheckTime(), "yyyy-MM-dd HH:mm:ss")); + oderDetailInfo.setBzdh(orderProcessInfo.getBzdh()); return oderDetailInfo; } @@ -1557,6 +1558,20 @@ public class OrderInfoServiceImpl implements OrderInfoService { return pageKySlRspList; } + @Override + public R fillRedMessage(Map param) { + String orderInfoId = param.get("orderInfoId"); + String yfpDm = param.get("yfpDm"); + String yfpHm = param.get("yfpHm"); + String hzxxbbh = param.get("hzxxbbh"); + OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderInfoId, null); + orderInfo.setYfpDm(yfpDm); + orderInfo.setYfpHm(yfpHm); + orderInfo.setHzxxbbh(hzxxbbh); + orderInfoService.updateOrderInfoByOrderId(orderInfo,null); + return R.ok(); + } + private PageKySlRsp getDefaultKySlList(OrderInfoEnum orderInfoEnum){ PageKySlRsp pageKySlRsp = new PageKySlRsp(); pageKySlRsp.setSl(orderInfoEnum.getKey()); diff --git a/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx b/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx index 299925ca5c86ce5fdc2dbe6a3dcc805652c95c73..32707f0358083f6f4a2c7e48f90da0cadda9707a 100644 GIT binary patch delta 4602 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 delta 4621 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 DO0=^4 diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderOriginExtendInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderOriginExtendInfoMapper.xml index 6c0ea990..e5cafad1 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderOriginExtendInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderOriginExtendInfoMapper.xml @@ -26,6 +26,8 @@ + + @@ -179,7 +181,9 @@ op.ghf_mc, op.id, op.num, - op.bzdh + op.bzdh, + op.kb, + op.pzgzrq FROM order_orgin_extend_info ooe LEFT JOIN order_process_info op ON ooe.origin_order_id = op.order_info_id @@ -292,6 +296,15 @@ and op.bzdh = #{map.bzdh,jdbcType=VARCHAR} + + and op.kb = #{map.kb,jdbcType=VARCHAR} + + + and op.pzgzrq >= #{map.pzgzrqBegin} + + + and #{map.pzgzrqEnd} >= op.pzgzrq + and op.xhf_nsrsbh = '' @@ -365,6 +378,15 @@ and op.bzdh = #{map.bzdh,jdbcType=VARCHAR} + + and op.kb = #{map.kb,jdbcType=VARCHAR} + + + and op.pzgzrq >= #{map.pzgzrqBegin} + + + and #{map.pzgzrqEnd} >= op.pzgzrq + and op.xhf_nsrsbh = '' 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 719b806d..907aebda 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -608,6 +608,12 @@ and op.kb = #{map.kb,jdbcType=VARCHAR} + + and op.pzgzrq >= #{map.pzgzrqBegin} + + + and #{map.pzgzrqEnd} >= op.pzgzrq +