From 1fe9a1c594c40324b64f2822b2381e741fa231fc Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 09 一月 2025 09:00:45 +0800
Subject: [PATCH] 1.花材报表-把下架和强制下架状态分开
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index 69a4c85..7149095 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -817,6 +817,10 @@
throw new ValidationException("快递号不能为空");
}
Order o = orderMapper.selectById(dto.getId());
+ //上传快递号逻辑调整：由原来输入快递单号直接发送，调整先输入快递单号再点击发送，先保存订单得快递号
+ if (StringUtils.isEmpty(o.getDeliveryNo())) {
+ throw new ValidationException("快递号不能为空");
+ }
if (!Constants.ORDER_STATUS_BACKEND.SEND.name().equals(o.getStatusBackend())) {
throw new ValidationException("请先完成质检");
}
@@ -835,6 +839,17 @@
o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
}
+ orderMapper.updateById(o);
+ }
+
+ public void saveDeliveryNoInfo(OrderDeliveryNoDTO dto) {
+ //上传快递号逻辑调整：由原来输入快递单号直接发送，调整先输入快递单号再点击发送，先保存订单得快递号
+ Order o = orderMapper.selectById(dto.getId());
+ if (!Constants.ORDER_STATUS_BACKEND.SEND.name().equals(o.getStatusBackend())) {
+ throw new ValidationException("请先完成质检");
+ }
+ o.setDeliveryNo(dto.getDeliveryNo());
+ o.update(SecurityUtils.getUserId());
orderMapper.updateById(o);
}
@@ -1274,13 +1289,7 @@
sb.append(item.getFlowerName() + "*" + item.getNum() + "扎、");//商品信息
}
try {
- json = wxDeliveryGoodService.wxDeliveryGood(
- o.getId(),
- o.getPayOpenid(),
- o.getPaymentTrId(),
- sb.toString(),
- PyamentV3Configurer.merchantId,
- accessToken);
+ json = wxDeliveryGoodService.wxDeliveryGood(o.getId(), o.getPayOpenid(), o.getPaymentTrId(), sb.toString(), PyamentV3Configurer.merchantId, accessToken, o.getPartnerId(), o.getDeliveryNo());
} catch (Exception e) {
log.error("订单" + o.getOrderNo() + "发货，调用微信发货接口失败", e);
json.put("errcode", -1);
@@ -1818,4 +1827,34 @@
orderMapper.updatePaymentCreateDate(order);
});
}
+
+ public List<OrderStatusCountDTO> getAbnormalOrderStatusCount(OrderQueryDTO dto) {
+ dto.setStartDate(parseLocalDateTime(dto.getStartDateStr(), true));
+ dto.setEndDate(parseLocalDateTime(dto.getEndDateStr(), false));
+
+ dto.setCreateStartDate(parseLocalDateTime(dto.getCreateStartDateStr(), 17, 0, 0, -1));
+ dto.setCreateEndDate(parseLocalDateTime(dto.getCreateEndDateStr(), 17, 0, 0, 0));
+
+ List<CodeValueDTO> ls = codeService.searchValue("ABNORMAL_ORDER_STATUS");
+ List<OrderStatusCountDTO> ll = orderMapper.getAbnormalOrderStatusCount(dto);
+ Map<String, Integer> llMap = new HashMap<>();
+ if (ll != null && ll.size() > 0) {
+ for (OrderStatusCountDTO c : ll) {
+ llMap.put(c.getValue(), c.getOrderCount());
+ }
+ }
+
+ List<OrderStatusCountDTO> rr = new ArrayList<>();
+ for (CodeValueDTO c : ls) {
+ OrderStatusCountDTO r = new OrderStatusCountDTO();
+ r.setValue(c.getValue());
+ r.setLabel(c.getLabel());
+ Integer count = llMap.get(r.getValue());
+ r.setOrderCount(count == null ? 0 : count);
+
+ rr.add(r);
+ }
+
+ return rr;
+ }
}
--
Gitblit v1.9.3