后台bug修改

44323

2023-11-14 ddbb38c54db9c3670e5ff53f4bf713525de1099d

 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java

@@ -330,7 +330,8 @@
                    re.setBuyTypeName("手动支付"+"-"+re.getBuyTypeName());
                }
            }

            BigDecimal subtract = re.getOriginalPrice().subtract(re.getCashPayment());
            re.setDiscountAmount(subtract);
            // 如果支付用户类型为管理员 则购买方式则为1线下购买
            if (re.getPayUserType()!=null){
                if (re.getPayUserType()== 2){
@@ -376,21 +377,22 @@
        }
        List<RegisterOrderVO> res = packagePaymentService.listAllRegister(query);
        // 该运营商下没有门店
        if (query.getStoresIds()!=null){
            if (query.getStoresIds().size()==0){
        if (query.getInsertType() == 2){
            if (query.getStoresIds()!=null){
                if (query.getStoresIds().size()==0){
                    List<RegisterOrderVO> registerOrderVOS = new ArrayList<>();
                    return registerOrderVOS;
                }
            }else{
                List<RegisterOrderVO> registerOrderVOS = new ArrayList<>();
                return registerOrderVOS;
            }
        }else{
            List<RegisterOrderVO> registerOrderVOS = new ArrayList<>();
            return registerOrderVOS;
        }

        List<RegisterOrderVO> result = new ArrayList<>();
        Iterator<RegisterOrderVO> iterator = res.iterator();
        while (iterator.hasNext()) {
            RegisterOrderVO re = iterator.next();

            if (re.getSalesName() == null) {
                re.setSalesName("无");
            }
@@ -401,18 +403,17 @@
                    re.setPayMoneyAndType("￥" + re.getMoney());
                }
            }
            Store store = storeClient.queryStoreById(re.getStoreId());
            if (re.getStoreId()!=null){
                Store store = storeClient.queryStoreById(re.getStoreId());
                if (store!=null){
                    re.setStoreName(store.getName());
                }
            }
            TAppUser appUser = appUserClient.queryAppUser1(re.getAppUserId());
            Student student = studentClient.queryStudentById(re.getStudentId());
            re.setPayStudent(student.getName());
            re.setPayUser(appUser.getName());
            re.setPhone(appUser.getPhone());
            re.setStoreName(store.getName());
            // 在这里添加条件来删除不满足要求的元素

            if (query.getInsertType() !=null && appUser.getInsertType() != query.getInsertType()) {
                iterator.remove(); // 使用迭代器的 remove 方法删除元素
            }
        }
        return res;
    }