From 2682670e2ae0c5190fc39b7cf90144528b51c72e Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 29 May 2023 16:28:15 +0800 Subject: [PATCH 1/9] =?UTF-8?q?feature=201.=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order-management-consumer/src/main/resources/bootstrap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/resources/bootstrap.yaml b/order-management-consumer/src/main/resources/bootstrap.yaml index f3c94e37..e3025400 100644 --- a/order-management-consumer/src/main/resources/bootstrap.yaml +++ b/order-management-consumer/src/main/resources/bootstrap.yaml @@ -6,10 +6,10 @@ spring: name: order-api profiles: # Spring 配置文件读取 -# active: @deployType@ + active: @deployType@ # active: own # active: std - active: dev +# active: dev #active: test jackson: # jackson 日期格式化 From 90536c7319fc58ca68bf336c63e69bb9991bc46e Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 29 May 2023 19:28:09 +0800 Subject: [PATCH 2/9] =?UTF-8?q?feature=201.=E4=BF=AE=E6=94=B9=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=E5=9E=8B=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CommonInterfaceServiceImpl.java | 2 +- .../consumer/utils/BeanTransitionUtils.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java index 5f4b3ac4..7159e8d4 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java @@ -831,7 +831,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { log.debug("对明细行规格型号进行截取,截取前数据为:{}", ggxh); ggxh = StringUtil.subStringByByte(ggxh, ConfigureConstant.INT_40); log.debug("对明细行规格型号进行截取,截取后数据为:{}", ggxh); - item.setXmmc(ggxh); + item.setGgxh(ggxh); } } catch (IOException e) { //编码格式错误 diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 6e4e20f7..ec7f8f38 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -58,6 +58,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; +import java.io.IOException; import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -3547,6 +3548,22 @@ public class BeanTransitionUtils { ddmxxxBO.setSPSL(detail.getZZSL()); ddmxxxBO.setDJ(detail.getZZDJ()); } + if(StringUtils.isNotBlank(ddmxxxBO.getGGXH())){ + String ggxh = ddmxxxBO.getGGXH(); + try { + if (ggxh.getBytes(ConfigureConstant.STRING_CHARSET_GBK).length > ConfigureConstant.INT_40) { + log.debug("对明细行规格型号进行截取,截取前数据为:{}", ggxh); + ggxh = StringUtil.subStringByByte(ggxh, ConfigureConstant.INT_40); + log.debug("对明细行规格型号进行截取,截取后数据为:{}", ggxh); + ddmxxxBO.setGGXH(ggxh); + } + } catch (IOException e) { + //编码格式错误 + log.error("处理商品名称异常：{}", e); + throw new RuntimeException(e); + } + } + ddmxxxBO.setSL(new BigDecimal(detail.getZTAX()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP).toString()); if(StringUtils.isNotBlank(detail.getZZSE()) && StringUtils.isNotBlank(detail.getZBHSJE())){ From 079de677871ba62dd6e5c0f87ad5644204317f58 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Tue, 30 May 2023 08:57:58 +0800 Subject: [PATCH 3/9] bug3066 --- .../main/resources/mybatis/mapper/CommodityMapper.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml index 172a087b..c2ce505a 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml @@ -97,7 +97,8 @@ cc.wlflmc, cc.ent_id, cc.tswl, - cc.invoice_name + cc.invoice_name, + cc.encoding FROM commodity_code cc LEFT JOIN group_commodity gc ON gc.id = cc.group_id @@ -160,6 +161,12 @@ AND cc.tswl = #{map.tswl,jdbcType=VARCHAR} + + AND cc.encoding like concat('%',#{map.encoding,jdbcType=VARCHAR},'%') + + + AND cc.specification_model like concat('%',#{map.specificationModel,jdbcType=VARCHAR},'%') + From b5fca06951594d623be081def94b04164900e398 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Mon, 5 Jun 2023 15:40:11 +0800 Subject: [PATCH 4/9] task4530 --- .../consumer/dao/OrderProcessInfoMapper.java | 3 + .../order/controller/OrderInfoController.java | 6 +- .../model/vo/OrderInfoTotalAmountVO.java | 29 ++ .../order/service/OrderInfoService.java | 11 + .../service/impl/OrderInfoServiceImpl.java | 6 + .../mybatis/mapper/OrderProcessInfoMapper.xml | 289 ++++++++++++++++++ 6 files changed, 343 insertions(+), 1 deletion(-) create mode 100644 order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/vo/OrderInfoTotalAmountVO.java 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 @@ + From 8b0f11ba2e281402352a51ab69f6536fa795aa3c Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Mon, 5 Jun 2023 15:50:42 +0800 Subject: [PATCH 5/9] task4530 --- .../main/resources/mybatis/mapper/OrderProcessInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a63c124f..9b41ecf7 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -1319,7 +1319,7 @@ select @@ -622,5 +622,11 @@ + From c6c68f01fc794529fcdf6c99ea0d5a00ca59e126 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Tue, 6 Jun 2023 14:29:29 +0800 Subject: [PATCH 8/9] =?UTF-8?q?task4516=20sap=E6=8A=A5=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/OrderInvoiceController.java | 11 ++++++----- .../modules/order/service/OrderProcessService.java | 6 ++++++ .../order/service/impl/OrderProcessServiceImpl.java | 11 ++++++++--- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java index 66496516..d2dee122 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java @@ -459,11 +459,12 @@ public class OrderInvoiceController { orderProcessInfo1.setFpqqlsh(baseService.getGenerateShotKey()); orderProcessInfo1.setXtly(orderProcessInfo.getXtly()); } - int success = orderProcessService.updateOrderProcessInfoByProcessId(orderProcessInfo1, shList); - if (success < 0) { - errorMsgList.append(preStr).append("数据删除失败").append("\r\n"); - continue; - } +// int success = orderProcessService.updateOrderProcessInfoByProcessId(orderProcessInfo1, shList); + orderProcessService.deleteOrderProcessInfoAndOrderInfoByProcessId(orderProcessInfo1, shList); +// if (success < 0) { +// errorMsgList.append(preStr).append("数据删除失败").append("\r\n"); +// continue; +// } //如果是红票数据,并且是专票,需要更新红字信息表数据 // 红字专票 作废后修改申请单的状态为未开票 if (OrderInfoEnum.ORDER_INVOICE_TYPE_0.getKey().equals(orderProcessInfo.getFpzlDm()) || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getKey().equals(orderProcessInfo.getFpzlDm())) { diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java index 749653e1..3beb8826 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java @@ -78,6 +78,12 @@ public interface OrderProcessService { */ int updateOrderProcessInfoByProcessId(OrderProcessInfo orderProcessInfo, List shList); + /** + * 删除开票申请单 + * @param orderProcessInfo + */ + void deleteOrderProcessInfoAndOrderInfoByProcessId(OrderProcessInfo orderProcessInfo, List shList); + /** * 根据销方税号,订单号,发票请求流水号进行查询orderprocess信息 * diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java index ab5bd880..c7b974ea 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java @@ -131,7 +131,12 @@ public class OrderProcessServiceImpl implements OrderProcessService { @Override public int updateOrderProcessInfoByProcessId(OrderProcessInfo orderProcessInfo, List shList) { - if (OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(orderProcessInfo.getXtly())) { + return orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfo, shList); + } + + @Override + public void deleteOrderProcessInfoAndOrderInfoByProcessId(OrderProcessInfo orderProcessInfo, List shList) { + if (StringUtils.isNotBlank(orderProcessInfo.getXtly())&&OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(orderProcessInfo.getXtly())) { OrderInfo orderInfo = orderInfoMapper.queryOrderInfoByProcessId(orderProcessInfo.getId()); if (orderInfo == null) { throw new RuntimeException("删除SAP推送单据，数据异常"); @@ -142,9 +147,9 @@ public class OrderProcessServiceImpl implements OrderProcessService { throw new RuntimeException("删除SAP推送单据，数据异常"); } } - return orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfo, shList); + orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfo, shList); } - + /** * 根据销方税号,订单号,发票请求流水号进行查询orderprocess信息 * From 10b8e96a69edbb022509824deec653b3685e718e Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Thu, 8 Jun 2023 21:18:33 +0800 Subject: [PATCH 9/9] =?UTF-8?q?OFD=E8=BD=ACPNG=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoice/service/impl/OfdToPngSDEnergyServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OfdToPngSDEnergyServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OfdToPngSDEnergyServiceImpl.java index 92dc933a..e8403c09 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OfdToPngSDEnergyServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OfdToPngSDEnergyServiceImpl.java @@ -3,6 +3,7 @@ package com.dxhy.order.invoice.module.invoice.service.impl; import cn.hutool.core.util.IdUtil; import cn.hutool.crypto.digest.DigestUtil; import com.alibaba.fastjson.JSONObject; +import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderInfoEnum; import com.dxhy.order.invoice.module.invoice.service.OfdToPngSDEnergyService; import com.dxhy.order.model.ofd.OfdToPngResponse; @@ -36,6 +37,7 @@ public class OfdToPngSDEnergyServiceImpl implements OfdToPngSDEnergyService { String url = yxurl + "/yxSims/ofdToImage?timestamp="+timestamp+"&md5Str="+md5Str; OfdToPngResponse ofdToPngResponse = new OfdToPngResponse(); + ofdToPngResponse.setZTDM(ConfigureConstant.STRING_0000); try { log.info("调用影像接口ofd转png，url:{}",url); String rs = HttpUtils.doPostUpload(url, bytes, IdUtil.fastSimpleUUID()+".ofd");