From 69ca3dc78191794f27a06411c479e3f16dcf39a3 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 16:53:35 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java | 6 +++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 7 ++-
cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml | 2
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 2 +
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java | 3 +
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 3 +
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 8 +++-
cloud-server-course/src/main/resources/mapper/TCoursePackageDiscountMapper.xml | 4 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java | 5 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java | 5 +-
cloud-server-management/src/main/webapp/WEB-INF/view/system/finance/Income.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html | 3 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html | 4 --
cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html | 5 +-
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 3 -
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 4 ++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html | 6 ---
17 files changed, 43 insertions(+), 29 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index fced99b..d122000 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -242,6 +242,8 @@
mapList.add(map);
}
}
+ }else {
+ mapList = mapList1;
}
if (mapList.size() > 0){
for (Map<String, Object> stringObjectMap : mapList) {
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 16ba99f..5f1d859 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -126,6 +126,8 @@
result.add(map);
}
}
+ }else {
+ result=result1;
}
if (result.size() > 0){
for (Map<String, Object> stringObjectMap : result) {
@@ -1148,7 +1150,9 @@
try {
Integer pointMerchandiseId = (Integer) map.get("pointMerchandiseId");
PointsMerchandise byId1 = pmdsService.getById(pointMerchandiseId);
-
+ if(Integer.valueOf(map.get("type").toString())!=1){
+ byId1.setStatus(2);
+ }
Integer quantityIssued = (Integer) map.get("quantityIssued");
Integer pickUpQuantity = (Integer) map.get("pickUpQuantity");
String redemptionInstructions = (String) map.get("redemptionInstructions");
@@ -1174,7 +1178,6 @@
}
-
@PostMapping("/base/pointMerchars/add")
public Integer add(@RequestBody PointsMerchandise pointsMerchandise){
Integer storeId = pointsMerchandise.getShelves();
@@ -1197,6 +1200,7 @@
+
@PostMapping("/base/pointMerchars/addOther")
public Boolean addOther(@RequestBody String pam){
Boolean save =false;
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 1c885e3..586013f 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
@@ -405,7 +405,8 @@
re.setPhone(appUser.getPhone());
re.setStoreName(store.getName());
// 在这里添加条件来删除不满足要求的元素
- if (appUser.getInsertType() != query.getInsertType()) {
+
+ if (query.getInsertType() !=null && appUser.getInsertType() != query.getInsertType()) {
iterator.remove(); // 使用迭代器的 remove 方法删除元素
}
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index 9d5ab1b..a3fda90 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -40,9 +40,6 @@
import com.dsh.course.util.*;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml
index 1fa4c2a..a556ed4 100644
--- a/cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml
@@ -55,7 +55,7 @@
and t1.payStatus = #{query.payStatus}
</if>
<if test="query.ids !=null and query.ids.size >0">
- and t2.storeId in <foreach collection="query.ids" close=")" item="id" open="(" separator=",">
+ and t2.id in <foreach collection="query.ids" close=")" item="id" open="(" separator=",">
#{id}
</foreach>
</if>
diff --git a/cloud-server-course/src/main/resources/mapper/TCoursePackageDiscountMapper.xml b/cloud-server-course/src/main/resources/mapper/TCoursePackageDiscountMapper.xml
index 62f0c90..273ed49 100644
--- a/cloud-server-course/src/main/resources/mapper/TCoursePackageDiscountMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/TCoursePackageDiscountMapper.xml
@@ -18,8 +18,8 @@
<select id="queryDiscountList" resultType="com.dsh.course.model.DiscountList">
select t1.id,t1.type,t1.status,t2.province pName,t2.city cName,t2.name,t2.storeId,t2.id courseId from t_course_package_discount t1 left join t_course_package t2 on t1.coursePackageId = t2.id
where t2.storeId in <foreach collection="ids" close=")" item="id" open="(" separator=",">
- #{id} and t1.auditStatus =2
- </foreach>
+ #{id}
+ </foreach> and t1.auditStatus =2
<if test="pCode !=null and pCode !=''">
and t2.provinceCode =#{pCode}
</if>
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java
index 4e8d7ca6..1e68f6a 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java
@@ -166,6 +166,9 @@
@TableField("cardType")
private Integer cardType;
+ @TableField("status")
+ private Integer status;
+
@Override
protected Serializable pkVal() {
return this.id;
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
index 77fda77..2f01335 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
@@ -81,6 +81,12 @@
model.addAttribute("list",list);
Integer roleType = UserExt.getUser().getObjectType();
model.addAttribute("roleType",roleType);
+ if(UserExt.getUser().getObjectType()==3){
+ List<TStore> list1 = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getId, UserExt.getUser().getObjectId()));
+ model.addAttribute("stores",list1);
+ }else {
+ model.addAttribute("stores",new ArrayList<>());
+ }
return PREFIX + "cpPayment_add.html";
}
/**
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
index 291bd82..6c9cd1f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
@@ -167,12 +167,13 @@
vo.setCity(cityManager.getCity());
vo.setCityCode(cityManager.getCityCode());
}else if (roleType == 3){
- TStoreStaff storeByStoreStaffId = storeStaffClient.getStoreByStoreStaffId(cityManagerId);
- Store storeById = storeClient.getStoreById(storeByStoreStaffId.getStoreId());
+// TStoreStaff storeByStoreStaffId = storeStaffClient.getStoreByStoreStaffId(cityManagerId);
+ Store storeById = storeClient.getStoreById(cityManagerId);
vo.setProvince(storeById.getProvince());
vo.setProvinceCode(storeById.getProvinceCode());
vo.setCity(storeById.getCity());
vo.setCityCode(storeById.getCityCode());
+ vo.setStoreId(cityManagerId);
}
bodySideAppointmentClient.addBodySideAppointments(vo);
return ResultUtil.success("添加成功");
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
index 48dd171..97b1408 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
@@ -228,7 +228,7 @@
public String income(Model model) {
Integer objectType = UserExt.getUser().getObjectType();
model.addAttribute("roleType",objectType);
- return PREFIX + "income.html";
+ return PREFIX + "Income.html";
}
/**
* 获取收入管理列表
@@ -647,8 +647,9 @@
if (userIds.size()==0){
return new ArrayList<>();
}
+ List<RegisterOrderVO> registerOrderVOS = coursePackagePaymentClient.listAllRegister(query);
- return coursePackagePaymentClient.listAllRegister(query);
+ return registerOrderVOS;
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index 1e517a9..606f8e5 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -410,6 +410,7 @@
stringObjectHashMap.put("cover",cover);
stringObjectHashMap.put("productImages",productImages);
stringObjectHashMap.put("sort",sort);
+ stringObjectHashMap.put("type",UserExt.getUser().getObjectType());
System.out.println(stringObjectHashMap);
pointMercharsClient.updateGoodsDetail(stringObjectHashMap);
return new SuccessTip<>();
@@ -481,6 +482,9 @@
pointsMerchandise.setState(1);
pointsMerchandise.setInsertTime(new Date());
pointsMerchandise.setCoursePackageConfigId(coursePackageConfigId);
+ if(UserExt.getUser().getObjectType()!=1){
+ pointsMerchandise.setStatus(2);
+ }
// 代替storeId
pointsMerchandise.setShelves(1);
if(typeAll!=2){
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 629df64..65d3de6 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
@@ -35,6 +35,7 @@
import groovyjarjarpicocli.CommandLine;
import net.bytebuddy.asm.Advice;
import org.apache.http.HttpResponse;
+import org.apache.poi.ss.formula.functions.T;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpRequest;
@@ -633,8 +634,10 @@
List<TStore> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId));
model.addAttribute("stores",operatorId);
}else if(objectType == 3){
- stores= storeClient.getStoreByStoreStaffId(objectId);
- model.addAttribute("stores",stores);
+ List<TStore> list = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getId, objectId));
+ model.addAttribute("stores",list);
+ }else {
+ model.addAttribute("stores",storeService.list(new QueryWrapper<TStore>().eq("operatorId", 0)));
}
List<TOperator> list = tOperatorService.list();
model.addAttribute("yysList",list);
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html
index b9e9b5f..418d4f7 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html
@@ -59,8 +59,9 @@
<#button name="开启" icon="fa-refresh" clickFun="TStudent.editCoursePackageState(0)" space="true"/>
<#button name="关闭" icon="fa-warning" clickFun="TStudent.editCoursePackageState(1)" space="true"/>
<#button name="查看详情" icon="fa-edit" clickFun="TStudent.openTStudentDetail3()" space="true"/>
-
+ @if(role =='1'){
<#button name="介绍管理" icon="fa-edit" clickFun="TStudent.openTStudentDetail1()" space="true"/>
+ @}
<#button name="数据统计" icon="fa-edit" clickFun="TStudent.openTStudentDetail5()" space="true"/>
@if(shiro.hasPermission("/tStudent/delete")){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html
index a84ef53..19d5197 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html
@@ -94,16 +94,17 @@
</div>
</div>
@}
- @if(roleType !=3){
<div class="form-group">
<label class="col-sm-3 control-label">*所属门店：</label>
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="store" name="store" onchange="TCompetition.nextStore(this)" >
<option value="">选择门店</option>
+ @for(obj in stores){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
</select>
</div>
</div>
- @}
<div class="form-group">
<label class="col-sm-3 control-label">*课包类型：</label>
<div class="col-sm-9">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/finance/Income.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/finance/Income.html
index 332c51f..4d2ad36 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/finance/Income.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/finance/Income.html
@@ -4,7 +4,7 @@
<div class="ibox float-e-margins">
<input hidden id="roleType" value="${roleType}">
<div class="ibox-title">
- <h5>报名订单</h5>
+ <h5>收入管理</h5>
</div>
<div class="ibox-content">
<div class="row row-lg">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html
index 32b099b..4c1619a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html
@@ -172,7 +172,6 @@
<button class="btn btn-outline btn-success" type="file" onclick="UploadFileFn()"><i class="fa fa-upload"></i>上传文件</button>
</div>
</div>
- @if(objectType==1){
<div class="row" id="app1">
<div class="form-group">
<label class="col-sm-3 control-label head-scu-label">*实景图片(请上传不超过五张图片): </label>
@@ -193,18 +192,13 @@
</div>
</div>
</div>
- @}
- @if(objectType==1){
<#input style="width: 300px" id="ids" name="*添加闸机:" placeholder="请输入闸机ID" type="text"/>
- @}
- @if(objectType==1){
<div class="form-group" style=" margin-left: 17%;" >
<label class="col-sm-1 control-label">场地说明：</label>
<div class="col-sm-5">
<textarea type="text/plain" id="editor" style="height: 300px;width: 800px;"></textarea>
</div>
</div>
- @}
<div class="row btn-group-m-t">
<div class="col-sm-10 col-sm-offset-5" >
<#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSite.addSubmit()"/>
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 a3718c9..bbee6db 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
@@ -202,7 +202,6 @@
<button class="btn btn-outline btn-success" type="file" onclick="UploadFileFn()"><i class="fa fa-upload"></i>上传文件</button>
</div>
</div>
- @if(objectType ==1){
<div class="row" id="app1">
<div class="form-group">
<label class="col-sm-3 control-label head-scu-label">*实景图片(请上传不超过五张图片): </label>
@@ -224,16 +223,13 @@
</div>
</div>
</div>
- @}
</div>
- @if(objectType==1){
<div class="form-group" style="margin-left: 205px;">
<label class="col-sm-1 control-label">*添加闸机:</label>
<div class="col-sm-9">
<input class="form-control" id="ids" name="ids" value="${list.ids}" type="text" style="width: 300px" placeholder="请输入闸机ID">
</div>
</div>
- @}
<div class="form-group" style="margin-left: 13%;display: inline-flex;margin-top: 16px;" >
<label class="col-sm-2 control-label">场地说明：</label>
<div class="col-sm-5" style="margin-left: -35px;">
--
Gitblit v1.7.1