From d250efd3c8de9e3d105adac47c74091d71318445 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Tue, 18 Jul 2023 17:46:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feature=201.=E6=8F=90=E7=A4=BA=E6=96=87?= =?UTF-8?q?=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java index d1c71780..33b7af34 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java @@ -262,7 +262,7 @@ public enum ExcelErrorMessageEnum { ORDERINFO_SSFLBM_SL_NULL("9611", "该商品税率没有维护，不能为空"), - ORDERINFO_9701("9701", "企业自编码长度超过16位"), + ORDERINFO_9701("9701", "企业自编码长度超过18位"), ORDERINFO_9702("9702", "编码表版本号长度超过10位"), From f9d11ef19ba78248ea69550cda5ac1ad61d95485 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Fri, 21 Jul 2023 15:03:42 +0800 Subject: [PATCH 2/5] =?UTF-8?q?redis=E9=85=8D=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 e3025400..615d747e 100644 --- a/order-management-consumer/src/main/resources/bootstrap.yaml +++ b/order-management-consumer/src/main/resources/bootstrap.yaml @@ -40,8 +40,8 @@ sims: #订单数据库类型区分,要么mysql,要么Oracle,要么weblogic db: mysql #订单redis数据库类型区分,要么redis,要么redis-sentinel -# redisDb: redis-sentinel - redisDb: redis + redisDb: redis-sentinel +# redisDb: redis # 0 mysql 1 oracle dataType: 0 From c490a5036677a0d2df60f0f27cd4d4974290409a Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 27 Jul 2023 09:28:48 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feature=201.=E6=98=8E=E7=B4=B0=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=95=8F=E9=A1=8C=E4=BF=AE=E5=BE=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderMergeServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java index c228660e..7bea5382 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java @@ -953,7 +953,11 @@ public class OrderMergeServiceImpl implements OrderMergeService { List deleteItem = new ArrayList<>(); log.debug("明细合并前明细数据，{}",JSONObject.toJSONString(orderItemInfos)); for (List value : collect1.values()) { - if(value.size() == 1){continue;} + if(value.size() == 1){ + orderItemInfoList.add(value.get(0)); + deleteItem.add(value.get(0).getId()); + continue; + } BigDecimal xmsl = new BigDecimal("0"); BigDecimal xmje = new BigDecimal("0"); BigDecimal se = new BigDecimal("0"); From 320f70614bee353d8e6d58f8fd41c8d34527f2a3 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 27 Jul 2023 12:52:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feature=201.=E6=98=8E=E7=BB=86=E8=A1=8C?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=90=88=E8=AE=A1=E7=A8=8E=E9=A2=9D=E8=B6=85?= =?UTF-8?q?=E8=BF=87=E8=8C=83=E5=9B=B4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderInfoServiceImpl.java | 12 +++++++----- .../order/service/impl/OrderMergeServiceImpl.java | 3 +-- 2 files changed, 8 insertions(+), 7 deletions(-) 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 94530fe5..46adad4d 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 @@ -27,7 +27,6 @@ import com.dxhy.order.baseservice.utils.BaseServiceBeanTransitionUtils; import com.dxhy.order.constant.*; import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper; import com.dxhy.order.consumer.dao.GsClientMapper; -import com.dxhy.order.consumer.dao.OrderBatchRequestMapper; import com.dxhy.order.consumer.dao.OrderProcessInfoMapper; import com.dxhy.order.consumer.model.OderDetailInfo; import com.dxhy.order.consumer.model.PageOrderExt; @@ -36,8 +35,8 @@ 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.OrderInfoVo; import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoTotalAmountVO; +import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoVo; 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; @@ -2027,13 +2026,16 @@ public class OrderInfoServiceImpl implements OrderInfoService { return R.error("根据订单号未查询到明细行信息"); } List collect ; + int itemCount = -1; if(itemList != null){ + itemCount = itemList.size(); collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isNotBlank(t.getSpbm()) && StringUtils.isNotBlank(t.getZxbm())).collect(Collectors.toList()); }else{ + itemCount = orderItemInfos.size(); collect = orderItemInfos.stream().filter(t -> StringUtils.isNotBlank(t.getSpbm()) && StringUtils.isNotBlank(t.getZxbm())).collect(Collectors.toList()); } //税编为空的不允许合并 - if(itemList.size() != collect.size()){ + if(itemCount != collect.size()){ return R.error("税收编码为空的不允许合并，请先更新税收编码"); } TaxEquipmentInfo taxEquipmentInfo = simsBackService.queryTaxEquipment(orderInfo.getNsrsbh(), entId); @@ -2060,10 +2062,10 @@ public class OrderInfoServiceImpl implements OrderInfoService { try { R r = mergeOrderItem(entId,orderInfoId, null); if(!ConfigureConstant.STRING_0000.equals(r.getCode())){ - return R.error(String.format("结算单号%s明细行合并失败",ddh)); + return r; } } catch (Exception e) { - log.error("批量合并报错orderInfoId:{},entId:{},报错信息:{}",orderInfoId,entId,e.getMessage()); + log.error("批量合并报错orderInfoId:{},entId:{},报错信息:{}",orderInfoId,entId,e); return R.error(String.format("结算单号%s明细行合并失败",ddh)); } } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java index 7bea5382..0a7329b1 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java @@ -954,8 +954,7 @@ public class OrderMergeServiceImpl implements OrderMergeService { log.debug("明细合并前明细数据，{}",JSONObject.toJSONString(orderItemInfos)); for (List value : collect1.values()) { if(value.size() == 1){ - orderItemInfoList.add(value.get(0)); - deleteItem.add(value.get(0).getId()); + mergeOutItem.add(value.get(0)); continue; } BigDecimal xmsl = new BigDecimal("0"); From 22eebf171240d1e0b9c5c1964843da9399c0c522 Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Wed, 2 Aug 2023 15:59:36 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=9C=89=E7=A8=8E=E6=8E=A7=E8=AE=BE=E5=A4=87=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E6=89=8D=E5=8E=BB=E7=BC=93=E5=AD=98=E5=88=B0redis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdservice/simsback/service/impl/SimsBackServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/service/impl/SimsBackServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/service/impl/SimsBackServiceImpl.java index 799e53e8..3c7770a1 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/service/impl/SimsBackServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/service/impl/SimsBackServiceImpl.java @@ -232,7 +232,7 @@ public class SimsBackServiceImpl implements SimsBackService { } catch (Exception e) { log.error("{}调用销项后台获取税控设备接口异常:{}", LOGGER_MSG, e); } - if (ObjectUtil.isNotNull(taxEquipmentInfo)) { + if (ObjectUtil.isNotNull(taxEquipmentInfo)&&StringUtils.isNotBlank(taxEquipmentInfo.getSksbCode())) { log.debug("{}调用销项后台获取税控设备返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfo)); //增加缓存逻辑 redisService.set(sksbKey, JsonUtils.getInstance().toJsonString(taxEquipmentInfo), RedisConstant.REDIS_EXPIRE_TIME_2HOUR);