From add2d28c3aeccfe57338c439967abbb83117b20e Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 17 十月 2023 09:56:55 +0800
Subject: [PATCH] 修改bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 91 ++++++++++--
cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js | 3
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponInfo.html | 3
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 9
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 85 +++++++++--
cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html | 11 +
cloud-server-other/src/main/java/com/dsh/other/entity/Site.java | 6
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/common/tags/avatar.tag | 2
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/Student.java | 2
cloud-server-management/src/main/webapp/static/js/common/web-upload-image.js | 4
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 4
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java | 3
cloud-server-management/src/main/java/com/dsh/course/feignClient/other/SiteClient.java | 2
cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java | 1
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java | 1
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 5
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 4
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THonorController.java | 2
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java | 3
cloud-server-management/src/main/webapp/static/js/common/web-upload-object.js | 3
cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html | 145 +-------------------
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html | 4
cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js | 1
26 files changed, 199 insertions(+), 201 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 687d62b..d3642d2 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
@@ -835,7 +835,7 @@
if (vicinityGood.getRedemptionMethod() == 1) {
commodity.setIntegral(vicinityGood.getIntegral().intValue());
} else {
- commodity.setIntegral(vicinityGood.getIntegral().intValue());
+ commodity.setIntegral(ToolUtil.isEmpty(vicinityGood.getIntegral())?0:vicinityGood.getIntegral());
commodity.setAmount(vicinityGood.getCash());
}
commodity.setBelongsType(vicinityGood.getUserPopulation());
@@ -869,7 +869,7 @@
if (vicinityGood.getRedemptionMethod() == 1) {
commodity.setIntegral(vicinityGood.getIntegral().intValue());
} else {
- commodity.setIntegral(vicinityGood.getIntegral().intValue());
+ commodity.setIntegral(ToolUtil.isEmpty(vicinityGood.getIntegral())?0:vicinityGood.getIntegral());
commodity.setAmount(vicinityGood.getCash());
}
commodity.setBelongsType(vicinityGood.getUserPopulation());
diff --git a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
index 65f604e..5b3ed85 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
@@ -193,7 +193,6 @@
-
royaltyInfo.setRoyaltyDetailInfos(royaltyDetailInfos);
model.setRoyaltyInfo(royaltyInfo);
System.err.println("=================="+royaltyInfo);
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 5909e6d..50e420e 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
@@ -181,8 +181,7 @@
for (PointsMerchandise merchandise : merchandises) {
IntegralCommodity integralCommodity = new IntegralCommodity();
integralCommodity.setCommodityId(merchandise.getId());
- String[] split = merchandise.getProductImages().split(",");
- integralCommodity.setCommodityImg(split[0]);
+ integralCommodity.setCommodityImg(merchandise.getCover());
integralCommodity.setCommodityName(merchandise.getName());
integralCommodity.setCommodityPrice(merchandise.getPrice());
integralCommodity.setGoodsType(merchandise.getType());
@@ -311,7 +310,6 @@
detailsVo.setGoodId(merchandise.getId());
List<String> list2 = new ArrayList<>();
String cover = merchandise.getCover();
- list2.add(cover);
list2.addAll(Arrays.asList(StrUtils.splitStr2StrArr(merchandise.getProductImages(), ",")));
detailsVo.setPics(list2);
Collections.sort(detailsVo.getPics(), (s1, s2) -> {
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java
index d27b71d..400d0b7 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java
@@ -12,6 +12,7 @@
@ApiModelProperty(value = "商品id")
private Integer commodityId;
+
@ApiModelProperty(value = "商品图片")
private String commodityImg;
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/Student.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/Student.java
index b97d134..e1090b1 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/Student.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/Student.java
@@ -27,7 +27,7 @@
/**
* 生日
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;
/**
* 性别（1=男，2=女）
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
index c5340f4..5522269 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
@@ -145,6 +145,9 @@
List<ParticipantVo> participant = new ArrayList<>();
List<UserCompetition> list = userCompetitionService.list(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", one.getId()));
List<Integer> collect = list.stream().map(UserCompetition::getParticipantId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
List<Participant> participants = participantService.listByIds(collect);
SimpleDateFormat sdf_year = new SimpleDateFormat("yyyy");
for (Participant participant1 : participants) {
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
index e21498e..afe3e1e 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
@@ -129,6 +129,9 @@
List<ParticipantVo> participant = new ArrayList<>();
List<UserCompetition> list = userCompetitionService.list(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", paymentCompetition.getId()));
List<Integer> collect = list.stream().map(UserCompetition::getParticipantId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
List<Participant> participants = participantService.listByIds(collect);
SimpleDateFormat sdf_year = new SimpleDateFormat("yyyy");
for (Participant participant1 : participants) {
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/SiteClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/SiteClient.java
index 1e46172..17f3563 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/SiteClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/SiteClient.java
@@ -51,7 +51,7 @@
* @return
*/
@RequestMapping("/base/site/addSite")
- Object addSite(@RequestBody Site site);
+ Integer addSite(@RequestBody Site site);
@RequestMapping("/base/site/listById")
Site listById(@RequestParam("id") Integer id);
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 1e0ea12..9bfcbd9 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
@@ -116,11 +116,10 @@
public Object getIncomeData(Integer operatorId,Integer storeId) {
// 报名课程查询query
RegisterOrderQuery query = new RegisterOrderQuery();
- // 充值记录查询query
+ // 充值记录查询query
RechargeRecordsQuery rechargeRecordsQuery = new RechargeRecordsQuery();
// 赛事活动查询query
CompetitionQuery competitionQuery = new CompetitionQuery();
-
// 会员支付查询query
IncomeQuery incomeQuery = new IncomeQuery();
// 场地预约记录查询query
@@ -275,7 +274,7 @@
int years = DateUtil.year(new Date());
for (int i = 0; i < 10; i++) {
integers1.add(years-i);
- }
+ }
List<Object> collect = integers1.stream().sorted().collect(Collectors.toList());
List<Object> objects1 = new ArrayList<>();
for (Object o : collect) {
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THonorController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THonorController.java
index f2164a5..baf67f5 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THonorController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THonorController.java
@@ -93,7 +93,7 @@
Integer objectType = UserExt.getUser().getObjectType();
System.out.println(objectType);
model.addAttribute("userType",objectType);
- return PREFIX + "TQuestionAdd.html";
+ return PREFIX + "TCouponAdd.html";
}
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 6e46eaa..06a2baa 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
@@ -1,6 +1,7 @@
package com.dsh.guns.modular.system.controller.code;
import cn.hutool.crypto.SecureUtil;
+import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -104,7 +105,7 @@
// if (!roleid.equals("1")){
TOperator operator1 = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("userId", UserExt.getUser().getId()));
- if (operator1!=null){
+ if(operator1!=null){
model.addAttribute("operator",operator1.getId());
}else {
model.addAttribute("operator",0);
@@ -241,6 +242,7 @@
cityListQuery.setOffset(1);
cityListQuery.setLimit(10000);
cityListQuery.setCityCode(byId.getCityCode());
+ model.addAttribute("yysList", tOperatorService.list());
Page<TCityManager> list2 = cityClient.list(cityListQuery);
model.addAttribute("list1",list1);
model.addAttribute("list2",list2.getRecords());
@@ -317,11 +319,11 @@
@RequestMapping(value = "/add")
@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,String provinceCode,String cityCode) {
+ 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){
+ if(yyId==null || type==1){
yyId=0;
}
@@ -387,13 +389,7 @@
storeService.save(tStore);
- HashMap<String, String> map = new HashMap<>();
- map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- map.put("space_id","");
- map.put("device_id",tStore.getIds()+"");
- map.put("region_id",tStore.getId()+"");
- // 添加门禁
- String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map);
+
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
@@ -406,6 +402,41 @@
storeConfigs.add(storeConfig);
}
storeConfigService.saveBatch(storeConfigs);
+
+
+ // 添加门店
+ HashMap<String, String> map1 = new HashMap<>();
+ map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ map1.put("name",tStore.getName());
+ map1.put("short_name",tStore.getName());
+ map1.put("location",tStore.getCity());
+ map1.put("address",tStore.getAddress());
+ map1.put("telephone",tStore.getPhone());
+ map1.put("linkman",userName);
+ map1.put("business_time","[{\"start_time\":\""+tStore.getStartTime()+"\",\"close_time\":\""+tStore.getEndTime()+"\"}]");
+ map1.put("logo",tStore.getCoverDrawing());
+ 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","");
+ // 添加门禁
+ 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();
@@ -483,16 +514,30 @@
tStore.setLon(lon);
tStore.setLat(lat);
storeService.updateById(tStore);
- HashMap<String, String> map = new HashMap<>();
- map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- map.put("space_id","");
- map.put("device_id",tStore.getIds());
- map.put("region_id",tStore.getId()+"");
- // 编辑门禁
- String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/editDevice/ids/82", map);
- JSONObject jsonObject = JSONObject.parseObject(s);
- JSONObject data = jsonObject.getJSONObject("data");
- String spaceId = data.getString("space_id");
+ String ids1 = byIdc.getIds();
+
+
+
+ HashMap<String, String> mapx = new HashMap<>();
+ mapx.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ for (String s : ids1.split(",")) {
+ String post = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/deleteDevice/ids/" + s,mapx);
+ System.out.println(post);
+ }
+
+ for (String s : ids.split(",")) {
+ HashMap<String, String> map1 = new HashMap<>();
+ map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ map1.put("space_id",tStore.getId()+"");
+ map1.put("device_id",s);
+ map1.put("region_id","");
+ // 添加门禁
+ String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
+ 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 50cac19..4efb096 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
@@ -281,6 +281,10 @@
}
model.addAttribute("nextNames",strings1);
+ ArrayList<String> strings3 = new ArrayList<>();
+ strings3.add("普通场地");
+ strings3.add("智慧场地");
+ model.addAttribute("typeNames",strings3);
String halfNames = site.getHalfName();
ArrayList<String> strings2 = new ArrayList<>();
@@ -355,6 +359,36 @@
}else{
stores = storeClient.getStore(site.getCity());
}
+
+ ArrayList<String> strings3 = new ArrayList<>();
+ strings3.add("普通场地");
+ strings3.add("智慧场地");
+ model.addAttribute("typeNames",strings3);
+
+
+ String nextName = site.getNextName();
+ ArrayList<String> strings1 = new ArrayList<>();
+ for (String s : nextName.split(",")) {
+ strings1.add(s);
+ }
+ model.addAttribute("nextNames",strings1);
+
+
+
+ String halfNames = site.getHalfName();
+ ArrayList<String> strings2 = new ArrayList<>();
+ String[] split = halfNames.split(",");
+ String halfName=null;
+ for (int i = 0; i < split.length; i++) {
+ if(i==0){
+ halfName = split[0];
+ }else {
+ strings2.add(split[i]);
+ }
+ }
+ model.addAttribute("halfNames",strings2);
+ model.addAttribute("halfName",halfName);
+
List<CityManager> accounts = cityManagerClient.getAccount(site.getCity());
model.addAttribute("list",site);
Date insuranceEndTime = site.getInsuranceEndTime();
@@ -407,34 +441,30 @@
site.setCityManagerId(cityManagerId);
site.setInsertTime(new Date());
site.setState(1);
- siteClient.addSite(site);
+ Integer integer1 = siteClient.addSite(site);
HashMap<String, String> map = new HashMap<>();
map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
map.put("name",site.getName());
- map.put("short_name",site.getName());
- map.put("location",city);
- map.put("address",store.getAddress());
- map.put("telephone",store.getPhone());
- map.put("linkman","");
- map.put("business_time","[{\"start_time\":\"00:00\",\"close_time\":\"23:59\"}]");
- map.put("logo",store.getCoverDrawing());
- map.put("remark",site.getIntroduce());
- map.put("lat",store.getLat());
- map.put("lng",store.getLon());
+ map.put("space_id",integer1.toString());
+ String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceArea", map);
+
// 添加门禁
- String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpace", map);
JSONObject jsonObject = JSONObject.parseObject(s);
JSONObject data = jsonObject.getJSONObject("data");
String spaceId = data.getString("space_id");
Integer integer = Integer.valueOf(spaceId);
- HashMap<String, String> map1 = new HashMap<>();
- map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- map1.put("space_id",integer+"");
- map1.put("device_id",site.getIds()+"");
- map1.put("region_id","");
- String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
+ for (String s1 : site.getIds().split(",")) {
+ HashMap<String, String> map1 = new HashMap<>();
+ map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ map1.put("space_id",site.getStoreId()+"");
+ map1.put("device_id",s1);
+ map1.put("region_id",integer1+"");
+ String s2 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
+ System.out.println("添加闸机："+s2);
+ }
+
return ResultUtil.success("添加成功");
}
@@ -449,6 +479,9 @@
if(site.getInsuranceImg().equals("")){
site.setInsuranceImg(null);
}
+
+ TSite byId = siteService.getById(site.getId());
+
Store store = storeClient.getStoreById(site.getStoreId());
String province = store.getProvince();
@@ -466,7 +499,27 @@
site.setInsertTime(new Date());
site.setState(1);
siteClient.addSite(site);
- Integer id = site.getId();
+
+ String ids = byId.getIds();
+ HashMap<String, String> map = new HashMap<>();
+ map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ for (String s : ids.split(",")) {
+ String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/deleteDevice/ids/" + s,map);
+ System.out.println(s1);
+ }
+
+ for (String s : site.getIds().split(",")) {
+ HashMap<String, String> map1 = new HashMap<>();
+ map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ map1.put("space_id",store.getId()+"");
+ map1.put("device_id",s);
+ map1.put("region_id",site.getId()+"");
+ // 添加门禁
+ String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
+ System.out.println(s1);
+ }
+
+
return ResultUtil.success();
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/common/tags/avatar.tag b/cloud-server-management/src/main/webapp/WEB-INF/view/common/tags/avatar.tag
index a485821..4c309d2 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/common/tags/avatar.tag
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/common/tags/avatar.tag
@@ -17,7 +17,7 @@
</div>
<div class="col-sm-2">
<div class="head-scu-btn upload-btn" id="${id}BtnId">
- <i class="fa fa-upload"></i> Upload
+ <i class="fa fa-upload"></i> 文件上传
</div>
</div>
<input type="hidden" id="${id}" />
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html
index b54ff42..889b7d5 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html
@@ -29,7 +29,7 @@
<div class="col-sm-12">
<div class="ibox float-e-margins">
<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/dataStatistics/platformIncome.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html
index 138820b..a22080e 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
@@ -67,7 +67,7 @@
<div class="col-sm-11">
<div class="form-group">
<div class="col-sm-10">
- <h2>营收数据</h2>
+ <h2>营收数据1</h2>
</br>
<div id = "money1" style="width: 1500px" >
<span id="totalIncome">总营收:</span>
@@ -240,7 +240,7 @@
<h2>课时数据</h2>
</br>
</br>
- <span id="allCourse">现有课时总量:0小时</span>
+ <span>现有课时总量:0小时</span>
</br>
</br>
<div id="courseData" style="width: 1280px;height:500px;"></div>
@@ -258,132 +258,6 @@
<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 ajax = new $ax(Feng.ctxPath + "/data/type1", function (data) {
-
- $("#fee1").text(data.fee1)
- $("#fee2").text(data.fee2)
- $("#fee3").text(data.fee3)
- $("#fee4").text(data.fee4)
- $("#fee5").text(data.fee5)
- $("#fee7").text(data.fee7)
- $("#day").val(data.dayone)
- $("#month").val(data.monthone)
- $("#quarter").val(data.quarterone)
- $("#year").val(data.yearone)
-
-
-
-
-
- var chartDom = document.getElementById('cookieTicket');
- var myChart = echarts.init(chartDom);
- var option;
- option = {
- title: {
- text: '门票收入',
- subtext: '',
- left: 'center'
- },
- tooltip: {
- trigger: 'item'
- },
-
- series: [
- {
- name: 'Access From',
- type: 'pie',
- radius: '50%',
- data: [
- { value: data.dayone, name: '日卡' },
- { value: data.monthone, name: '月卡' },
- { value: data.quarterone, name: '季卡' },
- { value: data.yearone, name: '年卡' },
-
- ],
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ]
- };
- myChart.setOption(option);
-
- var chartDom = document.getElementById('cookieCourse');
- var myChart = echarts.init(chartDom);
- var option;
- option = {
- title: {
- text: '课程收入',
- subtext: '',
- left: 'center'
- },
- tooltip: {
- trigger: 'item'
- },
-
- series: [
- {
- name: 'Access From',
- type: 'pie',
- radius: '50%',
- data: data.courseData,
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ]
- };
- myChart.setOption(option);
-
-
- var chartDom = document.getElementById('cookieBooking');
- var myChart = echarts.init(chartDom);
- var option;
- option = {
- title: {
- text: '订场收入',
- subtext: '',
- left: 'center'
- },
- tooltip: {
- trigger: 'item'
- },
-
- series: [
- {
- name: 'Access From',
- type: 'pie',
- radius: '50%',
- data: data.siteData,
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ]
- };
- myChart.setOption(option);
-
-
- }, function (data) {
-
- });
- ajax.set("time",time);
- ajax.start();
- }
var ans = [];
var weekX = ["1周","2周","3周","4周"];
var monthX = ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"];
@@ -413,11 +287,7 @@
for (var i = 1; i <= daysInMonth; i++) {
timeX.push(String(i));
}
- laydate.render({
- elem: '#beginTime'
- , trigger: 'click'
- , range: true
- });
+
function getYears() {
var ajax2 = new $ax(Feng.ctxPath + "/data/getYears", function(data){
yearX=data
@@ -428,6 +298,7 @@
getContent(1);
getContent1(1);
getContent2(1);
+
var ajax = new $ax(Feng.ctxPath + "/data/getIncomeData", function(resp){
@@ -1182,7 +1053,9 @@
var ajax2 = new $ax(Feng.ctxPath + "/data/coursePt", function(data){
console.log(data)
- $("#allCourse").text("现有课时总量："+data.allCourse+"小时")
+
+ $("#allHour").text(data.allHour)
+
option7 = {
tooltip: {
trigger: 'axis'
@@ -1235,7 +1108,7 @@
name: '周度耗课数',
type: 'line',
stack: 'Total',
- data: data.weekData
+ data: [data.count,data.count1,data.count2,data.count3]
},
{
name: '日度耗课数',
@@ -1416,8 +1289,6 @@
});
ajax.start();
ptStu()
- ptCourse();
-
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponInfo.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponInfo.html
index 2c032f4..0ae3948 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponInfo.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponInfo.html
@@ -122,6 +122,9 @@
<input class="col-sm-1 control-label" name="distributionMethod" type="radio" disabled
value="3" style="margin-left: 4%;margin-top: 10px;width: 13px;height: 13px"/>
<label class="col-sm-1" style="width: 16%;margin-top: 7px">自动发券</label>
+ <input class="col-sm-1 control-label" name="distributionMethod" type="radio" disabled
+ value="4" style="margin-left: 4%;margin-top: 10px;width: 13px;height: 13px"/>
+ <label class="col-sm-1" style="width: 16%;margin-top: 7px">课包赠送</label>
</div>
</div>
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 50e6fb4..3a2b6fd 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
@@ -140,7 +140,9 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-10 col-sm-offset-5">
+ @if(type !=0){
<#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.editSubmit()"/>
+ @}
<#button btnCss="danger" name="关闭" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html
index dbb2842..4830981 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html
@@ -5,10 +5,10 @@
<div class="form-horizontal" id="carInfoForm">
<input hidden id="id" value="${id}">
@if(welfarePicture==null){
- <#avatar id="welfarePicture" name="福利图片"/>
+ <#avatar id="welfarePicture" name="福利图片(推荐像素宽度:780px)"/>
@}
@if(welfarePicture!=null){
- <#avatar id="welfarePicture" name="福利图片" avatarImg="${welfarePicture}"/>
+ <#avatar id="welfarePicture" name="福利图片(推荐像素宽度:780px)" avatarImg="${welfarePicture}"/>
@}
@if(welfarePicture==12321){
<div class="form-group">
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 bd601b6..a2f92c1 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
@@ -73,6 +73,17 @@
</select>
</div>
</div>
+
+ <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="siteTypeOne" name = "typeId" onchange="updateTime1()">
+ @for(obj in typeNames){
+ <option value="${obj}" ${obj == list.typeName ? 'selected=selected' : ''}>${obj}</option>
+ @}
+ </select>
+ </div>
+ </div>
<div class="form-group" id="siteType">
<label class="col-sm-3 control-label">*场地类型：</label>
<div class="col-sm-9">
diff --git a/cloud-server-management/src/main/webapp/static/js/common/web-upload-image.js b/cloud-server-management/src/main/webapp/static/js/common/web-upload-image.js
index 9e31ccb..634c4ec 100644
--- a/cloud-server-management/src/main/webapp/static/js/common/web-upload-image.js
+++ b/cloud-server-management/src/main/webapp/static/js/common/web-upload-image.js
@@ -32,6 +32,7 @@
* 创建webuploader对象
*/
create : function() {
+ console.log(3333222)
var webUploader = WebUploader.create({
auto : true,
pick : {
@@ -48,7 +49,8 @@
disableGlobalDnd : true,
duplicate : true,
server : this.uploadUrl,
- fileSingleSizeLimit : this.fileSizeLimit
+ fileSingleSizeLimit : this.fileSizeLimit,
+ compress:false
});
return webUploader;
diff --git a/cloud-server-management/src/main/webapp/static/js/common/web-upload-object.js b/cloud-server-management/src/main/webapp/static/js/common/web-upload-object.js
index e15bc02..fc1a382 100644
--- a/cloud-server-management/src/main/webapp/static/js/common/web-upload-object.js
+++ b/cloud-server-management/src/main/webapp/static/js/common/web-upload-object.js
@@ -50,7 +50,8 @@
disableGlobalDnd : true,
duplicate : true,
server : this.uploadUrl,
- fileSingleSizeLimit : this.fileSizeLimit
+ fileSingleSizeLimit : this.fileSizeLimit,
+ compress:false
});
return webUploader;
},
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
index 49b1000..3b639f7 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
@@ -406,6 +406,9 @@
var eh =data.appointmentEndTime.split(':')[0];
var em =data.appointmentEndTime.split(':')[1];
+
+ console.log(data.typeName)
+
var SelectValue="";
var getSelectValueMenbers = $("input[name='pt']:checked").each(function(j) {
if (j >= 0) {
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js
index 68ddf22..c2a2054 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js
@@ -220,6 +220,7 @@
data.name = $("#name").val()
data.insuranceImg = $("#img").val()
data.managementPlan = $('#courseVideo').val()
+ data.typeName = $('#siteTypeOne').val()
var sh =data.appointmentStartTime.split(':')[0];
var sm =data.appointmentStartTime.split(':')[1];
var eh =data.appointmentEndTime.split(':')[0];
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 380617c..ff3ea1f 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
@@ -109,12 +109,13 @@
* @return
*/
@RequestMapping("/base/site/addSite")
- public Object addSite(@RequestBody Site site){
+ public Integer addSite(@RequestBody Site site){
if(site.getId()!= null ){
-
- return siteService.updateById(site);
+ siteService.updateById(site);
+ return site.getId();
}else {
- return siteService.save(site);
+ boolean save = siteService.save(site);
+ return site.getId();
}
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
index a7f230d..fa6f186 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
@@ -108,6 +108,10 @@
@TableField("insertTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date insertTime;
+ @TableField("operatorId")
+ private Integer operatorId;
+ @TableField("typeName")
+ private String typeName;
@TableField("imgs")
private String imgs;
@TableField("introduce")
@@ -124,7 +128,5 @@
private Double playPaiCoinOne;
@TableField("ids")
private String ids;
- @TableField("typeName")
- private String typeName;
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
index ea18418..6590670 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -252,7 +252,7 @@
//校验优惠券
Long couponId = reservationSite.getCouponId();
- if (couponId != 0){
+ if (couponId!=null && couponId != 0){
if(null != couponId && reservationSite.getPayType() != 3){
UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(reservationSite.getCouponId(),uid));
--
Gitblit v1.7.1