From 695ff7ec8bd12b6cf32b77902bd5cfb44419b835 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 09:06:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
index ebdf705..720a211 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
@@ -234,6 +234,7 @@
model.addAttribute("reasons", "");
}
model.addAttribute("coursePackagePaymentConfig", JSON.toJSONString(list));
+ model.addAttribute("type2",tCoursePackage.getType());
return PREFIX1 + "coursePackageDiscount.html";
}
@@ -254,7 +255,9 @@
}
List<TStore> list = storeService.list(wrapper);
Page<DiscountList> page = new PageFactory<DiscountList>().defaultPage();
- List<DiscountList> discountLists = courseClient.queryDiscountList(new QueryDiscountList(page.getCurrent(),page.getSize(),provinceCode,cityCode,name,type,list.stream().map(TStore::getId).collect(Collectors.toList())));
+ List<DiscountList> discountLists = courseClient.queryDiscountList(new QueryDiscountList
+ (page.getCurrent(),page.getSize(),provinceCode,cityCode,name,type,
+ list.stream().map(TStore::getId).collect(Collectors.toList())));
for (DiscountList discountList : discountLists) {
for (TStore tStore : list) {
if(discountList.getStoreId().equals(tStore.getId())){
--
Gitblit v1.7.1