修复微商城订单bug

jyy

2021-04-20 1588d362f271a0a0c16162235cf3a2c1a00b62df

修复微商城订单bug

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

 zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateGroupBuyDTO.java

@@ -40,7 +40,7 @@
    /**
     * 配送方式
     */
    private String shippingMethod;
    private Integer shippingMethod;

    /**
     * 拼团ID

 zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateSecKillDTO.java

@@ -1,11 +1,14 @@
package com.matrix.system.shopXcx.dto;

import lombok.Data;

import java.math.BigDecimal;

/**
 * @author wzy
 * @date 2020-04-09 15:49
 **/
@Data
public class CreateSecKillDTO {

    /**
@@ -31,7 +34,7 @@
    /**
     * 配送方式
     */
    private String shippingMethod;
    private Integer shippingMethod;

    private BigDecimal price;

@@ -39,67 +42,4 @@

    private String openId;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Integer getAddressId() {
        return addressId;
    }

    public void setAddressId(Integer addressId) {
        this.addressId = addressId;
    }

    public Integer getCount() {
        return count;
    }

    public void setCount(Integer count) {
        this.count = count;
    }

    public Long getShopId() {
        return shopId;
    }

    public void setShopId(Long shopId) {
        this.shopId = shopId;
    }

    public String getShippingMethod() {
        return shippingMethod;
    }

    public void setShippingMethod(String shippingMethod) {
        this.shippingMethod = shippingMethod;
    }

    public BigDecimal getPrice() {
        return price;
    }

    public void setPrice(BigDecimal price) {
        this.price = price;
    }

    public Integer getGoodsId() {
        return goodsId;
    }

    public void setGoodsId(Integer goodsId) {
        this.goodsId = goodsId;
    }

    public String getOpenId() {
        return openId;
    }

    public void setOpenId(String openId) {
        this.openId = openId;
    }
}