Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/tools/WxShopOrderUtil.java

@@ -216,14 +216,19 @@
    /**
     * 新增发货信息
     */
    public int insertSendPackageInfo(ShopOrder shopOrder, String shippingMethod, ShopReceiveAddress receiveAddress) {
    public int insertSendPackageInfo(ShopOrder shopOrder, Integer shippingMethod, ShopReceiveAddress receiveAddress) {
        ShopDeliveryInfo shopDeliveryInfo = new ShopDeliveryInfo();
        shopDeliveryInfo.setCreateBy(AppConstance.SYSTEM_USER);
        shopDeliveryInfo.setUpdateBy(AppConstance.SYSTEM_USER);
        shopDeliveryInfo.setOrderId(shopOrder.getId());
        shopDeliveryInfo.setOrderNo(shopOrder.getOrderNo());
        shopDeliveryInfo.setUserId(shopOrder.getUserId());
        shopDeliveryInfo.setDeliveryWay(shippingMethod);
        if(ShopOrder.SHIPPING_METHOD_WL==shippingMethod){
            shopDeliveryInfo.setDeliveryWay("物流配送");
        }else{
            shopDeliveryInfo.setDeliveryWay("门店自提");
        }

        shopDeliveryInfo.setShopId(shopOrder.getStoreId().longValue());
        shopDeliveryInfo.setCompanyId(shopOrder.getCompanyId());
        StringBuffer receiveAddrStr = new StringBuffer();