From aa45df63fa01b2f010560e4157f00bec5150a1fb Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:08:15 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 7
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html | 30 +
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/ListQuery.java | 3
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 7
cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml | 3
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 18
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/ListQuery.java | 3
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 73 ++--
cloud-server-management/src/main/java/com/dsh/course/feignClient/other/BallClient.java | 6
cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java | 6
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js | 11
cloud-server-management/src/main/webapp/static/modular/system/tCoach/tCoach_add.js | 49 +-
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html | 30
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js | 67 ++-
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoach/TCoach_add.html | 4
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoach/TCoach_edit.html | 29 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java | 132 +++++-
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html | 2
cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/GameDataQuery.java | 9
cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/GameDataQuery.java | 9
cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TGameRecord.java | 69 +++
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 35 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 85 +++-
cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java | 25 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java | 9
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html | 97 +++-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java | 2
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 3
cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html | 228 +++++++-----
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 15
31 files changed, 722 insertions(+), 346 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 45e369e..8295c52 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -1293,9 +1293,6 @@
@Transactional
public synchronized ResultUtil productRedemptionOperation(Integer userIdFormRedis, GoodsExchangeVo exchangeType) {
System.out.println("exchangeType:--->");
-
-
-
ReturnModel returnModel = new ReturnModel();
Long returnId = null;
//如果是兑换优惠卷
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 4869ee0..4eb962e 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
@@ -182,8 +182,6 @@
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)){
@@ -197,10 +195,6 @@
.collect(Collectors.toList());
}
}
-
-
-
-
int totalItems = detailsResponses.size();
int startIndex = (page - 1) * size;
int endIndex = Math.min(startIndex + size, totalItems);
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 3d82719..936ea1c 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
@@ -841,22 +841,41 @@
List<Integer> rid= stoClient.querySiteIdById(storeIds);
detailsResponse.setRid(rid);
}
-
-
}else if(merchandise.getUseScope()==3){
// 指定门店
- List<PointsMerchandiseStore> list = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>().eq(PointsMerchandiseStore::getPointsMerchandiseId, merchandise.getId()));
+ List<PointsMerchandiseStore> list = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>()
+ .eq(PointsMerchandiseStore::getPointsMerchandiseId, merchandise.getId()));
List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
detailsResponse.setSid(collect);
if(collect.size()>0){
// 获取rid
- List<Integer> rid= stoClient.querySiteIdById(collect);
- detailsResponse.setRid(rid);
+// List<Integer> rid= stoClient.querySiteIdById(collect);
+ //detailsResponse.setRid(rid);
+ // todo 修改区域id 临时
+ // 根据门店id 写死区域id 后续调整为门票指定多个区域
+ // 以下代码均为临时代码
+ for (Integer integer : collect) {
+ ArrayList<Integer> list2 = new ArrayList<>();
+ if (integer==2024){
+ list2.add(32);
+ detailsResponse.setRid(list2);
+ }
+ // 临时 根据门票id 指定的区域
+ if (integer==9919){
+ if (pointsMerchandise.getPointsMerchandiseId()==196||pointsMerchandise.getPointsMerchandiseId()==198){
+ // 返回儿童区id
+ ArrayList<Integer> list3 = new ArrayList<>();
+ list3.add(44);
+ detailsResponse.setRid(list3);
+ }else {
+ ArrayList<Integer> list3 = new ArrayList<>();
+ list3.add(43);
+ detailsResponse.setRid(list3);
+ }
+ }
+ }
}
-
}
-
-
if (merchandise.getCardType()==1){
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 9bdf0b2..eb1a15a 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -467,7 +467,6 @@
if(null != map){
String code = map.get("out_trade_no");
String trade_no = map.get("trade_no");
-
PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 2));
if(paymentCompetition.getPayStatus() == 1){
paymentCompetition.setAppUserId(null);
@@ -475,7 +474,6 @@
paymentCompetition.setPayTime(new Date());
paymentCompetition.setPayOrderNo(trade_no);
paymentCompetitionService.updateById(paymentCompetition);
-
Competition competition = cttService.getById(paymentCompetition.getCompetitionId());
competition.setApplicantsNumber(competition.getApplicantsNumber() + 1);
cttService.updateById(competition);
@@ -621,18 +619,21 @@
wrapper.lt(Competition::getStartTime,listQuery.getTime().split(" - ")[0]+" 00:00:00");
wrapper.gt(Competition::getEndTime,listQuery.getTime().split(" - ")[1]+" 23:59:59");
}
-
if(ToolUtil.isNotEmpty(listQuery.getRegisterCondition())){
wrapper.eq(Competition::getRegisterCondition,listQuery.getRegisterCondition());
}
-
+ // 平台查询审核通过的赛事
+ if (listQuery.getObj()==1){
+ wrapper.eq(Competition::getAuditStatus,2);
+ }
+ // 赛事审核
+ if (listQuery.getObj()==-1){
+ wrapper.ne(Competition::getAuditStatus,2);
+ }
wrapper.in(Competition::getStoreId,listQuery.getIds());
- wrapper.eq(Competition::getAuditStatus,2);
wrapper.orderByDesc(Competition::getInsertTime);
-
Page<Competition> page = cttService.page(competitionPage, wrapper);
for (Competition record : page.getRecords()) {
-
// 查询当前赛事有多少人报名了
List<UserCompetition> competitionId = ucttService.list(new QueryWrapper<UserCompetition>()
.eq("competitionId", record.getId()));
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/ListQuery.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/ListQuery.java
index 68bb178..6e968c4 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/ListQuery.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/ListQuery.java
@@ -21,5 +21,6 @@
private Integer state;
private Integer registerCondition;
private List<Integer> ids;
-
+ // 角色类型 如果是平台1的话 查询审核通过的 如果是运营商查询所有属于
+ private Integer obj;
}
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 778b672..3c66c3b 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
@@ -130,6 +130,8 @@
private ICoursePackageSchedulingService coursePackageSchedulingService;
@Autowired
private CoursePackageStudentService coursePackageStudentService;
+ @Autowired
+ private TOrderService orderService;
private final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
@@ -157,6 +159,7 @@
*/
@RequestMapping("/base/coursePackagePayment/add")
public Object addCoursePackagePayment(@RequestBody TCoursePackagePayment packagePayment){
+
packagePayment.setInsertTime(new Date());
packagePayment.setInsertTime(new Date());
Integer studentId = packagePayment.getStudentId();
@@ -274,6 +277,7 @@
coursePackageStudent.setAppUserId(packagePayment.getAppUserId());
packagePaymentService.save(packagePayment);
coursePackageStudent.setCoursePackagePaymentId(packagePayment.getId());
+
return coursePackageStudentService.save(coursePackageStudent);
}
/**
@@ -2341,7 +2345,7 @@
for (TCoursePackagePayment tCoursePackagePayment : list1) {
for (TCoursePackage tCoursePackage : list2) {
if(tCoursePackagePayment.getCoursePackageId().equals(tCoursePackage.getId())){
- tCoursePackagePayment.setType(tCoursePackage.getType());
+ tCoursePackagePayment.setType(tCoursePackage.getCoursePackageTypeId());
}
}
}
@@ -2377,6 +2381,7 @@
List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.listOne(userPt);
int sum = tCoursePackagePayments.stream().mapToInt(TCoursePackagePayment::getTotalClassHours).sum();
int sum1 = tCoursePackagePayments.stream().mapToInt(TCoursePackagePayment::getLaveClassHours).sum();
+ // 查询介绍有礼课时数量
map.put("allCourse",sum-sum1);
//所有课包
diff --git a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
index 5d7eeb1..93c3dd4 100644
--- a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
@@ -215,7 +215,8 @@
</select>
<select id="listOne" resultType="com.dsh.course.entity.TCoursePackagePayment">
- select * from t_course_package_payment where appUserId in <foreach collection="ids" separator="," open="(" item="id" close=")">#{id}</foreach>
+ select * from t_course_package_payment where appUserId in
+ <foreach collection="ids" separator="," open="(" item="id" close=")">#{id}</foreach>
</select>
<select id="queryStore" resultType="java.lang.Integer">
SELECT
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/ListQuery.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/ListQuery.java
index e9bfbdd..16da73f 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/ListQuery.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/ListQuery.java
@@ -22,5 +22,6 @@
private Integer state;
private Integer registerCondition ;
private List<Integer> ids;
-
+ // 角色类型 如果是平台1的话 查询审核通过的 如果是运营商查询所有属于
+ private Integer obj;
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/BallClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/BallClient.java
index d62b570..528b5ab 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/BallClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/BallClient.java
@@ -3,6 +3,8 @@
import com.dsh.course.dto.StudentSearch;
import com.dsh.course.dto.TStudentDto;
import com.dsh.course.feignClient.other.model.Banner;
+import com.dsh.course.feignClient.other.model.GameDataQuery;
+import com.dsh.course.feignClient.other.model.TGameRecord;
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.model.dto.BallQueryDto;
import com.dsh.guns.modular.system.model.dto.BookingQuery;
@@ -16,6 +18,10 @@
@FeignClient(value = "mb-cloud-other")
public interface BallClient {
+
+ // 数据统计
+ @PostMapping("/student/getData")
+ List<TGameRecord> getData(@RequestBody GameDataQuery query);
// 根据门店ids 获取游戏记录
@PostMapping("/game/getGameByStoreIds")
List<Integer> getGameByStoreIds(@RequestBody List<Integer> storeIds);
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/GameDataQuery.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/GameDataQuery.java
new file mode 100644
index 0000000..069ab7f
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/GameDataQuery.java
@@ -0,0 +1,9 @@
+package com.dsh.course.feignClient.other.model;
+
+import lombok.Data;
+
+@Data
+public class GameDataQuery {
+ Integer objectId;
+ Integer storeId;
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TGameRecord.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TGameRecord.java
new file mode 100644
index 0000000..fe8604c
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TGameRecord.java
@@ -0,0 +1,69 @@
+package com.dsh.course.feignClient.other.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-10-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_game_record")
+public class TGameRecord extends Model<TGameRecord> {
+
+ private static final long serialVersionUID=1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @TableField("userId")
+ private Integer userId;
+
+ @TableField("gameId")
+ private Integer gameId;
+
+ /**
+ * 1玩湃币 2微信 3支付宝
+ */
+ @TableField("payType")
+ private Integer payType;
+
+ /**
+ * 金额
+ */
+ private BigDecimal money;
+
+ /**
+ * 0待支付 1已支付
+ */
+ private Integer status;
+
+ private String number;
+ @TableField("orderNo")
+ private String orderNo;
+
+ private Date time;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
index 6b1d951..a84e295 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
@@ -1,6 +1,8 @@
package com.dsh.guns.modular.system.controller.code;
+import com.alibaba.druid.sql.visitor.functions.If;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.feignClient.account.CityManagerClient;
import com.dsh.course.feignClient.account.CoachClient;
@@ -11,12 +13,10 @@
import com.dsh.course.feignClient.account.model.CoachType;
import com.dsh.course.feignClient.other.model.Site;
import com.dsh.guns.config.UserExt;
-import com.dsh.guns.modular.system.model.CoachChangeStateVO;
-import com.dsh.guns.modular.system.model.CoachQuery;
-import com.dsh.guns.modular.system.model.Store;
-import com.dsh.guns.modular.system.model.TStore;
-import com.dsh.guns.modular.system.service.IStoreService;
+import com.dsh.guns.modular.system.model.*;
+import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.util.ResultUtil;
+import org.bouncycastle.math.raw.Mod;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -41,6 +41,14 @@
private CoachClient coachClient;
@Autowired
private CityManagerClient cityManagerClient;
+ @Autowired
+ private ICityService cityService;
+ @Autowired
+ private TOperatorService operatorService;
+ @Autowired
+ private TOperatorCityService operatorCityService;
+ @Autowired
+ private IUserService userService;
/**
* 跳转教练管理首页
@@ -89,15 +97,8 @@
*/
@RequestMapping("/addCoach")
public String addCoach(Model model) {
- List<CityManager> province = cityManagerClient.listAll();
- Set<String> seenNames = new HashSet<>();
- List<CityManager> result = new ArrayList<>();
- for (CityManager cityManager : province) {
- if(!seenNames.contains(cityManager.getProvince())){
- result.add(cityManager);
- seenNames.add(cityManager.getProvince());
- }
- }
+ List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list1);
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
CoachQuery coachQuery = new CoachQuery();
@@ -106,7 +107,6 @@
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
model.addAttribute("data",data);
- model.addAttribute("list",result);
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
model.addAttribute("coachType",list);
@@ -119,6 +119,7 @@
@ResponseBody
@RequestMapping(value = "/add")
public ResultUtil addCoach(@RequestBody Coach coach) {
+
Integer objectId = UserExt.getUser().getObjectId();
if (UserExt.getUser().getObjectType() == 2){
coach.setCityManagerId(objectId);
@@ -149,6 +150,43 @@
coachClient.changeState(vo);
return ResultUtil.success();
}
+ /**
+ * 根据选择的市 查询有哪些运营商管理了所选的市
+ *
+ * @return
+ */
+ @RequestMapping("/getYys")
+ @ResponseBody
+ public Object getYys(String pCode,String cCode){
+ // 先获取管理全国的运营商
+ List<TOperator> type = operatorService.list(new QueryWrapper<TOperator>().eq("type", 1));
+ // 根据所选市 查询管理了这个市的运营商
+ // 获取管理指定区域的运营商的ID 然后去重
+ List<Integer> collect = operatorCityService.list(new QueryWrapper<TOperatorCity>()).stream().map(TOperatorCity::getOperatorId)
+ .distinct().collect(Collectors.toList());
+ // 遍历 判断当前运营商是否管理了所选市
+ for (Integer integer : collect) {
+ // 查询是否管理了省
+ TOperatorCity code = operatorCityService.getOne(new QueryWrapper<TOperatorCity>().eq("code", pCode).eq("operatorId",integer));
+ if (code==null)continue;
+ List<TOperatorCity> pid = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("pid", code.getId()));
+ // 如果pid长度为0 则说明管理整个省
+ if (pid.size()==0){
+ type.add(operatorService.getOne(new QueryWrapper<TOperator>()
+ .eq("id",integer)));
+ }
+ for (TOperatorCity tOperatorCity : pid) {
+ if (tOperatorCity.getCode().toString().equals(cCode)){
+ TOperator id = operatorService.getOne(new QueryWrapper<TOperator>()
+ .eq("id", tOperatorCity.getOperatorId()));
+ if (id!=null)type.add(id);
+ break;
+ }
+ }
+ }
+
+ return type;
+ }
/**
* 跳转修改教练页面
@@ -158,29 +196,54 @@
CoachQuery coachQuery = new CoachQuery();
coachQuery.setId(id);
List<CoachSerchVO> data = coachClient.listAll(coachQuery);
- List<CityManager> province = cityManagerClient.listAll();
- Set<String> seenNames = new HashSet<>();
- List<CityManager> result = new ArrayList<>();
- List<CityManager> city = new ArrayList<>();
- for (CityManager cityManager : province) {
- if(!seenNames.contains(cityManager.getProvince())){
- result.add(cityManager);
- seenNames.add(cityManager.getProvince());
+ List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ // 省
+ model.addAttribute("list",list1);
+ // 市
+ Integer code = cityService.getOne(new QueryWrapper<TCity>()
+ .eq("code", data.get(0).getProvinceCode())).getId();
+
+ List<TCity> pid = cityService.list(new QueryWrapper<TCity>().eq("parent_id", code));
+ model.addAttribute("city",pid);
+ // 获取所选省市下的运营商列表
+ // 先获取管理全国的运营商
+ List<TOperator> type = operatorService.list(new QueryWrapper<TOperator>().eq("type", 1));
+ // 根据所选市 查询管理了这个市的运营商
+ // 获取管理指定区域的运营商的ID 然后去重
+ List<Integer> collect = operatorCityService.list(new QueryWrapper<TOperatorCity>()).stream().map(TOperatorCity::getOperatorId)
+ .distinct().collect(Collectors.toList());
+ // 遍历 判断当前运营商是否管理了所选市
+ for (Integer integer : collect) {
+ // 查询是否管理了省
+ TOperatorCity code1 = operatorCityService.getOne(new QueryWrapper<TOperatorCity>()
+ .eq("code", data.get(0).getProvinceCode())
+ .eq("operatorId",integer)
+ );
+ if (code1==null)continue;
+ List<TOperatorCity> pid1 = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("pid", code1.getId()));
+ // 如果pid长度为0 则说明管理整个省
+ if (pid1.size()==0){
+ type.add(operatorService.getOne(new QueryWrapper<TOperator>()
+ .eq("id",integer)));
}
- if(data.get(0).getProvince().equals(cityManager.getProvince())){
- city.add(cityManager);
+ for (TOperatorCity tOperatorCity : pid1) {
+ if (tOperatorCity.getCode().toString().equals(data.get(0).getCityCode())){
+ TOperator id1 = operatorService.getOne(new QueryWrapper<TOperator>()
+ .eq("id", tOperatorCity.getOperatorId()));
+ if (id1!=null)type.add(id1);
+ break;
+ }
}
}
+
+
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
- List<CityManager> accounts = cityManagerClient.getAccount(data.get(0).getCity());
List<CoachType> list = coachTypeClient.list();
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
model.addAttribute("data",data.get(0));
- model.addAttribute("list",result);
- model.addAttribute("city",city);
- model.addAttribute("cityManagers",accounts);
+ model.addAttribute("cityManagers",type);
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
model.addAttribute("coachType",list);
@@ -261,7 +324,14 @@
Integer objectId = UserExt.getUser().getObjectId();
coachQuery.setOperatorId(objectId);
}
-
- return coachClient.listAll(coachQuery);
+ List<CoachSerchVO> coachSerchVOS = coachClient.listAll(coachQuery);
+ for (CoachSerchVO coachSerchVO : coachSerchVOS) {
+ Integer cityManagerId = coachSerchVO.getCityManagerId();
+ TOperator byId = operatorService.getById(cityManagerId);
+ Integer userId = byId.getUserId();
+ User byId1 = userService.getById(userId);
+ coachSerchVO.setNameAndPhone(byId.getName()+""+byId1.getPhone());
+ }
+ return coachSerchVOS;
}
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
index 29f5cb4..645571c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
@@ -14,8 +14,11 @@
import com.dsh.course.feignClient.course.*;
import com.dsh.course.feignClient.course.model.TCoursePackage;
import com.dsh.course.feignClient.course.model.TCoursePackagePayment;
+import com.dsh.course.feignClient.other.BallClient;
import com.dsh.course.feignClient.other.SiteClient;
import com.dsh.course.feignClient.other.StoreClient;
+import com.dsh.course.feignClient.other.model.GameDataQuery;
+import com.dsh.course.feignClient.other.model.TGameRecord;
import com.dsh.course.model.MoneyBack;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
@@ -88,6 +91,8 @@
private CoursePackageClient coursePackageClient;
@Autowired
private TOperatorService operatorService;
+ @Autowired
+ private BallClient ballClient;
/**
* 跳转到平台统计数据页面
*/
@@ -95,15 +100,9 @@
public String index(Model model) {
Object o = type1(null);
model.addAttribute("data",o);
-
-
-
// 教学统计
HashMap<String, Object> map = appUserClient.queryUserAge();
model.addAttribute("stuData",map);
-
-
-
return PREFIX + "platformIncome.html";
}
@@ -124,6 +123,8 @@
IncomeQuery incomeQuery = new IncomeQuery();
// 场地预约记录查询query
SiteBookingQuery siteBookingQuery = new SiteBookingQuery();
+ // 智慧球场查询query
+ GameDataQuery gameDataQuery = new GameDataQuery();
// 筛选运营商的是时候使用
List<Integer> storeIds = new ArrayList<>();
// 根据运营商ID 查询运营商下的所有门店
@@ -156,8 +157,8 @@
List<VipPayment> vipPayments = vipPaymentClient.registrationList(incomeQuery);
for (VipPayment vipPayment : vipPayments) {
IncomeVO temp = new IncomeVO();
- if (vipPayment.getPayStatus()==1){
- temp.setInsertTime(vipPayment.getInsertTime());
+ if (vipPayment.getState()!=3){
+ temp.setInsertTime(vipPayment.getPayTime());
incomeVOS.add(temp);
}
if (vipPayment.getAmount() != null) {
@@ -168,14 +169,13 @@
List<RechargeRecordsVO> rechargeRecordsVOS = financeClient.rechargeList(rechargeRecordsQuery);
for (RechargeRecordsVO rechargeRecordsVO : rechargeRecordsVOS) {
IncomeVO temp = new IncomeVO();
- temp.setInsertTime(rechargeRecordsVO.getInsertTime());
+ temp.setInsertTime(rechargeRecordsVO.getPayTime());
if (rechargeRecordsVO.getAmount() != null) {
temp.setAmount(rechargeRecordsVO.getAmount());
}
- if (rechargeRecordsVO.getPayStatus() ==1){
+ if (rechargeRecordsVO.getState() !=3){
incomeVOS.add(temp);
}
-
}
// 报名课程记录
List<RegisterOrderVO> registerOrderVOS = coursePackagePaymentClient.listAllRegister(query);
@@ -193,7 +193,6 @@
}
}
// query权限设置 获取运营商下的门店集合
-
if (roleType==2){
competitionQuery.setOperatorId(UserExt.getUser().getObjectId());
}
@@ -206,8 +205,9 @@
if (competition.getPayType()==3 || competition.getPayType()==4){
continue;
}
+ if (competition.getState()==3)continue;
IncomeVO temp = new IncomeVO();
- temp.setInsertTime(competition.getInsertTime());
+ temp.setInsertTime(competition.getPayTime());
if (competition.getAmount() != null) {
temp.setAmount(new BigDecimal(competition.getAmount().toString()));
}
@@ -220,9 +220,10 @@
List<SiteBooking> siteBookings = siteClient.listAll(siteBookingQuery);
for (SiteBooking siteBooking : siteBookings) {
IncomeVO temp = new IncomeVO();
- if(siteBooking.getStatus()!=3){
+ if(siteBooking.getStatus()==0 || siteBooking.getStatus()==5){
continue;
}
+ if (siteBooking.getPayType() ==3 || siteBooking.getPayType() ==4)continue;
temp.setInsertTime(siteBooking.getPayTime());
if (siteBooking.getPayMoney() != null) {
temp.setAmount(new BigDecimal(siteBooking.getPayMoney().toString()));
@@ -239,6 +240,39 @@
temp.setInsertTime(pointMerchandiseIncomeVo.getInsertTime());
if (pointMerchandiseIncomeVo.getCash()!=null){
temp.setAmount(pointMerchandiseIncomeVo.getCash());
+ incomeVOS.add(temp);
+ }
+ }
+ // 平台智慧球场
+ if (storeId==null&&operatorId==null){
+ gameDataQuery.setObjectId(0);
+ List<TGameRecord> data = ballClient.getData(gameDataQuery);
+ for (TGameRecord datum : data) {
+ IncomeVO temp = new IncomeVO();
+ temp.setAmount(datum.getMoney());
+ temp.setInsertTime(datum.getTime());
+ incomeVOS.add(temp);
+ }
+ }
+ // 运营商
+ if (operatorId!=null && storeId==null){
+ gameDataQuery.setObjectId(operatorId);
+ List<TGameRecord> data = ballClient.getData(gameDataQuery);
+ for (TGameRecord datum : data) {
+ IncomeVO temp = new IncomeVO();
+ temp.setAmount(datum.getMoney());
+ temp.setInsertTime(datum.getTime());
+ incomeVOS.add(temp);
+ }
+ }
+ // 门店
+ if (storeId!=null){
+ gameDataQuery.setStoreId(storeId);
+ List<TGameRecord> data = ballClient.getData(gameDataQuery);
+ for (TGameRecord datum : data) {
+ IncomeVO temp = new IncomeVO();
+ temp.setAmount(datum.getMoney());
+ temp.setInsertTime(datum.getTime());
incomeVOS.add(temp);
}
}
@@ -1262,7 +1296,6 @@
// 会员费
HashMap<String, Object> map1 = appUserClient.queryFee(queryDataFee);
Object fee1 = map1.get("fee1");
-
map.put("fee1",fee1);
//玩湃比
Object fee2 = map1.get("fee2");
@@ -1272,12 +1305,9 @@
map.put("fee3",map3.get("fee"));
Object data = map3.get("data");
map.put("courseData",data);
-
-
// 赛事收入
Double aDouble1 = competitionClient.queryFee(queryDataFee);
map.put("fee4",aDouble1);
-
// 订场
if(ids.size()==0){
ids.add(-1);
@@ -1291,15 +1321,28 @@
if(userIds.size()==0){
userIds.add(-1);
}
- vipPaymentLambdaQueryWrapper.in(SiteBooking::getAppUserId,userIds);
vipPaymentLambdaQueryWrapper.ne(SiteBooking::getStatus,0);
+ vipPaymentLambdaQueryWrapper.ne(SiteBooking::getStatus,5);
ArrayList<Integer> objects = new ArrayList<>();
objects.add(1);
objects.add(2);
vipPaymentLambdaQueryWrapper.in(SiteBooking::getPayType,objects);
- List<SiteBooking> list1 = siteBookingService.list(vipPaymentLambdaQueryWrapper);
+ List<SiteBooking> list1 = siteBookingService.list(new QueryWrapper<SiteBooking>()
+ .ne("status",0)
+ .ne("status",5)
+ .ne("payType",3)
+ .ne("payType",4));
double sum = list1.stream().mapToDouble(SiteBooking::getPayMoney).sum();
- map.put("fee5",sum);
+ // 智慧球场查询query
+ GameDataQuery gameDataQuery = new GameDataQuery();
+ gameDataQuery.setObjectId(0);
+ // 平台智慧球场
+ List<TGameRecord> data1 = ballClient.getData(gameDataQuery);
+ double sum1 = data1.stream()
+ .map(TGameRecord::getMoney) // 获取每个 TGameRecord 对象的 money 字段
+ .mapToDouble(BigDecimal::doubleValue) // 将 BigDecimal 转换为 double
+ .sum();
+ map.put("fee5",sum+sum1);
List<Integer> collect = list1.stream().map(SiteBooking::getSiteId).collect(Collectors.toList());
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java
index 9905cf4..73c887c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java
@@ -143,7 +143,7 @@
ids.add(-1);
}
Page<Competition> page = new PageFactory<Competition>().defaultPage();
- ListQuery listQuery = new ListQuery(page.getSize(),page.getCurrent(),provinceCode,cityCode,eventName,time,state,registerCondition,ids);
+ ListQuery listQuery = new ListQuery(page.getSize(),page.getCurrent(),provinceCode,cityCode,eventName,time,state,registerCondition,ids,0);
Page<Competition> competitions = competitionClient.listAudit(listQuery);
for (Competition competition : competitions.getRecords()) {
for (TStore tStore : list) {
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
index b5f9feb..9db64f7 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
@@ -163,10 +163,17 @@
model.addAttribute("province",list4);
}
model.addAttribute("operator",objectId);
+ // 查询当前运营商管理了哪些门店
+ List<TStore> stores = storeService
+ .list(new QueryWrapper<TStore>()
+ .eq("operatorId", UserExt.getUser().getObjectId()));
+ model.addAttribute("stores",stores);
}
if (UserExt.getUser().getObjectType()==1) model.addAttribute("operator",0);
TStore byId = storeService.getById(UserExt.getUser().getObjectId());
if (UserExt.getUser().getObjectType()==3) model.addAttribute("operator",byId.getOperatorId());
+ List<TOperator> list2 = tOperatorService.list();
+ model.addAttribute("yysList",list2);
return PREFIX + "TCompetition_add.html";
}
@@ -275,7 +282,7 @@
ids = operatorId;
}
Page<Competition> page = new PageFactory<Competition>().defaultPage();
- ListQuery listQuery = new ListQuery(page.getSize(),page.getCurrent(),provinceCode,cityCode,eventName,time,state,registerCondition,ids);
+ ListQuery listQuery = new ListQuery(page.getSize(),page.getCurrent(),provinceCode,cityCode,eventName,time,state,registerCondition,ids,UserExt.getUser().getObjectType());
Page<Competition> competitions = competitionClient.list(listQuery);
List<Competition> records = new ArrayList<>();
for (Competition competition : competitions.getRecords()) {
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index 4558895..381e544 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -161,11 +161,20 @@
@RequestMapping("/getProvinceYys")
@ResponseBody
public Object getProvinceYys(Integer operatorId) {
- // 获取运营商管理的所有省
- List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", operatorId)
- .eq("pid", 0));
+ // 判断当前运营商是管理全国还是指定区域
+ TOperator byId = tOperatorService.getById(operatorId);
+ // 说明是管理全国
+ if (byId.getType()==1){
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ return list;
+ }else{
+ // 获取运营商管理的所有省
+ List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", operatorId)
+ .eq("pid", 0));
+ return list;
+ }
- return list;
+
}
// 运营商根据省筛选市区
@RequestMapping("/getCityYys")
@@ -437,8 +446,6 @@
@ResponseBody
public Object list(TStore tStore,String time,String userName,String userPhone,String ids,Integer type,Integer yyId,String lat,String lon,String pCode1,String cCode1) {
try {
-
-
if(yyId==null || type==1){
yyId=0;
}
@@ -522,7 +529,7 @@
if (UserExt.getUser().getObjectType()==2){
tStore.setOperatorId(UserExt.getUser().getObjectId());
}
- storeService.save(tStore);
+
user.setObjectId(tStore.getId());
userService.updateById(user);
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
@@ -535,19 +542,6 @@
storeConfigs.add(storeConfig);
}
storeConfigService.saveBatch(storeConfigs);
- // 添加场地
- TSite tSite = new TSite();
- tSite.setName(tStore.getName());
- tSite.setStoreId(tStore.getId());
- tSite.setSign(1);
- siteService.save(tSite);
-
- HashMap<String, String> mapSite = new HashMap<>();
- mapSite.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- mapSite.put("name",tStore.getName());
- mapSite.put("space_id",tStore.getId().toString());
- mapSite.put("area_id",tSite.getId().toString());
- HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceArea", mapSite);
// 添加门店
HashMap<String, String> map1 = new HashMap<>();
map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
@@ -562,24 +556,31 @@
map1.put("remark",tStore.getIntroduce());
map1.put("lat",tStore.getLat());
map1.put("lng",tStore.getLon());
- map1.put("space_id",tStore.getId().toString());
String result = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpace", map1);
System.out.println(result);
-
-
-
- for (String s : tStore.getIds().split(",")) {
- HashMap<String, String> map = new HashMap<>();
- map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- map.put("space_id",tStore.getId()+"");
- map.put("device_id",s);
- map.put("region_id",tSite.getId().toString());
- // 添加门禁
- String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map);
- System.out.println(s1);
- }
-
-
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ JSONObject data = jsonObject.getJSONObject("data");
+ String space_id = data.getString("space_id");
+ Integer integer = Integer.valueOf(space_id);
+ tStore.setId(integer);
+ storeService.save(tStore);
+ System.err.println(tStore);
+// HashMap<String, String> mapSite = new HashMap<>();
+// mapSite.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+// mapSite.put("name",tStore.getName());
+// mapSite.put("space_id",tStore.getId().toString());
+// mapSite.put("area_id",tSite.getId().toString());
+// HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceArea", mapSite);
+// for (String s : tStore.getIds().split(",")) {
+// HashMap<String, String> map = new HashMap<>();
+// map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+// map.put("space_id",tStore.getId()+"");
+// map.put("device_id",s);
+// map.put("region_id",tSite.getId().toString());
+// // 添加门禁
+// String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map);
+// System.out.println(s1);
+// }
return new SuccessTip<>();
}catch (Exception e){
e.printStackTrace();
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 31a6afe..90d491e 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
@@ -472,19 +472,22 @@
site.setInsertTime(new Date());
site.setState(1);
site.setOperatorId(UserExt.getUser().getObjectId());
- Integer integer1 = siteClient.addSite(site);
+
// 添加场地
HashMap<String, String> map = new HashMap<>();
map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
map.put("name",site.getName());
map.put("space_id",store.getId().toString());
- map.put("area_id",integer1.toString());
String s = HttpRequestUtil.postRequest
("https://try.daowepark.com/v7/user_api/general/addSpaceArea", map);
// 添加门禁
JSONObject jsonObject = JSONObject.parseObject(s);
JSONObject data = jsonObject.getJSONObject("data");
+ String area_id = data.getString("area_id");
+ Integer integer = Integer.valueOf(area_id);
+ site.setId(integer);
+ Integer integer1 = siteClient.addSite(site);
// Integer integer = Integer.valueOf(spaceId);
if(StringUtils.hasLength( site.getIds())) {
for (String s1 : site.getIds().split(",")) {
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java
index 8adf9ff..6b71bf1 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java
@@ -12,7 +12,7 @@
@TableName("t_store")
@Data
public class TStore {
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.INPUT)
private Integer id;
@TableField("name")
private String name;
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html
index 999a7be..3f374b1 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html
@@ -172,6 +172,9 @@
$("#t1").val("")
$("#t2").val("")
$("#t3").val("")
+ $("#page").val("")
+ $("#type").val("")
+ $("#pageId").val("")
}else {
$("#t1").show()
$("#t2").show()
@@ -197,11 +200,15 @@
function updateOne(e) {
- console.log("看看选择页面")
console.log($('#page option:selected').text())
- if ($('#page option:selected').text()=="门店列表"){
+ var page= $('#page option:selected').text();
+ if (page=="门店列表" || page=="主页" || page=="充值中心"){
$("#t3").hide();
$("#t2").hide();
+ $("#t2").val("")
+ $("#t3").val("")
+ $("#type").val("")
+ $("#pageId").val("")
}
var oneId=$(e).val();
var ajax = new $ax(Feng.ctxPath + "/tShop/typeChangeOne", function(data){
@@ -216,12 +223,15 @@
console.log("=-======0000")
$("#t2").val("")
$("#t2").hide()
+ $("#type").val("")
}
});
if (oneId==2 || oneId==25|| oneId==27){
$("#t3").val("")
$("#t3").hide()
+
+ $("#pageId").val("")
}
ajax.set("id",oneId);
ajax.start();
@@ -246,6 +256,7 @@
if (oneId!="详情"&&oneId!="指定商品"&&oneId!="指定折扣"){
$("#t3").hide()
$("#t3").val("")
+ $("#pageId").val("")
}else{
$("#t3").show()
@@ -258,17 +269,32 @@
}
}
window.onload = function() {
+ if ($('#model option:selected').text()=="不跳转"){
+ $("#t1").hide();
+ $("#t2").hide();
+ $("#t3").hide();
+ $("#page").val("")
+ $("#type").val("")
+ $("#pageId").val("")
+ }
+
var temp = $("#turnId").val();
var res= document.getElementById("imgPX");
res.innerHTML ="推荐像素:780x472px";
if (temp==""){
$("#t3").hide();
+ $("#t3").val("")
+ $("#pageId").val("")
}
// 查看跳转页面 有没有跳转类型
var page = $('#page option:selected').text();
if (page=="门店列表" || page=="主页" || page=="充值中心" ){
$("#t2").hide();
$("#t3").hide();
+ $("#t2").val("")
+ $("#t3").val("")
+ $("#type").val("")
+ $("#pageId").val("")
}
}
</script>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html
index ccde8d9..a6007b2 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html
@@ -61,13 +61,11 @@
<div id="div2" class='table1' onclick="getContent(2)" style="border-right: 1px solid #333;">运营统计</div>
<div id="div3" class='table1' onclick="getContent(3)" style="border-right: 1px solid #333;">教学统计</div>
</div>
-
-
<div class="row" id="content1" style="margin-left: 100px;">
<div class="col-sm-11">
<div class="form-group">
<div class="col-sm-10">
- <h2>营收数据1</h2>
+ <h2>营收数据</h2>
</br>
<div id = "money1" style="width: 1500px" >
<span id="totalIncome">总营收:</span>
@@ -258,6 +256,14 @@
<script src="${ctxPath}/modular/system/dataStatistics/echarts.min.js"></script>
<script src="${ctxPath}/static/js/plugins/switchery/switchery.js"></script>
<script>
+ function search1() {
+ var time = $("#beginTime").val();
+ var ajax9 = new $ax(Feng.ctxPath + "/data/type1", function(data){
+
+ });
+ ajax9.set("time",time);
+ ajax9.start();
+ }
var ans = [];
var weekX = ["1周","2周","3周","4周"];
var monthX = ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"];
@@ -401,8 +407,6 @@
var myChart1 = echarts.init(document.getElementById('refund'));
var myChart7 = echarts.init(document.getElementById('courseData'));
-
-
var ajax3 = new $ax(Feng.ctxPath + "/data/backPt", function(data){
$("#back1").text(data.thisYear);
$("#back2").text(data.thisMonth);
@@ -546,63 +550,6 @@
ajax4.start();
-
-
-
-
- option7 = {
- tooltip: {
- trigger: 'axis'
- },
- legend: {
- data: ['年度耗课数量', '月度耗课数量', '周度耗课数量', '日度耗课数量']
- },
- grid: {
- left: '3%',
- right: '4%',
- bottom: '3%',
- containLabel: true
- },
- toolbox: {
- feature: {
- saveAsImage: {}
- }
- },
- xAxis: {
- type: 'category',
- boundaryGap: false,
- data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
- },
- yAxis: {
- type: 'value'
- },
- series: [
- {
- name: '年度耗课数量',
- type: 'line',
- stack: 'Total',
- data: [120, 132, 101, 134, 90, 230, 160, 190, 410, 330, 210, 330]
- },
- {
- name: '月度耗课数量',
- type: 'line',
- stack: 'Total',
- data: [220, 182, 191, 234, 290, 330, 310, 190, 210, 330, 410, 160]
- },
- {
- name: '周度耗课数量',
- type: 'line',
- stack: 'Total',
- data: [150, 232, 201, 154, 190, 330, 410, 160, 210, 195, 210, 188]
- },
- {
- name: '日度耗课数量',
- type: 'line',
- stack: 'Total',
- data: [320, 332, 301, 334, 390, 330, 320, 10, 195, 145, 188, 160]
- }
- ]
- };
myChart.on('legendselectchanged', obj => {
var options = myChart.getOption()
//这里是选择切换什么样的x轴，那么他会进行对Y值的切换
@@ -960,13 +907,9 @@
}
myChart6.setOption(options, true)
});
-
-
var ajax2 = new $ax(Feng.ctxPath + "/data/stuPt", function(data){
console.log(data)
-
$("#allUser").text(data.allUser)
-
option6 = {
tooltip: {
trigger: 'axis'
@@ -1032,39 +975,10 @@
});
ajax2.start()
myChart6.setOption(option6);
- }
-
- function ptCourse() {
- console.log("调用")
- var myChart7 = echarts.init(document.getElementById('courseData'));
- myChart7.on('legendselectchanged', obj => {
- var options = myChart7.getOption()
- //这里是选择切换什么样的x轴，那么他会进行对Y值的切换
- console.log("看看选择")
- console.log(obj.name)
- if (obj.name == '年度耗课数量') {
- console.log("看看年度轴")
- options.xAxis[0].data = yearX
- console.log(yearX)
- } else if (obj.name == '月度耗课数量') {
- console.log("看看月度轴")
- options.xAxis[0].data = monthX
- console.log(monthX)
- }else if (obj.name == '周度耗课数量') {
- options.xAxis[0].data = ["1周","2周","3周","4周"]
- }else if (obj.name == '日度耗课数量') {
- console.log("看看日度轴")
- options.xAxis[0].data = dataX
- console.log(dataX)
- }
- myChart7.setOption(options, true)
- });
var ajax2 = new $ax(Feng.ctxPath + "/data/coursePt", function(data){
console.log(data)
-
$("#allHour").text(data.allHour)
-
option7 = {
tooltip: {
trigger: 'axis'
@@ -1117,7 +1031,7 @@
name: '周度耗课数',
type: 'line',
stack: 'Total',
- data: [data.count,data.count1,data.count2,data.count3]
+ data: data.weekData
},
{
name: '日度耗课数',
@@ -1128,6 +1042,128 @@
]
};
});
+ console.log("调用")
+ var myChart7 = echarts.init(document.getElementById('courseData'));
+ myChart7.on('legendselectchanged', obj => {
+ var options = myChart7.getOption()
+ //这里是选择切换什么样的x轴，那么他会进行对Y值的切换
+ console.log("看看选择")
+ console.log(obj.name)
+ if (obj.name == '年度耗课数') {
+ console.log("看看年度轴")
+ options.xAxis[0].data = yearX
+ console.log(yearX)
+ } else if (obj.name == '月度耗课数') {
+ console.log("看看月度轴")
+ options.xAxis[0].data = monthX
+ console.log(monthX)
+ }else if (obj.name == '周度耗课数') {
+ options.xAxis[0].data = ["1周","2周","3周","4周"]
+ }else if (obj.name == '日度耗课数') {
+ console.log("看看日度轴")
+ options.xAxis[0].data = dataX
+ console.log(dataX)
+ }
+ myChart7.setOption(options, true)
+ });
+ ajax2.start()
+ myChart7.setOption(option7);
+ }
+
+ function ptCourse() {
+ var ajax2 = new $ax(Feng.ctxPath + "/data/coursePt", function(data){
+
+ $("#allHour").text(data.allHour)
+ console.log("周度")
+ console.log(data.weekData)
+ option7 = {
+ tooltip: {
+ trigger: 'axis'
+ },
+ legend: {
+ data: ['年度耗课数', '月度耗课数', '周度耗课数', '日度耗课数'],
+ icon: 'stack',
+ selectedMode: 'single', // 单选
+ selected: {
+ 年度耗课数: true,
+ 月度耗课数: false,
+ 周度耗课数: false,
+ 日度耗课数: false
+ },
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ toolbox: {
+ feature: {
+ saveAsImage: {}
+ }
+ },
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ data: yearX
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ name: '年度耗课数',
+ type: 'line',
+ stack: 'Total',
+ data: data.yearData
+ },
+ {
+ name: '月度耗课数',
+ type: 'line',
+ stack: 'Total',
+ data: data.monthData
+ },
+ {
+ name: '周度耗课数',
+ type: 'line',
+ stack: 'Total',
+ data: data.weekData
+ },
+ {
+ name: '日度耗课数',
+ type: 'line',
+ stack: 'Total',
+ data: data.dayData
+ }
+ ]
+ };
+ });
+ console.log("调用")
+ var myChart7 = echarts.init(document.getElementById('courseData'));
+ myChart7.on('legendselectchanged', obj => {
+ var options = myChart7.getOption()
+ //这里是选择切换什么样的x轴，那么他会进行对Y值的切换
+ console.log("看看选择")
+ console.log(obj.name)
+ if (obj.name == '年度耗课数') {
+ console.log("看看年度轴")
+ options.xAxis[0].data = yearX
+ console.log(yearX)
+ } else if (obj.name == '月度耗课数') {
+ console.log("看看月度轴")
+ options.xAxis[0].data = monthX
+ console.log(monthX)
+ }else if (obj.name == '周度耗课数') {
+ options.xAxis[0].data = ["1周","2周","3周","4周"]
+ }else if (obj.name == '日度耗课数') {
+ console.log("看看日度轴")
+ options.xAxis[0].data = dataX
+ console.log(dataX)
+ }
+ myChart7.setOption(options, true)
+ });
+
+
ajax2.start()
myChart7.setOption(option7);
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoach/TCoach_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoach/TCoach_add.html
index 3c6a243..4d1b2c2 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoach/TCoach_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoach/TCoach_add.html
@@ -43,13 +43,14 @@
<div class="ibox-content">
<div class="form-horizontal" id="carInfoForm">
<input hidden id="role" value="${role}">
+ @if(objectType==1){
<div class="form-group" id="provinceCode">
<label class="col-sm-3 control-label">*所在省：</label>
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="pCode" name="pCode" onchange="TSite.oneChange()">
<option value="">请选择省</option>
@for(obj in list){
- <option style="width: 300px" value="${obj.provinceCode}">${obj.province}</option>
+ <option style="width: 300px" value="${obj.code}">${obj.name}</option>
@}
</select>
</div>
@@ -62,7 +63,6 @@
</select>
</div>
</div>
- @if(objectType==1){
<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/tCoach/TCoach_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoach/TCoach_edit.html
index 0723fce..391e25d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoach/TCoach_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoach/TCoach_edit.html
@@ -29,7 +29,7 @@
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="pCode" name="pCode" onchange="TSite.oneChange()">
@for(obj in list){
- <option value="${obj.provinceCode}" ${obj.province == data.province ? 'selected=selected' : ''}>${obj.province}</option>
+ <option value="${obj.code}" ${obj.code == data.provinceCode ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
</div>
@@ -41,7 +41,7 @@
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="cCode" name="cCode" onchange="TSite.oneChangeNext(this)">
@for(obj in city){
- <option value="${obj.cityCode}" ${obj.city == data.city ? 'selected=selected' : ''}>${obj.city}</option>
+ <option value="${obj.code}" ${obj.code == data.cityCode ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
</div>
@@ -71,14 +71,12 @@
</select>
</div>
</div>
-
<div class="form-group" >
<label class="col-sm-3 control-label">*姓名：</label>
<div class="col-sm-9" style="display: flex;">
<input style="width: 300px" class="form-control" id="name" value="${data.name}" placeholder="请输入姓名" type="text">
</div>
</div>
-
<div class="form-group" >
<label class="col-sm-3 control-label">*生日：</label>
<div class="col-sm-9" style="display: flex">
@@ -184,8 +182,11 @@
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
<script>
- let id = "${pictures}"
- let obj = []
+ $(function() {
+ var id = "${pictures}"
+ })
+ var id = "${pictures}"
+ var obj = []
var vue2 = new Vue({
el: '#app1',
props: {
@@ -219,9 +220,10 @@
});
},
changeImg(){
- console.log("看看id")
- console.log(id)
var i = id.split(",")
+ console.log("看看后端返回的图片")
+ console.log(i.length)
+ console.log(i)
for (let j = 0; j <i.length; j++) {
let obj={
fileName:i[j],
@@ -230,13 +232,22 @@
response:i[j],
}
this.imageUrl2.push(obj)
+ console.log("看看res")
+ console.log(obj.response);
+ TSite.goodsPicArray.push(obj.response)
}
- console.log(this.imageUrl2)
},
},
created() {
this.changeImg()
TSite.goodsPicArray = this.imageUrl2
+ console.log("看看执行")
+ var temp = []
+ for (let i = 0; i < TSite.goodsPicArray.length; i++) {
+ temp.push(TSite.goodsPicArray[i].response)
+ }
+ TSite.goodsPicArray = temp;
+ console.log("赋值")
console.log(TSite.goodsPicArray)
},
});
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html
index 9c15f74..eba49ba 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html
@@ -6,7 +6,7 @@
<div class="ibox-title">
<h5>赛事管理</h5>
</div>
-
+ <input hidden id="type" value="${type}">
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
index b7445e2..35dadf3 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
@@ -49,23 +49,29 @@
<div class="form-horizontal" id="carInfoForm">
@if(type==1){
- <div class="form-group" >
- <label class="col-sm-3 control-label" id="yys1">所属运营商：</label>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*门店类型：</label>
<div class="col-sm-9">
- <select class="form-control" id="account" name="account" onchange="TCarInfoDlg.oneChange3(this)">
+ <input type="radio" name="type" value="1" onclick="updateType(1)" checked > 平台门店
+ <input type="radio" name="type" value="2" onclick="updateType(2)" id="radio1" > 运营商门店
+ </div>
+ </div>
+ <div id="yys" hidden>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*所属运营商：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="account" name="account" onchange="TCarInfoDlg.oneChange3(this)" >
<option value="">选择运营商</option>
@for(i in yysList){
- <option value="${i.id}">${i.name}</option>
+ <option value="${i.id}" >${i.name}</option>
@}
</select>
- <input type="checkbox" value="0" name="pt" id="pt" onchange="TCarInfoDlg.oneChangeYys(this)">平台</input>
</div>
</div>
<div class="form-group" id="provinceCode">
<label class="col-sm-3 control-label">所在省：</label>
<div class="col-sm-9">
<select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange9(this)">
-
</select>
</div>
</div>
@@ -77,28 +83,30 @@
</select>
</div>
</div>
- @}
- @if(type==2){
- <div class="form-group" id="provinceCode">
- <label class="col-sm-3 control-label">所在省：</label>
- <div class="col-sm-9">
- <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange9(this)">
- <option value="">选择省</option>
- @for(i in province){
- <option value="${i.code}">${i.name}</option>
- @}
- </select>
- </div>
</div>
- <div class="form-group" id="cityCode">
- <label class="col-sm-3 control-label">举办市：</label>
- <div class="col-sm-9">
- <select class="form-control" id="cCode" name="cCode" onchange="TCarInfoDlg.oneChangeNext9(this)">
- <option value="">选择市</option>
- </select>
+ <div id="yys1">
+ <div class="form-group" >
+ <label class="col-sm-3 control-label">所在省：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="pCode1" name="pCode" onchange="TCarInfoDlg.oneChange9(this)">
+ <option value="">选择省</option>
+ @for(i in list){
+ <option value="${i.code}" >${i.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group" >
+ <label class="col-sm-3 control-label">举办市：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="cCode1" name="cCode" onchange="TCarInfoDlg.oneChangeNext(this)">
+ <option value="">选择市</option>
+ </select>
+ </div>
</div>
</div>
+
@}
@if(type==1){
<div class="form-group" id="shop">
@@ -115,7 +123,10 @@
<label class="col-sm-3 control-label">举办门店：</label>
<div class="col-sm-9">
<select class="form-control" id="shopId" name="shopId" multiple>
-
+ <option value="">选择门店</option>
+ @for(i in stores){
+ <option value="${i.id}" >${i.name}</option>
+ @}
</select>
</div>
</div>
@@ -143,9 +154,9 @@
<div class="form-group">
<label class="col-sm-3 control-label">支付方式：</label>
<div class="col-sm-9">
- <input type="checkbox" onclick="updateType(1,this)"> 现金支付
- <input type="checkbox" onclick="updateType(2,this)"> 玩湃币支付
- <input type="checkbox" onclick="updateType(3,this)"> 课时支付
+ <input type="checkbox" onclick="updateType1(1,this)"> 现金支付
+ <input type="checkbox" onclick="updateType1(2,this)"> 玩湃币支付
+ <input type="checkbox" onclick="updateType1(3,this)"> 课时支付
</div>
</div>
@@ -364,6 +375,36 @@
}else {
$("#payType1").hide();
}
+ $("#yys").hide();
+ $("#yys1").show();
+ $("#pCode1").val("");
+ $("#cCode1").val("");
+ $("#pCode").val("");
+ $("#cCode").val("");
+
+ }
+ if(e==2){
+ if($(o).is(":checked")){
+ $("#payType2").show();
+ }else {
+ $("#payType2").hide();
+ }
+ $("#yys").show();
+ $("#yys1").hide();
+ $("#pCode1").val("");
+ $("#cCode1").val("");
+ $("#pCode").val("");
+ $("#cCode").val("");
+
+ }
+ }
+ function updateType1(e,o) {
+ if(e==1){
+ if($(o).is(":checked")){
+ $("#payType1").show();
+ }else {
+ $("#payType1").hide();
+ }
}
if(e==2){
if($(o).is(":checked")){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
index 4e76b09..5ba1c62 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
@@ -212,22 +212,8 @@
methods: {
handleAvatarSuccess(res, file) {
file.url =file.response
- TCarInfoDlg.goodsPicArray.push(file);
+ TCarInfoDlg.goodsPicArray.push(res);
console.log(TCarInfoDlg.goodsPicArray)
- },
- changeImg(){
- var i = id.split(",")
- for (let j = 0; j <i.length; j++) {
- let obj={
- fileName:i[j],
- uuid:i[j],
- url:i[j],
- response:i[j],
- }
- this.imageUrl2.push(obj)
-
- }
- console.log( this.imageUrl2,111)
},
beforeAvatarUpload(file) {
const isLt2M = file.size / 1024 / 1024 < 10;
@@ -240,7 +226,19 @@
TCarInfoDlg.goodsPicArray = TCarInfoDlg.goodsPicArray.filter(item => {
return item.uid != file.uid;
});
-
+ },
+ changeImg(){
+ var i = id.split(",")
+ for (let j = 0; j <i.length; j++) {
+ let obj={
+ fileName:i[j],
+ uuid:i[j],
+ url:i[j],
+ response:i[j],
+ }
+ this.imageUrl2.push(obj)
+ }
+ console.log( this.imageUrl2,111)
},
},
created() {
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCoach/tCoach_add.js b/cloud-server-management/src/main/webapp/static/modular/system/tCoach/tCoach_add.js
index a5ab2ea..e64677f 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCoach/tCoach_add.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCoach/tCoach_add.js
@@ -169,13 +169,13 @@
// 场地管理首页 选择对应的省市
// 传1是场地管理首页 传2是场地管理添加页面
TSite.oneChange = function () {
- var province = $('#pCode option:selected').text();
+ var province = $('#pCode').val();
var citySelect = document.getElementById("cCode");
- var ajax = new $ax(Feng.ctxPath + "/tSite/getCity", function(data){
+ var ajax = new $ax(Feng.ctxPath + "/tCompetition/onChange", function(data){
if(data!=null){
var content='<option value="">选择市</option>';
$.each(data, function(k,v) {
- content += "<option value='"+v.cityCode+"'>"+v.city+"</option>";
+ content += "<option value='"+v.code+"'>"+v.name+"</option>";
});
$("#cCode").empty().append(content);
}
@@ -185,14 +185,13 @@
$("#cCode").innerHTML = '<option value="">请先选择省/市</option>';
}
- ajax.set("province",province);
+ ajax.set("oneId",province);
ajax.start();
};
TSite.oneChangeNext = function (e) {
var oneId=$(e).val();
- var city = $('#cCode option:selected').text();
- var ajax = new $ax(Feng.ctxPath + "/tSite/accountChangeNext", function(data){
+ var ajax = new $ax(Feng.ctxPath + "/tCoach/getYys", function(data){
if(data!=null){
var content='<option value="">选择账号</option>';
$.each(data, function(k,v) {
@@ -201,26 +200,14 @@
$("#account").empty().append(content);
}
});
+
+ ajax.set("pCode",$("#pCode").val());
+ ajax.set("cCode",$("#cCode").val());
+ ajax.start();
if (oneId === ""){
$("#account").innerHTML = '<option style="width: 300px" value="">请先选择省/市</option>';
}
- ajax.set("oneId",city);
- ajax.start();
-
- // var ajax1 = new $ax(Feng.ctxPath + "/tSite/storeChangeNext", function(data){
- // if(data!=null && data.length !== 0){
- // var content='<option value="">选择门店</option>';
- // $.each(data, function(k,v) {
- // content += "<option style='width: 300px' value='"+v.id+"'>"+v.name+"</option>";
- // });
- // $("#store").empty().append(content);
- // }else {
- // storeSelect.innerHTML = '<option value="">当前所选市没有门店</option>';
- // }
- // });
- // ajax1.set("oneId",oneId);
- // ajax1.start();
};
/**
@@ -314,8 +301,6 @@
var em = "";// 门店经营结束时间：分钟
TSite.addSubmit = function(){
-
-
var data = {
id:null,
province:"",
@@ -364,7 +349,7 @@
temp = temp+","+TSite.goodsPicArray[i];
}
data.certificateImg = temp
-
+ if ($("#objectType").val()==1){
if($("#pCode").val()==''){
Feng.info("请选择省")
return;
@@ -376,6 +361,7 @@
if($("#account").val()=='' ){
Feng.info("请选择账号")
return;
+ }
}
if($("#coachTypeId").val()=='' ){
Feng.info("请选择教练类型")
@@ -447,8 +433,6 @@
});
};
TSite.editSubmit = function(){
-
-
var data = {
id:null,
province:"",
@@ -488,13 +472,16 @@
data.graduateSchool = $('#graduateSchool').val()
data.diploma = $('#img').val()
data.certificate = $('#certificate').val()
-
+ var goodImgs = this.goodsPicArray;
+ if(goodImgs.length==0){
+ Feng.info("请上传实景图")
+ return;
+ }
var temp = ""
-
for (let i = 0; i < TSite.goodsPicArray.length; i++) {
console.log("循环")
- console.log(TSite.goodsPicArray[i][`fileName`])
- temp = temp+","+TSite.goodsPicArray[i][`fileName`];
+ console.log(TSite.goodsPicArray[i])
+ temp = temp+","+TSite.goodsPicArray[i];
}
data.certificateImg = temp
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js
index 5ffd00f..709e2a8 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js
@@ -11,13 +11,15 @@
/**
* 初始化表格的列
*/
+
+var type = $("#type").val()
TCompetition.initColumn = function () {
return [
{field: 'selectItem', radio: true},
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
- {title: '所在省', field: 'province', visible: true, align: 'center', valign: 'middle',width:'8%',
+ {title: '所在省', field: 'province', visible: type==2?false:true, align: 'center', valign: 'middle',width:'8%',
},
- {title: '所在市', field: 'city', visible: true, align: 'center', valign: 'middle'},
+ {title: '所在市', field: 'city', visible: type==2?false:true, align: 'center', valign: 'middle'},
{title: '举办门店', field: 'storeName', visible: true, align: 'center', valign: 'middle',width:'8%',
},
{title: '赛事名称', field: 'name', visible: true, align: 'center', valign: 'middle',width:'8%',
@@ -38,6 +40,11 @@
return {1:"未开始",2:"已开始",3:"已结束",4:"已取消"}[data]
}
},
+ {title: '审核状态', field: 'auditStatus', visible: type==2?true:false, align: 'center', valign: 'middle',width:'8%',
+ formatter:function (data) {
+ return {1:"待审核",2:"已通过",3:"已拒绝"}[data]
+ }
+ },
];
};
function currentTime(timestamp){
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
index 84c0147..3be94d2 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
@@ -103,22 +103,17 @@
}
TCarInfoDlg.oneChange9 = function (e) {
- console.log(111)
var oneId=$(e).val();
- var elementById = document.getElementById("pt");
-
+ var elementById = document.getElementById("radio1");
var operatorId;
if (elementById !== null) {
- console.log(elementById)
operatorId = $("#account").val()
if (elementById.checked){
- operatorId = 0
+ operatorId = $("#account").val()
}else{
- operatorId = $("#account").val()
+ operatorId = 0
}
}
-
-
var ajax = new $ax(Feng.ctxPath + "/tShop/getCityYys", function(data){
if(data!=null){
if(language==1){
@@ -211,22 +206,50 @@
* 提交添加
*/
TCarInfoDlg.addSubmit = function() {
-
this.clearData();
this.collectData();
if(!this.validate()){
return ;
}
- var pCode = $("#pCode").val();
- if(pCode==""){
- Feng.info("请选择省");
- return;
+ var pCode;
+ var cCode;
+ var elementById = document.getElementById("radio1");
+ console.log("看看标签")
+ console.log(elementById)
+ if (elementById!=null){
+ if (!elementById.checked){
+ console.log("选中平台")
+ console.log($("#pCode1").val())
+ console.log($("#cCode1").val())
+ // 选中平台赛事
+ pCode = $("#pCode1").val();
+ if($("#pCode1").val()==""){
+ Feng.info("请选择省");
+ return;
+ }
+ cCode = $("#cCode1").val();
+ if($("#cCode1").val()==""){
+ Feng.info("请选择市");
+ return;
+ }
+ }else{
+ console.log("选中运营商")
+ console.log($("#pCode").val())
+ console.log($("#cCode").val())
+ // 选中运营商赛事
+ pCode = $("#pCode").val();
+ if(pCode==""){
+ Feng.info("请选择省");
+ return;
+ }
+ cCode = $("#cCode").val();
+ if(cCode==""){
+ Feng.info("请选择市");
+ return;
+ }
}
- var cCode = $("#cCode").val();
- if(cCode==""){
- Feng.info("请选择市");
- return;
}
+
var shopId = $("#shopId").val();
if(shopId==""){
@@ -566,19 +589,18 @@
TCarInfoDlg.oneChangeYys = function(e){
-
- var oneId= $("input[name='pt']:checked").val()
-
- console.log("===========oneId=========="+oneId)
+ var oneId= $(e).val()
var SelectValue="";
if(oneId=='0' ){
oneId=0
console.log("隐藏")
$("#yys1").hide();
+ $("#t1").hide();
$("#account").hide();
}else{
console.log("展示")
$("#yys1").show();
+ $("#t1").show();
$("#account").show();
}
// var ajax = new $ax(Feng.ctxPath + "/tSite/getChangeOne", function(data){
@@ -619,9 +641,8 @@
ajax.start();
- if (typeof(oneId) == "undefined"){
+ if (oneId == "1"){
console.log("===============")
-
var button = document.getElementById("account");
button.removeAttribute("disabled");
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
index 979aa00..3343dad 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
@@ -5,6 +5,7 @@
import com.dsh.other.feignclient.model.AdvertisementChangeStateDTO;
import com.dsh.other.feignclient.model.AdvertisementQuery;
import com.dsh.other.model.BannerVo;
+import com.dsh.other.model.dto.siteDto.GameDataQuery;
import com.dsh.other.service.*;
import com.dsh.other.util.ResultUtil;
import io.swagger.annotations.ApiImplicitParam;
@@ -33,6 +34,30 @@
@Autowired
private TGameRecordService gameRecordService;
+ // 数据统计
+ @ResponseBody
+ @PostMapping("/student/getData")
+ public List<TGameRecord> getData(@RequestBody GameDataQuery query){
+ if (query.getStoreId()==null){
+ // 获取到游戏ids
+ List<Integer> gameIds = gameService.list(new QueryWrapper<Game>().eq("operationId", query.getObjectId()))
+ .stream().map(Game::getId).collect(Collectors.toList());
+ // 根据游戏ids查询智慧球场支付记录
+ List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().in("gameId", gameIds)
+ .eq("status", 1)
+ .ne("payType", 3)
+ .ne("payType", 4));
+ return list;
+ }else{
+ List<Integer> gameIds = gameService.list(new QueryWrapper<Game>().eq("storeId", query.getStoreId()))
+ .stream().map(Game::getId).collect(Collectors.toList());
+ List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().in("gameId", gameIds)
+ .eq("status", 1).eq("payType", 1).eq("payType", 2));
+ return list;
+ }
+ }
+
+
@ResponseBody
@PostMapping("/student/webStudentList")
public List<Game> list(@RequestBody BallQueryDto ballQueryDto){
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index 6e8911b..e1652b0 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -129,7 +129,6 @@
@RequestMapping("/base/site/addSiteBooking")
public Object addSiteBooking(@RequestBody SiteBooking siteBooking){
if(siteBooking.getId()!= null ){
-
return siteBookingService.updateById(siteBooking);
}else {
return siteBookingService.save(siteBooking);
@@ -452,35 +451,24 @@
map.put("siteType",siteType.getName());
map.put("shopName",byId1.getName());
map.put("shopAddress",byId1.getAddress());
-
map.put("name",site.getName());
-
-
-
List<Integer> ids = getIds(byId.getSiteId());
byId.setStorePhone(byId1.getPhone());
-
//拼接开始结束时间
Date startTime = byId.getStartTime();
Date endTime = byId.getEndTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-
String startTimeString = sdf.format(startTime);
String endTimeString = sdf.format(endTime);
-
String result = startTimeString + "-" + endTimeString.substring(11);
byId.setTimes(result);
-
-
-
-
byId.setSid(Arrays.asList(storeId));
- List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getStoreId, storeId).eq(Site::getSign, 1));
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>()
+ .eq(Site::getStoreId, storeId)
+ .eq(Site::getSign, 1));
List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
byId.setRid(collect);
map.put("data",byId);
-
-
map.put("ids",ids);
return ResultUtil.success(map);
}catch (Exception e){
diff --git a/cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/GameDataQuery.java b/cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/GameDataQuery.java
new file mode 100644
index 0000000..23af790
--- /dev/null
+++ b/cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/GameDataQuery.java
@@ -0,0 +1,9 @@
+package com.dsh.other.model.dto.siteDto;
+
+import lombok.Data;
+
+@Data
+public class GameDataQuery {
+ Integer objectId;
+ Integer storeId;
+}
--
Gitblit v1.7.1