20220902

xiaoyong931011

2022-09-19 daf5bd7c2a47656949df84d82ae7bec29d0d0135

20220902

 src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java

@@ -9,4 +9,6 @@
public interface MallOrderItemMapper extends BaseMapper<MallOrderItem> {

    List<MallOrderItem> selectItemByGoodsIdUnCancel(@Param("goodsId") Long goodsId, @Param("memberId") Long memberId);

    List<MallOrderItem> selectbyOrderId(@Param("orderId") Long id);
}

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

@@ -66,6 +66,18 @@
    public IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request) {
        Page<AdminMallOrderInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminMallOrderInfoVo> adminMallOrderInfoVos = this.baseMapper.selectOrderListInPage(page, mallOrderInfo);
        List<AdminMallOrderInfoVo> records = adminMallOrderInfoVos.getRecords();
        if(CollUtil.isNotEmpty(records)){
            for(AdminMallOrderInfoVo adminMallOrderInfoVo : records){
                Long id = adminMallOrderInfoVo.getId();
                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectbyOrderId(id);
                StringBuffer stringBuffer = new StringBuffer();
                for(MallOrderItem mallOrderItem : mallOrderItemList){
                    stringBuffer.append(mallOrderItem.getGoodsName()+"*"+mallOrderItem.getCnt()+";");
                }
                adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
            }
        }
        return adminMallOrderInfoVos;
    }


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

@@ -71,4 +71,6 @@
    private String memberEmail;

    private Integer carriage;

    private String goodsName;
}

 src/main/resources/mapper/modules/MallOrderItemMapper.xml

@@ -8,4 +8,9 @@
        where a.goods_id=#{goodsId} and b.member_id=#{memberId}
    </select>

    <select id="selectbyOrderId" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
        select a.* from mall_order_item a
        where a.order_id=#{orderId}
    </select>

</mapper>

 src/main/resources/templates/febs/views/modules/order/orderList.html

@@ -238,12 +238,14 @@
                url: ctx + 'admin/order/orderList?orderType=1',
                defaultToolbar: [],
                toolbar: '#tableToolBar',
                totalRow: true ,// 开启合计行
                cols: [[
                        {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
                        {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left', totalRowText: '合计：'},
                        {field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
                        {field: 'memberPhone', title: '账号', minWidth: 120,align:'left'},
                        {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
                        {field: 'amount', title: '订单金额', minWidth: 120,align:'left'},
                        {field: 'goodsName', title: '商品信息', minWidth: 120,align:'left'},
                        {field: 'amount', title: '订单金额', minWidth: 120,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
                        {field: 'carriage', title: '运费', minWidth: 120,align:'left'},
                        {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
                        {field: 'status', title: '状态',