From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14: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 | 71 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 19 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 b8d1c5d..ebdf705 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
@@ -7,19 +7,21 @@
import com.dsh.course.feignClient.competition.model.Competition;
import com.dsh.course.feignClient.competition.model.CompetitionUser;
import com.dsh.course.feignClient.competition.model.GetPeopleQuery;
-import com.dsh.course.feignClient.competition.model.ListQuery;
import com.dsh.course.feignClient.course.CourseClient;
import com.dsh.course.feignClient.course.CoursePackageDiscountClient;
import com.dsh.course.feignClient.course.CoursePackagePaymentConfigClient;
-import com.dsh.course.feignClient.course.CoursePackageTypeClient;
import com.dsh.course.feignClient.course.model.*;
+import com.dsh.course.model.AuditDiscount;
+import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.base.tips.ErrorTip;
import com.dsh.guns.core.base.tips.SuccessTip;
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.ToolUtil;
+import com.dsh.guns.modular.system.model.DiscountUpdateState;
import com.dsh.guns.modular.system.model.TCity;
import com.dsh.guns.modular.system.model.TStore;
+import com.dsh.guns.modular.system.model.dto.CoursePackage;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.ICoursePackageService;
import com.dsh.guns.modular.system.service.IStoreService;
@@ -63,9 +65,6 @@
@Autowired
private CourseClient courseClient;
-
-
-
/**
* 跳转到车辆管理首页
*/
@@ -73,6 +72,7 @@
public String index(Model model) {
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
model.addAttribute("list",list);
+ model.addAttribute("role",UserExt.getUser().getObjectType());
return PREFIX + "TDiscount.html";
}
@RequestMapping("/audit")
@@ -143,8 +143,7 @@
private CoursePackageDiscountClient coursePackageDiscountClient;
@RequestMapping("/info")
public String info( Integer id, Model model) {
- TCoursePackage tCoursePackage1 = courseClient.queryByDiscountId(id);
- TCoursePackage tCoursePackage = coursePackageService.queryById(tCoursePackage1.getId());
+ TCoursePackage tCoursePackage = coursePackageService.queryById(id);
model.addAttribute("item", tCoursePackage);
List<CoursePackagePaymentConfig> list4 = coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(id);
List<Map<String, Object>> list = new ArrayList<>();
@@ -168,25 +167,19 @@
map.put("coursePackageDiscount", tCoursePackageDiscounts);
list.add(map);
}
+ model.addAttribute("role",UserExt.getUser().getObjectType());
+ model.addAttribute("type",tCoursePackage.getType());
model.addAttribute("coursePackagePaymentConfig", JSON.toJSONString(list));
return PREFIX + "coursePackageDiscount.html";
}
@RequestMapping("/infoOne")
public String infoOne( Integer id, Model model) {
- Integer state = courseClient.queryDiscountById(id);
- if(state==1){
- model.addAttribute("stateStr","待审核");
- model.addAttribute("state",1);
- }else {
- model.addAttribute("stateStr","未通过");
- model.addAttribute("state",3);
- }
-
- TCoursePackage tCoursePackage1 = courseClient.queryByDiscountId(id);
- TCoursePackage tCoursePackage = coursePackageService.queryById(tCoursePackage1.getId());
+ TCoursePackage tCoursePackage = coursePackageService.queryById(id);
model.addAttribute("item", tCoursePackage);
List<CoursePackagePaymentConfig> list4 = coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(id);
List<Map<String, Object>> list = new ArrayList<>();
+ // 拒绝理由
+ StringBuilder reasons = new StringBuilder("");
for (CoursePackagePaymentConfig coursePackagePaymentConfig : list4) {
if(coursePackagePaymentConfig.getCashPayment() == 0){
continue;
@@ -203,11 +196,45 @@
}
map.put("payment", payment);
map.put("cashPayment", coursePackagePaymentConfig.getCashPayment());
- List<TCoursePackageDiscount> tCoursePackageDiscounts = coursePackageDiscountClient.queryCoursePackageDiscountOne(coursePackagePaymentConfig.getId());
+ List<TCoursePackageDiscount> tCoursePackageDiscounts = coursePackageDiscountClient.queryCoursePackageDiscount(coursePackagePaymentConfig.getId());
+ for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
+ if (tCoursePackageDiscount.getAuditStatus()==3){
+ reasons.append(tCoursePackageDiscount.getAuditRemark()+",");
+ model.addAttribute("type1",3);
+ }else{
+ model.addAttribute("type1",-1);
+ }
+ }
map.put("coursePackageDiscount", tCoursePackageDiscounts);
list.add(map);
}
+ model.addAttribute("role",UserExt.getUser().getObjectType());
+ Integer type1 = tCoursePackage.getType();
+ // 审核状态
+ StringBuilder stringBuilder = new StringBuilder("");
+
+ switch (type1){
+ case 1:
+ stringBuilder.append("待审核");
+ break;
+ case 2:
+ stringBuilder.append("已通过");
+ break;
+ case 3:
+ stringBuilder.append("未通过");
+ break;
+ }
+ model.addAttribute("type",stringBuilder);
+
+ String string = reasons.toString();
+ if (!string.equals("")){
+ String substring = string.substring(0, string.length() - 1);
+ model.addAttribute("reasons", substring);
+ }else{
+ model.addAttribute("reasons", "");
+ }
model.addAttribute("coursePackagePaymentConfig", JSON.toJSONString(list));
+
return PREFIX1 + "coursePackageDiscount.html";
}
@@ -219,6 +246,12 @@
if(ToolUtil.isNotEmpty(shopName)){
wrapper.like(TStore::getName, shopName);
}
+ if(UserExt.getUser().getObjectType()==3){
+ wrapper.eq(TStore::getId, UserExt.getUser().getObjectId());
+ }
+ if(UserExt.getUser().getObjectType()==2){
+ wrapper.eq(TStore::getOperatorId, UserExt.getUser().getObjectId());
+ }
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())));
--
Gitblit v1.7.1