修改bug

Pu Zhibing

2025-01-14 6936e2439bb5426d6c446ec30c2d27a7db8e890d

修改bug

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java

@@ -63,7 +63,7 @@
    private BigDecimal paymentAmount;

    @ApiModelProperty(value = "配送方式（1=自提，2=快递）")
    private String distributionMode;
    private Integer distributionMode;

    @ApiModelProperty(value = "门店名称")
    private String shopName;

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -174,13 +174,7 @@
            orderActivityInfo = JSONObject.parseObject(activityJson, OrderActivityInfo.class);
        }
        OrderDetailVO orderDetailVO = new OrderDetailVO();

        if (CollectionUtil.isNotEmpty(orderGoods)){
            String goodJson = orderGoods.get(0).getGoodJson();
            Goods goods = JSONObject.parseObject(goodJson, Goods.class);
            orderDetailVO.setDistributionMode(goods.getDistributionMode());
        }

        orderDetailVO.setDistributionMode(order.getDistributionMode());
        Technician technician = new Technician();
        if (order.getTechnicianId() != null){
            R<Technician> shopdetail = technicianClient.shopdetail(order.getTechnicianId());