From eb6b6dbb35a9f029e0b7d269773685c19fd40976 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 11 七月 2024 10:47:51 +0800
Subject: [PATCH] 玩湃微信商户认证代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index 65f9901..3d9f9a1 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -289,6 +289,12 @@
System.out.println("=========coursePackagePaymentConfig=============>" + coursePackagePaymentConfig);
// model.addAttribute("couponIds", "3,2");
}
+
+
+ Integer able = coursePackageClient.queryAble(id);
+
+ model.addAttribute("able",able);
+
return PREFIX + "coursePackage_edit.html";
}
@@ -387,6 +393,7 @@
System.out.println("=========coursePackagePaymentConfig=============>" + coursePackagePaymentConfig);
// model.addAttribute("couponIds", "3,2");
}
+
return PREFIX + "coursePackage_info.html";
}
@@ -425,6 +432,39 @@
}
model.addAttribute("role",UserExt.getUser().getObjectType());
model.addAttribute("type",tCoursePackage.getType());
+ List<TCoursePackageDiscount> tCoursePackageDiscounts = coursePackageDiscountClient.queryByCoursePackageId1(tCoursePackage.getId());
+ if (tCoursePackageDiscounts.size()>0){
+ TCoursePackageDiscount tCoursePackageDiscount = tCoursePackageDiscounts.get(0);
+ model.addAttribute("audit",tCoursePackageDiscount.getAuditStatus());
+ StringBuilder stringBuilder = new StringBuilder(" ");
+ // 如果折扣未通过
+ if (tCoursePackageDiscount.getAuditStatus() == 3){
+ model.addAttribute("state","未通过");
+ for (TCoursePackageDiscount coursePackageDiscount : tCoursePackageDiscounts) {
+ stringBuilder.append(coursePackageDiscount.getAuditRemark()+",");
+ }
+ if (!stringBuilder.equals("")){
+ String string = stringBuilder.toString();
+ String substring = string.substring(0, string.length() - 1);
+ model.addAttribute("reasons",substring);
+ }else{
+ model.addAttribute("reasons",stringBuilder);
+ }
+ }else{
+ model.addAttribute("reasons",stringBuilder);
+ }
+ if(tCoursePackageDiscount.getAuditStatus() == 2){
+ model.addAttribute("state","已通过");
+ }
+ if (tCoursePackageDiscount.getAuditStatus() == 1){
+ model.addAttribute("state","待审核");
+ }
+ }else{
+ model.addAttribute("audit",2);
+ model.addAttribute("state",0);
+ model.addAttribute("reasons","");
+ }
+
model.addAttribute("coursePackagePaymentConfig", JSON.toJSONString(list));
return PREFIX + "coursePackageDiscount.html";
}
@@ -816,6 +856,31 @@
List<TSite> list = siteService.list(new QueryWrapper<TSite>().select("id","name").eq("storeId", storeId).eq("state", 1));
return list;
}
+ /**
+ * 根据门店id获取场地
+ * @param storeId
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/querySite1")
+ public List<TSite> querySite1(Integer storeId,Integer type){
+ List<TSite> list = new ArrayList<>();
+ if (type==1){
+ list = siteService.list(new QueryWrapper<TSite>()
+ .select("id","name")
+ .eq("storeId", storeId)
+ .eq("state", 1)
+ .eq("ishalf",type));
+ }else{
+ list = siteService.list(new QueryWrapper<TSite>()
+ .select("id","name")
+ .eq("storeId", storeId)
+ .eq("state", 1)
+ );
+ }
+
+ return list;
+ }
/**
@@ -999,16 +1064,17 @@
@ResponseBody
@PostMapping("/updateCoursePackage")
public ResultUtil updateCoursePackage(TCoursePackage coursePackage, String coursePackagePaymentConfig){
-
// System.out.println("=======getClassStartTime============"+classStartTime);
String startTime = coursePackage.getClassStartTime();
- JSONArray jsonArray = JSON.parseArray(startTime);
+ String s = startTime.replaceAll(" ", "");
+
+ JSONArray jsonArray = JSON.parseArray(s);
System.out.println("=======jsonArray==========="+jsonArray);
List<String> first = new ArrayList<>();
List<String> second = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
-// JSONObject jsonObject = JSON.parseObject(jsonArray.getString(i));
+// JSONObject jsonObject = JSON.parseObject(jsonArray.getString(i));
String jsonString = jsonArray.getString(i);
String[] split = jsonString.split("-");
@@ -1060,7 +1126,7 @@
public ResultUtil editCoursePackageState1(Integer id, Integer state){
TCoursePackage coursePackage = new TCoursePackage();
coursePackage.setId(id);
- coursePackage.setStatus(state);
+ coursePackage.setState(state);
coursePackageService.editCoursePackageState(coursePackage);
return ResultUtil.success();
}
@@ -1232,7 +1298,7 @@
*/
@ResponseBody
@PostMapping("/makeUpMissedLessons")
- public ResultUtil makeUpMissedLessons(Long id){
+ public ResultUtil makeUpMissedLessons(Integer id){
System.out.println("==========coursePackage补课PaymentId======"+id);
return coursePackageService.makeUpMissedLessons(id);
}
--
Gitblit v1.7.1