xiaoyong931011
2021-06-29 866da0eb49d74ad53440a52b19caf7c2aceb8aa9
20210628 集物员审核
3 files modified
5 ■■■■ changed files
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java 2 ●●●●● patch | view | raw | blame | history
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml 1 ●●●● patch | view | raw | blame | history
gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml 2 ●●● patch | view | raw | blame | history
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
@@ -27,6 +27,8 @@
    private String reserveTime;
    @ApiModelProperty(value="订单总金额")
    private BigDecimal totalPrice;
    @ApiModelProperty(value="总重")
    private BigDecimal totalWeight;
    @ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
    private Integer status;
    @ApiModelProperty(value="集物员")
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -15,6 +15,7 @@
        b.nick_name name,
        b.mobile_phone mobilePhone,
               (select ifnull(sum(price*weight*40),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
                (select ifnull(sum(weight),0) from xzx_jhy_order_items where order_id = a.id) totalWeight,
        d.username username
        FROM
        xzx_jhy_order a
gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml
@@ -24,7 +24,7 @@
            1=1
            <if test="record.name != null and record.name != ''">
                and (username like concat('%',#{record.name},'%')
                or phone like concat('%',#{record.phone},'%') )
                or mobile like concat('%',#{record.name},'%') )
            </if>
            <if test="record.isJhy != null and record.isJhy != ''">
                and is_jhy=#{record.isJhy}