20210707

xiaoyong931011

2021-07-07 dc3beb5e2c9c62bfc40330201ace94f781d28fd2

 gc-user/src/main/java/com/xzx/gc/user/service/UserService.java

@@ -400,6 +400,7 @@
        orderStatus1.add("3");
        orderStatus2.add("4");
        orderStatus2.add("5");

        orderStatus2.add("7");
        for (UserModel mx : map) {

@@ -407,11 +408,11 @@
            if (userModel.getExportFlag() == 0) {
                //订单数
                Integer orderNum = 0;
                Example exampleOrder = new Example(OrderInfo.class);
                Example.Criteria criteriaOrder = exampleOrder.createCriteria();
                criteriaOrder.andEqualTo("userId",mx.getUserId());
                criteriaOrder.andNotEqualTo("orderStatus",6);
                List<OrderInfo> orderInfos = orderMapper.selectByExample(exampleOrder);
//                Example exampleOrder = new Example(OrderInfo.class);
//                Example.Criteria criteriaOrder = exampleOrder.createCriteria();
//                criteriaOrder.andEqualTo("userId",mx.getUserId());
//                criteriaOrder.andNotEqualTo("orderStatus",6);
                List<OrderInfo> orderInfos = orderMapper.selectOrderByUserId(mx.getUserId(),6);
                if(CollUtil.isNotEmpty(orderInfos)){
                    orderNum = orderNum + orderInfos.size();
                }
@@ -850,6 +851,10 @@
        List<Map<String, Object>> odlist = orderMapper.queryCuserOrderFinishList(userId, x);
        PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(odlist);
        for (Map<String, Object> map : odlist) {
//            map.put("money", DoubleUtil.roundTwo(map.get("money").toString()));
//            map.put("weight", DoubleUtil.roundThree(map.get("weight").toString()));
//            map.put("orderid", map.get("orderId").toString());
//            map.put("createtime", map.get("createTime").toString());
            map.put("orderid", map.get("orderId").toString());
            map.put("address", map.get("address").toString());
            map.put("status", map.get("status"));