From 6eed4f4600ba2c2d7b5d3cc14a1e0a9e4d8f0d83 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 17 十月 2023 10:09:19 +0800
Subject: [PATCH] 10.17
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 4 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 8 +++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html | 4 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java | 3 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 19 ++++++++-
cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java | 32 ++++++++++++++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 11 +----
cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java | 1
8 files changed, 66 insertions(+), 16 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index b0f28e2..0f9bb3c 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -419,13 +419,13 @@
@ApiImplicitParam(value = "使用状态 （1已使用 2未使用）", name = "useType", required = false, dataType = "string"),
@ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "goodType", required = false, dataType = "int"),
})
- public ResultUtil<List<ExchangeDetailsResponse>> exchangeRecordsDetails(Integer useType, Integer goodType){
+ public ResultUtil<List<ExchangeDetailsResponse>> exchangeRecordsDetails(Integer useType, Integer goodType,Integer page,Integer size){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(uicService.queryExchangeGoodsdetails(userIdFormRedis,useType,goodType));
+ return ResultUtil.success(uicService.queryExchangeGoodsdetails1(userIdFormRedis,useType,goodType,page,size));
}catch (Exception e){
return ResultUtil.runErr();
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java b/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java
index 9591ece..2a2b6e9 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java
@@ -40,4 +40,5 @@
Page<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery);
+ List<ExchangeDetailsResponse> queryExchangeGoodsdetails1(Integer userIdFormRedis, Integer useType, Integer goodType, Integer page, Integer size);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
index a5faf58..0f8e9ea 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
@@ -169,4 +169,36 @@
}
return userIntegrals;
}
+
+ @Override
+ public List<ExchangeDetailsResponse> queryExchangeGoodsdetails1(Integer userIdFormRedis, Integer useType, Integer goodType, Integer page, Integer size) {
+ List<ExchangeDetailsResponse> detailsResponses = new ArrayList<>();
+ ExchangeDetailsVo integralExchangeDetails = mcClient.getIntegralExchangeDetails(userIdFormRedis);
+ if (ToolUtil.isNotEmpty(integralExchangeDetails.getDetailsResponses())){
+ detailsResponses = integralExchangeDetails.getDetailsResponses();
+ if (ToolUtil.isNotEmpty(useType)){
+ detailsResponses = detailsResponses.stream()
+ .filter(response -> Objects.equals(response.getUseStatus(), useType))
+ .collect(Collectors.toList());
+ }
+ if (ToolUtil.isNotEmpty(goodType)){
+ detailsResponses = detailsResponses.stream()
+ .filter(response -> Objects.equals(response.getGoodType(), goodType))
+ .collect(Collectors.toList());
+ }
+ }
+
+ int totalItems = detailsResponses.size();
+ int totalPages = (int) Math.ceil((double) totalItems / size);
+ int startIndex = (page - 1) * size;
+ int endIndex = Math.min(startIndex + size, totalItems);
+
+ if (startIndex <= endIndex) {
+ detailsResponses = detailsResponses.subList(startIndex, endIndex);
+ } else {
+ detailsResponses.clear();
+ }
+
+ return detailsResponses;
+ }
}
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 a32acdf..ffe051a 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
@@ -727,12 +727,27 @@
}
+ /**
+ * 根据门店id获取场地
+ * @param storeId
+ * @return
+ */
@ResponseBody
@PostMapping("/querySite")
- public List<TSite> querySite2(){
- return null;
+ public List<TSite> querySite4(Integer storeId){
+ System.out.println("==storeId==="+storeId);
+ List<TSite> list = siteService.list(new QueryWrapper<TSite>().select("id","name").eq("storeId", storeId).eq("state", 1));
+ return list;
}
+
+
+// @ResponseBody
+// @PostMapping("/querySite")
+// public List<TSite> querySite2(){
+// return null;
+// }
+
@ResponseBody
@PostMapping("/querySite/")
public ResultUtil querySite1(){
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
index 4efb096..83902c9 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -1,6 +1,7 @@
package com.dsh.guns.modular.system.controller.code;
import java.math.BigDecimal;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.crypto.SecureUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -371,8 +372,13 @@
for (String s : nextName.split(",")) {
strings1.add(s);
}
- model.addAttribute("nextNames",strings1);
+ System.out.println("========="+strings1);
+ System.out.println("====000====="+strings1.get(0));
+ if (CollectionUtil.isNotEmpty(strings1)) {
+ System.out.println("====执行===");
+ model.addAttribute("nextNames", strings1);
+ }
String halfNames = site.getHalfName();
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 99df168..fa6d95a 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -516,8 +516,6 @@
List<OrderDto> timeRanges = new ArrayList<>();
-
-
Site site = siteClient.listById(book.getSiteId());
System.out.println("================"+site);
String appointmentStartTime = site.getAppointmentStartTime();
@@ -556,9 +554,6 @@
if (strings1.contains(timeRange)){
orderDto.setState(1);
}
-
-
-
timeRanges.add(orderDto);
currentTime = nextTime;
@@ -902,9 +897,9 @@
LocalTime targetTime = LocalTime.parse(currentTime);
boolean hasExceeded = currentTime1.isAfter(targetTime);
- if (hasExceeded){
- orderDto.setState(0);
- }
+// if (hasExceeded){
+// orderDto.setState(0);
+// }
if (strings.contains(timeRange)){
orderDto.setState(0);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
index 6c71237..e097d63 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
@@ -206,7 +206,8 @@
// 判断账号是否重复
//Check if the account is duplicated
User theUser = userService.getByAccount(user.getAccount());
- if (theUser != null) {
+ System.out.println("=====theUser======="+theUser);
+ if (theUser != null&&user.getAccount()!="") {
throw new GunsException(BizExceptionEnum.USER_ALREADY_REG);
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html
index a2f92c1..b10d0ab 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html
@@ -1,4 +1,4 @@
-@layout("/common/_container.html"){
+ @layout("/common/_container.html"){
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
<style>
.avatar-uploader .el-upload {
@@ -128,7 +128,7 @@
<div class="form-group" id="siteMore" style=" margin-left: 255px;">
<div class="form-group">多场地配置：<i class="fa fa-plus" onclick="addBox()"></i></div>
- @for(n in nextNames){
+ @for(n in nextNames!){
<div class="col-sm-8 control-label" id="far">
<label class="col-sm-2 control-label">*单个场地名</label>
<div class="col-sm-3">
--
Gitblit v1.7.1