add:发货处理

cloudroam

2025-01-09 9628b3362c1624dd373c1ab1d7a55e72104b972e

add:发货处理

 src/main/java/com/mzl/flower/dto/request/payment/OrderDeliveryNoDTO.java

@@ -12,4 +12,7 @@

    @ApiModelProperty(value = "数量")
    private String deliveryNo;

    @ApiModelProperty(value = "物流公司编码")
    private String logisticsCompanyCode;
}

 src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java

@@ -96,4 +96,10 @@

    @ApiModelProperty(value = "订单扎数")
    private Integer saleNum;

    @ApiModelProperty(value = "物流公司")
    @DictTrans(target = "logisticsCompanyCodeStr", codeType = "LOGISTICS_COMPANY_CODE")
    private String logisticsCompanyCode;

    private String logisticsCompanyCodeStr;
}

 src/main/java/com/mzl/flower/dto/response/payment/OrderListExportDTO.java

@@ -55,4 +55,7 @@
    @ApiModelProperty(value = "留言")
    private String remarks;

    @ApiModelProperty(value = "快递号")
    private String logisticsCompanyCode;

}

 src/main/java/com/mzl/flower/dto/response/payment/OrderPlatformListDTO.java

@@ -96,4 +96,10 @@

    @ApiModelProperty(value = "订单扎数")
    private Integer saleNum;

    @ApiModelProperty(value = "物流公司")
    @DictTrans(target = "logisticsCompanyCodeStr", codeType = "LOGISTICS_COMPANY_CODE")
    private String logisticsCompanyCode;

    private String logisticsCompanyCodeStr;
}

 src/main/java/com/mzl/flower/entity/payment/Order.java

@@ -169,4 +169,7 @@
    @TableField("create_date_sta")
    private LocalDate createDateSta;//创建日期

    @TableField("logistics_company_code")
    private String logisticsCompanyCode;//快递号

}

 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);
    }
}

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

@@ -20,7 +20,7 @@
public class WxDeliveryGoodService {

    public JSONObject wxDeliveryGood(String orderId, String openid, String transactionId,
                                  String itemDesc, String merchantId,String accessToken, Long partnerID,String deliveryNo) throws Exception {
                                  String itemDesc, String merchantId,String accessToken, Long partnerID,String deliveryNo,String logisticsCompanyCode, String maskedNumber) throws Exception {
        String requestPath = "https://api.weixin.qq.com/wxa/sec/order/upload_shipping_info?access_token="+accessToken;
        Map<String, Object> headers = new HashMap<>();
        headers.put("Accept", MediaType.APPLICATION_JSON.getValue());
@@ -48,6 +48,11 @@
        itemMap.put("item_desc",itemDesc);//商品描述
        if (StringUtils.isEmpty(partnerID) && !StringUtils.isEmpty(deliveryNo)) {
            itemMap.put("tracking_no", deliveryNo);//物流单号，物流快递发货时必填，示例值: 323244567777 字符字节限制: [1, 128]
            itemMap.put("express_company", logisticsCompanyCode);//物流公司编码，快递公司ID，参见「查询物流公司编码列表」，物流快递发货时必填， 示例值: DHL 字符字节限制: [1, 128]
            //联系方式，当发货的物流公司为顺丰时，联系方式为必填，收件人或寄件人联系方式二选一
            Map<String,Object> contact = new HashMap<>();
            orderKey.put("receiver_contact",maskedNumber);//收件人联系方式，收件人联系方式为，采用掩码传输，最后4位数字不能打掩码 示例值: `189****1234, 021-****1234, ****1234, 0**2-***1234, 0**2-******23-10, ****123-8008` 值限制: 0 ≤ value ≤ 1024
            itemMap.put("contact", contact);
        }
        shippingList.add(itemMap);
        body.put("shipping_list",shippingList);

 src/main/resources/mapper/payment/OrderMapper.xml

@@ -348,7 +348,7 @@
    </select>

    <select id="selectOrderExportList" resultType="com.mzl.flower.dto.response.payment.OrderListExportDTO">
        SELECT q.order_no,q.create_time,q.customer,q.customer_tel,q.total_amount,q.status_backend,q.partner_name,q.warehouse_location_code,q.remarks,
        SELECT q.order_no,q.create_time,q.customer,q.customer_tel,q.total_amount,q.status_backend,q.partner_name,q.warehouse_location_code,q.remarks,q.logistics_company_code,
               u.nick_name createName ,
               code.label as statusBackendStr,
               code2.label as specialNeedsStr,