From d9f331e175611a68f00a50cab63ea35442a4b0e6 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 16 十月 2023 09:29:34 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 33 +++++++++--
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 17 +++++
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 3 +
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js | 8 ++
cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html | 79 ++++++++++++++++++++++---
6 files changed, 123 insertions(+), 21 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index aed71a6..a918c2f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -803,6 +803,9 @@
coursePackage.setStatus(1);
coursePackage.setState(1);
coursePackage.setInsertTime(new Date());
+ // 详情多图片
+ String substring = coursePackage.getDetailDrawing().substring(0, coursePackage.getDetailDrawing().length() - 1);
+ coursePackage.setDetailDrawing(substring);
coursePackageService.addCoursePackage(coursePackage, coursePackagePaymentConfig);
return ResultUtil.success();
}
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 dbdbffd..6e46eaa 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
@@ -18,6 +18,7 @@
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.util.GaoDeMapUtil;
+import com.dsh.guns.modular.system.util.HttpRequestUtil;
import io.swagger.models.auth.In;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.BeanUtils;
@@ -29,10 +30,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -106,7 +104,11 @@
// if (!roleid.equals("1")){
TOperator operator1 = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("userId", UserExt.getUser().getId()));
- model.addAttribute("operator",operator1.getId());
+ if (operator1!=null){
+ model.addAttribute("operator",operator1.getId());
+ }else {
+ model.addAttribute("operator",0);
+ }
// }
model.addAttribute("yysList",list1);
@@ -315,7 +317,7 @@
@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) {
+ 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) {
try {
@@ -384,6 +386,15 @@
tStore.setLat(lat);
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<>();
for (int i = 1; i < 9; i++) {
@@ -472,6 +483,16 @@
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");
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 f5f3c49..50cac19 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
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import cn.hutool.crypto.SecureUtil;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -421,7 +422,19 @@
map.put("remark",site.getIntroduce());
map.put("lat",store.getLat());
map.put("lng",store.getLon());
- HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpace", 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);
return ResultUtil.success("添加成功");
}
@@ -453,6 +466,8 @@
site.setInsertTime(new Date());
site.setState(1);
siteClient.addSite(site);
+ Integer id = site.getId();
+
return ResultUtil.success();
}
/**
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html
index f66df1d..d75b1f7 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html
@@ -141,20 +141,40 @@
<label class="col-sm-3 control-label head-scu-label"></label>
<label>推荐像素：210x280px</label>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label head-scu-label">*详情页</label>
- <div class="col-sm-2">
- <div id="detailDrawingPreId">
- <div><img width="100px" height="100px" src="${ctxPath}/img/NoPIC.png"></div>
+ <div class="row" id="app1">
+ <div class="form-group">
+ <label class="col-sm-3 control-label head-scu-label">*实景图片(请上传不超过五张图片): </label>
+ <div class="col-sm-2" style="width: 100%;margin-left: 11%;margin-top: 1%">
+ <el-upload
+ :limit="5"
+ class="avatar-uploader"
+ action="/tCouponManage/uploadPic"
+ list-type="picture-card"
+ accept="."
+ :on-success="handleAvatarSuccess"
+ :on-remove="handleRemove">
+ <i class="el-icon-plus"></i>
+ </el-upload>
+ <el-dialog :visible.sync="dialogVisible">
+ <img width="100%" :src="imageUrl1" alt="">
+ </el-dialog>
</div>
</div>
- <div class="col-sm-2">
- <div class="head-scu-btn upload-btn" id="detailDrawingBtnId">
- <i class="fa fa-upload"></i> 上传
- </div>
- </div>
- <input type="hidden" id="detailDrawing" value=""/>
</div>
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label head-scu-label">*详情页</label>-->
+<!-- <div class="col-sm-2">-->
+<!-- <div id="detailDrawingPreId">-->
+<!-- <div><img width="100px" height="100px" src="${ctxPath}/img/NoPIC.png"></div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="col-sm-2">-->
+<!-- <div class="head-scu-btn upload-btn" id="detailDrawingBtnId">-->
+<!-- <i class="fa fa-upload"></i> 上传-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <input type="hidden" id="detailDrawing" value=""/>-->
+<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label head-scu-label"></label>
<label>推荐像素：780x440px</label>
@@ -223,7 +243,44 @@
</div>
</div>
<script src="${ctxPath}/modular/system/coursePackage/coursePackage_info.js"></script>
+ <script src="${ctxPath}/js/vue/vue.js"></script>
+ <script src="${ctxPath}/js/elementui/index.js"></script>
+ <link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
<script type="text/javascript">
+ var vue2 = new Vue({
+ el: '#app1',
+ props: {
+ // 数量限制
+ limit: {
+ type: Number,
+ default: 2
+ },
+ },
+ data: {
+ autoUpload: true,//自动上传
+ imageUrl1: '',//模型数据，用于上传图片完成后图片预览
+ dialogVisible: false
+ },
+ methods: {
+ handleAvatarSuccess(res, file) {
+ CoursePackageInfo.goodsPicArray.push(file);
+ },
+ beforeAvatarUpload(file) {
+ const isLt2M = file.size / 1024 / 1024 < 10;
+ if (!isLt2M) {
+ this.$message.error('上传图片大小不能超过 10MB!');
+ }
+ return isLt2M;
+ },
+ handleRemove(file, fileList) {
+ TSite.goodsPicArray = TSite.goodsPicArray.filter(item => {
+ return item.uid != file.uid;
+ });
+ },
+ },
+ created() {
+ },
+ });
laydate.render({
elem: '#classStartTime'
,type: 'time'
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js
index 581136a..d705d60 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js
@@ -3,6 +3,7 @@
*/
var CoursePackageInfo = {
userInfoData: {},
+ goodsPicArray: [],
};
@@ -74,7 +75,12 @@
classWeeks += $(e).val() + ";";
})
let coverDrawing = $('#coverDrawing').val();
- let detailDrawing = $('#detailDrawing').val();
+ var detailDrawing="";
+ for (let i = 0; i <CoursePackageInfo.goodsPicArray.length ; i++) {
+ detailDrawing = detailDrawing+CoursePackageInfo.goodsPicArray[i]+",";
+ }
+
+
let introduceDrawing = $('#introduceDrawing').val();
let sort = $('#sort').val();
let validDays = $('#validDays').val();
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
index 9ddafc4..0344d49 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
@@ -793,7 +793,7 @@
var content='<option value="">Pilih franchisee Anda</option>';
}
$.each(data, function(k,v) {
- content += "<option value='"+v.id+"'>"+v.name+"</option>";
+ content += "<option value='"+v.code+"'>"+v.name+"</option>";
});
$("#pCode").empty().append(content);
}
@@ -835,7 +835,7 @@
var content='<option value="">Pilih franchisee Anda</option>';
}
$.each(data, function(k,v) {
- content += "<option value='"+v.id+"'>"+v.name+"</option>";
+ content += "<option value='"+v.code+"'>"+v.name+"</option>";
});
$("#cCode").empty().append(content);
}
--
Gitblit v1.7.1