20220902

xiaoyong931011

2022-10-08 7a7800c647fdf315879a6e989089a951f2b1291f

20220902

 src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java

@@ -19,6 +19,9 @@
    @ApiModelProperty(value = "地址ID", example = "1")
    private Long addressId;

    @ApiModelProperty(value = "门店ID", example = "1")
    private Long shopId;

    @ApiModelProperty(value = "订单提交类型", example = "1从购物车提交, 2从商品直接提交")
    private Integer type;


 src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java

@@ -91,4 +91,6 @@

    //配送方式 1：快递寄送2：到店自提
    private Integer deliverType;

    private Long shopId;
}

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java

@@ -14,6 +14,7 @@
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
import cc.mrbird.febs.mall.vo.ApiShopApplyVo;
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
import cc.mrbird.febs.mall.vo.OrderRefundVo;
@@ -75,6 +76,7 @@

    private final MallMemberBankSignMapper mallMemberBankSignMapper;
    private final MallMemberBankMapper mallMemberBankMapper;
    private final MallShopApplyMapper mallShopApplyMapper;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -102,6 +104,22 @@

        if (CollUtil.isEmpty(addOrderDto.getItems())) {
            throw new FebsException("参数错误");
        }

        int deliverType = ObjectUtil.isEmpty(addOrderDto.getDeliverType()) ? 1 : addOrderDto.getDeliverType();
        if(2 == deliverType){
            if(ObjectUtil.isEmpty(addOrderDto.getShopId())){
                throw new FebsException("请选择门店");
            }
            Long shopId = addOrderDto.getShopId();
            MallShopApply mallShopApply = mallShopApplyMapper.selectById(shopId);
            if(ObjectUtil.isEmpty(mallShopApply)){
                throw new FebsException("请选择门店");
            }
            if(MallShopApply.APPLY_AGREE != mallShopApply.getStatus()){
                throw new FebsException("请选择门店");
            }
            orderInfo.setShopId(shopId);
        }

        this.baseMapper.insert(orderInfo);
@@ -186,7 +204,6 @@
        }

        orderInfo.setAmount(total);
        int deliverType = ObjectUtil.isEmpty(addOrderDto.getDeliverType()) ? 1 : addOrderDto.getDeliverType();
        if(2 == deliverType){
            orderInfo.setDeliverType(2);
            orderInfo.setCarriage(BigDecimal.ZERO);
@@ -514,6 +531,21 @@
            long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
            orderDetailVo.setRemainTime(remainTime);
        }
        Integer deliverType = orderInfo.getDeliverType();
        if(2 == deliverType){
            MallShopApply mallShopApply = mallShopApplyMapper.selectById(orderInfo.getShopId());
            if(ObjectUtil.isNotEmpty(mallShopApply)){
                ApiShopApplyVo apiShopApplyVo = new ApiShopApplyVo();
                apiShopApplyVo.setName(mallShopApply.getName());
                apiShopApplyVo.setPhone(mallShopApply.getPhone());
                apiShopApplyVo.setSaleArea(mallShopApply.getSaleArea());
                apiShopApplyVo.setLatitude(mallShopApply.getLatitude());
                apiShopApplyVo.setLongitude(mallShopApply.getLongitude());
                apiShopApplyVo.setShopName(mallShopApply.getShopName());
                apiShopApplyVo.setAddress(mallShopApply.getAddress());
                orderDetailVo.setApiShopApplyVo(apiShopApplyVo);
            }
        }
        return orderDetailVo;
    }


 src/main/java/cc/mrbird/febs/mall/vo/ApiShopApplyVo.java

New file
@@ -0,0 +1,33 @@
package cc.mrbird.febs.mall.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "ApiShopApplyVo", description = "返回参数类")
public class ApiShopApplyVo {

    /**
     * 姓名
     */
    private String name;

    /**
     * 联系方式
     */
    private String phone;

    /**
     * 经营场地
     */
    private String saleArea;

    private String longitude;

    private String latitude;

    private String shopName;

    private String address;

}

 src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java

@@ -87,5 +87,8 @@

    @ApiModelProperty(value = "配送方式 1：快递寄送2：到店自提")
    private Integer deliverType;

    @ApiModelProperty(value = "门店信息")
    private ApiShopApplyVo apiShopApplyVo;
}