From f8c9479d2f33515376e5c0d87734edec2e15ad6f Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 15 十一月 2023 09:31:27 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index 0e3e385..e4456c8 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -346,6 +346,13 @@
}
}
}
+ if(re.getCashPayment()==null){
+ BigDecimal bigDecimal = new BigDecimal("0.00");
+ re.setDiscountAmount(bigDecimal);
+ continue;
+ }
+ BigDecimal subtract = re.getOriginalPrice().subtract(re.getCashPayment());
+ re.setDiscountAmount(subtract);
}
if (query.getPayStudent()== null || query.getPayStudent().equals("")){
if (query.getPayUser()== null || query.getPayUser().equals("")){
@@ -376,21 +383,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 +409,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;
}
--
Gitblit v1.7.1