202107016

xiaoyong931011

2021-07-16 d1068115eccec5ab657f3fcfd6750bb4028eda80

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

@@ -305,6 +305,9 @@
        if(CollUtil.isNotEmpty(orderItemsVos)){
            for(OrderItemsVo orderItemsVo : orderItemsVos){
                if(ObjectUtil.isNotEmpty(orderItemsVo)){
                    String nickname = orderItemsVo.getNickname();
                    String decode = StringUtils.decode(nickname);
                    orderItemsVo.setNickname(decode);
                    Long orderId = orderItemsVo.getOrderId();
                    List<JhyOrderItems> jhyOrderItems = accountMapper.selectOrderById(orderId);
                    if(CollUtil.isNotEmpty(jhyOrderItems)){
@@ -346,9 +349,9 @@
                    String decode = StringUtils.decode(nickname);
                    distribDataListVo.setNickname(decode);
                    String id = distribDataListVo.getId();
                    String kg = accountMapper.selectOrderByHeadUserId(id);
                    String kg = accountMapper.selectOrderByHeadUserId(id,distribDataListDto);
                    distribDataListVo.setKg(kg);
                    String jdsl = accountMapper.selectJDSLByHeadUserId(id);
                    String jdsl = accountMapper.selectJDSLByHeadUserId(id,distribDataListDto);
                    distribDataListVo.setJdsl(jdsl);
                }
            }
@@ -380,9 +383,9 @@
                    String decode = StringUtils.decode(nickname);
                    distribDataListVo.setNickname(decode);
                    String id = distribDataListVo.getId();
                    String kg = accountMapper.selectOrderByHeadUserId(id);
                    String kg = accountMapper.selectOrderExportByHeadUserId(id,distribDataListDto);
                    distribDataListVo.setKg(kg);
                    String jdsl = accountMapper.selectJDSLByHeadUserId(id);
                    String jdsl = accountMapper.selectJDSLExportByHeadUserId(id,distribDataListDto);
                    distribDataListVo.setJdsl(jdsl);
                }
            }