From 5997dc8acfa81a6c867c28810d1c3c9714efc46c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 29 三月 2025 14:55:42 +0800
Subject: [PATCH] fix: 登录
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 68 +++++++++++++++++++++++++++++----
1 files changed, 59 insertions(+), 9 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..a1792d2 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -816,11 +816,18 @@
if (StringUtils.isEmpty(dto.getDeliveryNo())) {
throw new ValidationException("快递号不能为空");
}
+ if (StringUtils.isEmpty(dto.getLogisticsCompanyCode())) {
+ 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("请先完成质检");
}
- o.setDeliveryNo(dto.getDeliveryNo());
+// o.setDeliveryNo(dto.getDeliveryNo());
o.setStatus(Constants.ORDER_STATUS.RECEIVE.name());
o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.RECEIVE.name());
o.update(SecurityUtils.getUserId());
@@ -835,6 +842,18 @@
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.setLogisticsCompanyCode(dto.getLogisticsCompanyCode());
+ o.update(SecurityUtils.getUserId());
orderMapper.updateById(o);
}
@@ -1273,14 +1292,10 @@
for (OrderItem item : items) {
sb.append(item.getFlowerName() + "*" + item.getNum() + "扎、");//商品信息
}
+ String phoneNumber = o.getCustomerTel();
+ String maskedNumber = maskPhoneNumber(phoneNumber);
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(),o.getLogisticsCompanyCode(),maskedNumber);
} catch (Exception e) {
log.error("订单" + o.getOrderNo() + "发货，调用微信发货接口失败", e);
json.put("errcode", -1);
@@ -1769,7 +1784,7 @@
public void exportOrderDetail(HttpServletResponse response, OrderQueryDTO dto) {
List<OrderListExportDTO> ls = getOrderExportListBase( dto);
String[] rowsName = new String[]{"序号","订单号", "用户账号", "收货人", "收货人电话", "收货地址", "订单金额"
- , "底价","销售扎数", "订单状态", "下单时间", "合伙人", "库位", "特殊需求", "备注"};
+ , "底价","销售扎数", "订单状态", "下单时间", "合伙人", "库位", "特殊需求", "备注","快递号"};
List<Object[]> dataList = new ArrayList<>();
int sn = 1;
for (OrderListExportDTO o : ls) {
@@ -1790,6 +1805,7 @@
objs[a++] = o.getWarehouseLocationCode();
objs[a++] = o.getSpecialNeedsStr();
objs[a++] = o.getRemarks();
+ objs[a++] = o.getLogisticsCompanyCode();
dataList.add(objs);
sn++;
@@ -1818,4 +1834,38 @@
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;
+ }
+
+ public static String maskPhoneNumber(String phoneNumber) {
+ return phoneNumber.substring(0, phoneNumber.length() - 8) + "****" + phoneNumber.substring(phoneNumber.length() - 4);
+ }
}
--
Gitblit v1.9.3