From d4c42f2c18fecf94d9281fa698ec4c6c1dead0cf Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Sat, 27 Sep 2025 00:05:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E7=9F=AD=E4=BF=A1+=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/VisitorsServiceImpl.java | 26 ++++++++++++++++--- .../impl/ProfitMarginReportServiceImpl.java | 12 ++++++--- .../service/impl/SmErpSpuServiceImpl.java | 11 ++++++-- .../src/main/resources/application.yml | 8 +++--- 4 files changed, 44 insertions(+), 13 deletions(-) diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java index 5117e407c..763271a96 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java @@ -290,7 +290,7 @@ public class VisitorsServiceImpl extends ServiceImpl stringStringHashMap = new HashMap<>(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); +// stringStringHashMap.put("phone", dataVisitors.getMobile()); + stringStringHashMap.put("yyName", dataVisitors.getUserName()); + stringStringHashMap.put("visitorTime", dataVisitors.getVStartDate() + "至" + dataVisitors.getVEndDate()); + stringStringHashMap.put("deptName", dataVisitors.getDeptName()); + + // 构建动态URL + String url = "https://stgl.pj.gov.cn/pjvisitor/#/invitation?token=" + dataVisitors.getToken(); + stringStringHashMap.put("url", url); + + reminderThirdPartySmsService.sendParamsMsg(visitorUserEntity.getPhone(), "27694", stringStringHashMap, WebUtils.getIP()); + } + @Override public Object getPageSQ(Page page, VisitorsEntity visitors) { Long currentVisitorUserId = getCurrentVisitorUserId(); diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/ProfitMarginReportServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/ProfitMarginReportServiceImpl.java index 7579f5b02..a5f802623 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/ProfitMarginReportServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/ProfitMarginReportServiceImpl.java @@ -230,7 +230,8 @@ public class ProfitMarginReportServiceImpl implements ProfitMarginReportService // 计算成本额 // 优先使用包装单位的实际进价，如果没有则使用商品主表的成本价 BigDecimal costPrice = getActualCostPrice(product, item, unitMap); - BigDecimal itemCostAmount = costPrice.multiply(new BigDecimal(item.getQuantity() != null ? item.getQuantity() : 0)); + // 使用绝对值确保成本金额为正数 + BigDecimal itemCostAmount = costPrice.multiply(new BigDecimal(Math.abs(item.getQuantity() != null ? item.getQuantity() : 0))); totalCostAmount = totalCostAmount.add(itemCostAmount); @@ -322,7 +323,8 @@ public class ProfitMarginReportServiceImpl implements ProfitMarginReportService // 使用第一个销售记录的包装单位来获取成本价格 SmErpInventoryRecordsItemEntity firstItem = items.get(0); BigDecimal costPrice = getActualCostPrice(product, firstItem, unitMap); - BigDecimal costAmount = costPrice.multiply(new BigDecimal(salesQuantity)); + // 使用绝对值确保成本金额为正数 + BigDecimal costAmount = costPrice.multiply(new BigDecimal(Math.abs(salesQuantity))); // 计算毛利润 BigDecimal profitAmount = salesAmount.subtract(costAmount); @@ -1038,7 +1040,8 @@ public class ProfitMarginReportServiceImpl implements ProfitMarginReportService SmErpSpuEntity product = productMap.get(item.getErpSpuId()); if (product != null && !isPriceAdjustmentProduct(product.getProductName())) { BigDecimal costPrice = getActualCostPrice(product, item, unitMap); - BigDecimal itemCostAmount = costPrice.multiply(new BigDecimal(item.getQuantity() != null ? item.getQuantity() : 0)); + // 使用绝对值确保成本金额为正数 + BigDecimal itemCostAmount = costPrice.multiply(new BigDecimal(Math.abs(item.getQuantity() != null ? item.getQuantity() : 0))); costAmount = costAmount.add(itemCostAmount); } } @@ -1143,7 +1146,8 @@ public class ProfitMarginReportServiceImpl implements ProfitMarginReportService SmErpSpuEntity product = productMap.get(item.getErpSpuId()); if (product != null && !isPriceAdjustmentProduct(product.getProductName())) { BigDecimal costPrice = getActualCostPrice(product, item, unitMap); - BigDecimal itemCostAmount = costPrice.multiply(new BigDecimal(item.getQuantity() != null ? item.getQuantity() : 0)); + // 使用绝对值确保成本金额为正数 + BigDecimal itemCostAmount = costPrice.multiply(new BigDecimal(Math.abs(item.getQuantity() != null ? item.getQuantity() : 0))); costAmount = costAmount.add(itemCostAmount); } } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java index 0680075e3..583dfbf12 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java @@ -564,11 +564,18 @@ public class SmErpSpuServiceImpl extends ServiceImpl smErpInventoryRecordsItemEntity.getUnitPrice()).mapToInt(Integer::intValue).sum(); + int sum = smErpInventoryRecordsItemEntityList.stream() + .mapToInt(SmErpInventoryRecordsItemEntity::getTotalAmount) + .sum(); smErpInventoryRecordsEntity.setTotalAmount(sum); smErpInventoryRecordsEntity.setReceiveAmount(sum); //生成出入库记录 diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml index 387dde7a7..8828ff217 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml @@ -119,10 +119,10 @@ sms: params: [ "code", "date" ] 20658: content: "您于{createTime}申请的访客预约现已通过审核！ - ▶ 访客姓名：{visitorName} - ▶ 访客手机号：{visitorPhone} - ▶ 到访时间：{visitorTime} - ▶ 访问地点：{visitorLocal} + 访客姓名：{visitorName} + 访客手机号：{visitorPhone} + 到访时间：{visitorTime} + 访问地点：{visitorLocal} 请及时登录系统查看详情：{url}" params: [ "createTime", "visitorName", "visitorPhone", "visitorTime", "visitorLocal","url" ]