fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java

@@ -152,12 +152,23 @@
        shopOrder.setOrderType(ShopOrder.ORDER_TYPE_GOODS);

        List<ShopOrderDetails> details = new ArrayList<>();
        // 是否包含实物商品
        boolean hasRealGoods = false;

        Integer orderCount = 0;
        for (OrderItemDto orderItemDto : shopOrderDto.getOrderItemList()) {
            ShopOrderDetails shopOrderDetails = new ShopOrderDetails();
            shopOrderDetails.setCreateBy(AppConstance.SYSTEM_USER);
            shopOrderDetails.setUpdateBy(AppConstance.SYSTEM_USER);
            shopOrderDetails.setpId(orderItemDto.getProductId());

            if (!hasRealGoods) {
                ShopProduct shopProduct = shopProductDao.selectById(orderItemDto.getProductId());
                if (shopProduct.getIsUnrealProduct() == 2) {
                    hasRealGoods = true;
                }
            }

            shopOrderDetails.setsId(orderItemDto.getSkuId());
            shopOrderDetails.setCount(orderItemDto.getCount());
            if(ShopOrderDetails.PAYTYPE_MICRO==orderItemDto.getPayType()){
@@ -198,6 +209,10 @@
        shopOrder.setOrderType(ShopOrder.ORDER_TYPE_GOODS);
        //购买方式
        shopOrder.setShippingMethod(shopOrderDto.getDeliverySelect());
        // 客户选择的物流配送，且没有实物产品(全是虚拟产品), 则直接门店自提，无需填写配送单
        if (ShopOrder.SHIPPING_METHOD_WL == shopOrderDto.getDeliverySelect() && !hasRealGoods) {
            shopOrder.setShippingMethod(ShopOrder.SHIPPING_METHOD_MDZT);
        }
        //生成订单号
        shopOrder.setOrderNo(WxUtils.getOrderNum());
        //设置支付状态