xiaoyong931011
2021-07-07 cfbedea43be63bdcdd056ae0ed932767dc6deef0
20210707
2 files modified
74 ■■■■ changed files
gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java 16 ●●●● patch | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/service/UserService.java 58 ●●●● patch | view | raw | blame | history
gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java
@@ -78,14 +78,14 @@
     * 登陆时间
     */
    String loginTime;
//    @ApiModelProperty("推广人数")
//    Integer extensionNum;
//    @ApiModelProperty("订单数")
//    Integer allOrderNum;
//    @ApiModelProperty("环保金")
//    BigDecimal money;
//    @ApiModelProperty("积分数")
//    BigDecimal collectScore;
    @ApiModelProperty("推广人数")
    Integer extensionNum;
    @ApiModelProperty("订单数")
    Integer allOrderNum;
    @ApiModelProperty("环保金")
    BigDecimal money;
    @ApiModelProperty("积分数")
    BigDecimal collectScore;
    @ApiModelProperty("1:已删除 0:未删除")
    String delFlag;
gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
@@ -403,35 +403,35 @@
        orderStatus2.add("7");
        for (UserModel mx : map) {
//            //推广人数(暂时没有推广关系为空),订单数,环保金,积分
//            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);
//                if(CollUtil.isNotEmpty(orderInfos)){
//                    orderNum = orderNum + orderInfos.size();
//                }
//
//                List<JhyOrder> jhyOrders =  orderMapper.selectJhyOrderByUserId(mx.getUserId());
//                if(CollUtil.isNotEmpty(jhyOrders)){
//                    orderNum = orderNum + jhyOrders.size();
//                }
//                mx.setAllOrderNum(orderNum);
//                //环保金,积分
//                AccountInfo accountInfo = accountService.findByUserId(mx.getUserId());
//                if(ObjectUtil.isNotEmpty(accountInfo)){
//                    String money = accountInfo.getMoney();
//                    mx.setMoney(new BigDecimal(StrUtil.isEmpty(money) ? "0" : money).setScale( 2, BigDecimal.ROUND_DOWN ));
//
//                    String collectScore = StrUtil.isEmpty(accountInfo.getCollectScore()) ? "0":accountInfo.getCollectScore();
//                    mx.setCollectScore(new BigDecimal(collectScore).setScale( 2, BigDecimal.ROUND_DOWN ));
//                }
//
//            }
            //推广人数(暂时没有推广关系为空),订单数,环保金,积分
            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);
                if(CollUtil.isNotEmpty(orderInfos)){
                    orderNum = orderNum + orderInfos.size();
                }
                List<JhyOrder> jhyOrders =  orderMapper.selectJhyOrderByUserId(mx.getUserId());
                if(CollUtil.isNotEmpty(jhyOrders)){
                    orderNum = orderNum + jhyOrders.size();
                }
                mx.setAllOrderNum(orderNum);
                //环保金,积分
                AccountInfo accountInfo = accountService.findByUserId(mx.getUserId());
                if(ObjectUtil.isNotEmpty(accountInfo)){
                    String money = accountInfo.getMoney();
                    mx.setMoney(new BigDecimal(StrUtil.isEmpty(money) ? "0" : money).setScale( 2, BigDecimal.ROUND_DOWN ));
                    String collectScore = StrUtil.isEmpty(accountInfo.getCollectScore()) ? "0":accountInfo.getCollectScore();
                    mx.setCollectScore(new BigDecimal(collectScore).setScale( 2, BigDecimal.ROUND_DOWN ));
                }
            }
            //设置登录时间
            if (userModel.getExportFlag() == 0) {