add:发货处理

cloudroam

2025-01-09 9628b3362c1624dd373c1ab1d7a55e72104b972e

 src/main/java/com/mzl/flower/service/payment/OrderService.java

@@ -816,6 +816,9 @@
        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())) {
@@ -824,7 +827,7 @@
        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());
@@ -849,6 +852,7 @@
            throw new ValidationException("请先完成质检");
        }
        o.setDeliveryNo(dto.getDeliveryNo());
        o.setLogisticsCompanyCode(dto.getLogisticsCompanyCode());
        o.update(SecurityUtils.getUserId());
        orderMapper.updateById(o);
    }
@@ -1288,8 +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, o.getPartnerId(), o.getDeliveryNo());
                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);
@@ -1778,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) {
@@ -1799,6 +1805,7 @@
            objs[a++] = o.getWarehouseLocationCode();
            objs[a++] = o.getSpecialNeedsStr();
            objs[a++] = o.getRemarks();
            objs[a++] = o.getLogisticsCompanyCode();
            dataList.add(objs);

            sn++;
@@ -1857,4 +1864,8 @@

        return rr;
    }

    public static String maskPhoneNumber(String phoneNumber) {
        return phoneNumber.substring(0, phoneNumber.length() - 8) + "****" + phoneNumber.substring(phoneNumber.length() - 4);
    }
}