From e73a8aac21ee8a68fa6d8efb998de25552318ce3 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 20 Apr 2023 23:31:26 +0800
Subject: [PATCH] 店铺管理完成
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallShopController.java | 10 +
src/main/resources/templates/febs/views/modules/shop/add.html | 29 ++-
src/main/java/cc/mrbird/febs/mall/controller/AdminMallShopController.java | 36 ++++
src/main/resources/templates/febs/views/modules/shop/update.html | 306 ++++++++++++++++++++++++++++++++++++++
src/main/resources/templates/febs/views/modules/shop/shopList.html | 15 -
src/main/java/cc/mrbird/febs/mall/vo/ApiShopVo.java | 21 ++
src/main/java/cc/mrbird/febs/mall/controller/ApiMallShopController.java | 2
src/main/java/cc/mrbird/febs/mall/entity/MallShop.java | 6
8 files changed, 401 insertions(+), 24 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallShopController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallShopController.java
index 5e2c01b..ce09bdb 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallShopController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallShopController.java
@@ -3,15 +3,14 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
import cc.mrbird.febs.mall.entity.MallShop;
import cc.mrbird.febs.mall.service.IMallShopService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@Slf4j
@Validated
@@ -26,4 +25,35 @@
public FebsResponse shopListInPage(MallShop mallShop, QueryRequest request) {
return new FebsResponse().success().data(getDataTable(mallShopService.findShopListInPage(mallShop, request)));
}
+
+ @PostMapping(value = "/add")
+ public FebsResponse add(MallShop mallShop) {
+ mallShop.setState(2);
+ mallShopService.save(mallShop);
+ return new FebsResponse().success().message("添加成功");
+ }
+
+ @PostMapping(value = "/update")
+ public FebsResponse update(MallShop mallShop) {
+ mallShopService.updateById(mallShop);
+ return new FebsResponse().success().message("编辑成功");
+ }
+
+ @GetMapping(value = "/del/{id}")
+ public FebsResponse del(@PathVariable("id") Long id) {
+ mallShopService.removeById(id);
+ return new FebsResponse().success().message("删除成功");
+ }
+
+ @PostMapping(value = "/upOrDown/{id}/{state}")
+ public FebsResponse upOrDown(@PathVariable("id") Long id,@PathVariable("state") Integer state) {
+ MallShop shop = mallShopService.getById(id);
+ if (shop == null) {
+ throw new FebsException("店铺不存在");
+ }
+
+ shop.setState(state);
+ mallShopService.updateById(shop);
+ return new FebsResponse().success().message("操作成功");
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallShopController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallShopController.java
index ac438e7..42a4e5a 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallShopController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallShopController.java
@@ -33,7 +33,7 @@
@ApiResponses({
@ApiResponse(code = 200, message = "success", response = ApiShopVo.class)
})
- @PostMapping(value = "/")
+ @PostMapping(value = "/shopList")
public FebsResponse shopList(ApiShopDto apiShopDto) {
return new FebsResponse().success().data(mallShopService.findShopList(apiShopDto));
}
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallShopController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallShopController.java
index 27ecd2d..222e2a9 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallShopController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallShopController.java
@@ -2,10 +2,13 @@
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
+import cc.mrbird.febs.mall.service.IMallShopService;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller("shopView")
@@ -13,6 +16,8 @@
@RequiredArgsConstructor
public class ViewMallShopController {
+
+ private final IMallShopService mallShopService;
@GetMapping("/shopList")
@RequiresPermissions("shop:view")
@@ -29,8 +34,9 @@
@RequiresPermissions("shop:update")
- @GetMapping("update")
- public String update() {
+ @GetMapping("update/{id}")
+ public String update(@PathVariable("id") Long id, Model model) {
+ model.addAttribute("shopInfo", mallShopService.getById(id));
return FebsUtil.view("modules/shop/update");
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallShop.java b/src/main/java/cc/mrbird/febs/mall/entity/MallShop.java
index e1c9271..e32abcf 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallShop.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallShop.java
@@ -25,6 +25,12 @@
private Integer state;
+ private String province;
+
+ private String city;
+
+ private String county;
+
/**
* 距离
*/
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiShopVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiShopVo.java
index 33b5ee5..217610a 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/ApiShopVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiShopVo.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.vo;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -33,6 +34,26 @@
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
+ private String province;
+
+ private String city;
+
+ private String county;
+
+ private String address;
+
+ public String getAddress() {
+ if (StrUtil.isBlank(city) || StrUtil.isBlank(province) || StrUtil.isBlank(county)) {
+ return null;
+ }
+
+ if (city.equals(province)) {
+ return province + county + shopAddress;
+ } else {
+ return province + city + county + shopAddress;
+ }
+ }
+
@ApiModelProperty(value = "距离")
private BigDecimal distance;
}
diff --git a/src/main/resources/templates/febs/views/modules/shop/add.html b/src/main/resources/templates/febs/views/modules/shop/add.html
index 6e1e33a..3a77c86 100644
--- a/src/main/resources/templates/febs/views/modules/shop/add.html
+++ b/src/main/resources/templates/febs/views/modules/shop/add.html
@@ -45,7 +45,7 @@
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">联系方式：</label>
<div class="layui-input-block">
- <input type="text" name="shopName" autocomplete="off" class="layui-input" >
+ <input type="text" name="phone" autocomplete="off" class="layui-input" >
</div>
</div>
@@ -86,7 +86,7 @@
<label class="layui-form-label febs-form-item-require">详细地址</label>
<div class="layui-input-block">
<div class="layui-inline layui-col-md9">
- <input type="text" name="shopName" autocomplete="off" class="layui-input" id="tipinput">
+ <input type="text" name="shopAddress" autocomplete="off" class="layui-input" id="tipinput">
</div>
<div class="layui-inline">
<button class="layui-btn" id="select-address" type="button">选择地址</button>
@@ -105,8 +105,8 @@
<div class="layui-form-item febs-hide">
<div class="layui-input-block">
- <input type="text" name="longitude" autocomplete="off" class="layui-input" >
- <input type="text" name="latitude" autocomplete="off" class="layui-input" >
+ <input type="text" name="longitude" id="longitude" autocomplete="off" class="layui-input" >
+ <input type="text" name="latitude" id="latitude" autocomplete="off" class="layui-input" >
</div>
</div>
@@ -130,6 +130,8 @@
$view = $('#shop-add'),
$selectAddress = $('#select-address'),
$tipinput = $('#tipinput'),
+ $latitude = $('#latitude'),
+ $longitude = $('#longitude'),
validate = layui.validate
, layarea = layui.layarea;
@@ -158,10 +160,15 @@
formSelects.render();
form.on('submit(shop-add-form-submit)', function (data) {
- febs.post(ctx + 'admin/news/addNewsInfo', data.field, function () {
+ if(!data.field.longitude || !data.field.latitude) {
+ febs.alert.warn('请点击选择地址');
+ return;
+ }
+
+ febs.post(ctx + 'admin/shop/add', data.field, function () {
layer.closeAll();
febs.alert.success('操作成功');
- $('#febs-newInfo').find('#reset').click();
+ $('#febs-shopInfo').find('#reset').click();
});
return false;
});
@@ -208,7 +215,7 @@
});
}
- $view.find('#container').css({"height": document.documentElement.clientHeight - 97 + 'px'});
+ $view.find('#container').css({"height": 500 + 'px'});
var map = new AMap.Map("container", {
resizeEnable: true,
@@ -238,14 +245,16 @@
geocoder.getLocation(address, function(status, result) {
console.log(result);
console.log(status)
- if (status === 'complete'&&result.geocodes.length) {
+ if (status === 'complete' && result.geocodes.length) {
var lnglat = result.geocodes[0].location
- document.getElementById('lnglat').value = lnglat;
marker.setPosition(lnglat);
map.add(marker);
map.setFitView(marker);
+
+ $latitude.val(lnglat.lat);
+ $longitude.val(lnglat.lng);
}else{
- log.error('根据地址查询位置失败');
+ layui.msg('根据地址查询位置失败');
}
});
}
diff --git a/src/main/resources/templates/febs/views/modules/shop/shopList.html b/src/main/resources/templates/febs/views/modules/shop/shopList.html
index d6d3b12..12c1adc 100644
--- a/src/main/resources/templates/febs/views/modules/shop/shopList.html
+++ b/src/main/resources/templates/febs/views/modules/shop/shopList.html
@@ -73,10 +73,10 @@
var data = obj.data,
layEvent = obj.event;
if (layEvent === 'shopInfoUpdate') {
- febs.modal.open('编辑', 'modules/news/shopInfoUpdate/' + data.id, {
+ febs.modal.open('编辑', 'modules/shop/update/' + data.id, {
btn: ['提交', '取消'],
yes: function (index, layero) {
- $('#newsInfo-update').find('#submit').trigger('click');
+ $('#shop-update').find('#submit').trigger('click');
},
btn2: function () {
layer.closeAll();
@@ -91,7 +91,7 @@
});
function delShopInfo(id) {
- febs.get(ctx + 'admin/news/delShopInfo/' + id, null, function () {
+ febs.get(ctx + 'admin/shop/del/' + id, null, function () {
febs.alert.success('操作成功');
$query.click();
});
@@ -114,7 +114,7 @@
febs.modal.open('新增', 'modules/shop/add/', {
btn: ['提交', '取消'],
yes: function (index, layero) {
- $('#newsInfo-add').find('#submit').trigger('click');
+ $('#shop-add').find('#submit').trigger('click');
},
btn2: function () {
layer.closeAll();
@@ -130,7 +130,7 @@
cols: [[
{field: 'shopImage', title: '店铺图片',
templet: function (d) {
- return '<a lay-event="seeImgThumb"><img id="seeImgThumb'+d.id+'" src="'+d.thumb+'" alt=""></a>';
+ return '<a lay-event="seeImgThumb"><img id="seeImgThumb'+d.id+'" src="'+d.shopImage+'" alt=""></a>';
}, minWidth: 150,align:'center'},
{field: 'shopName', title: '店铺名称', minWidth: 120,align:'center'},
{field: 'phone', title: '联系方式', minWidth: 120,align:'center'},
@@ -151,14 +151,13 @@
}
form.on('switch(isTopSwitch)', function (data) {
- console.log(data.value);
if (data.elem.checked) {
- febs.post(ctx + 'admin/news/topNews/' + data.value, null, function () {
+ febs.post(ctx + 'admin/shop/upOrDown/' + data.value + '/' + 1, null, function () {
febs.alert.success('设置成功');
$query.click();
});
} else {
- febs.post(ctx + 'admin/news/unTopNews/' + data.value, null, function () {
+ febs.post(ctx + 'admin/shop/upOrDown/' + data.value + '/' + 2, null, function () {
febs.alert.success('设置成功');
$query.click();
});
diff --git a/src/main/resources/templates/febs/views/modules/shop/update.html b/src/main/resources/templates/febs/views/modules/shop/update.html
new file mode 100644
index 0000000..c46b4a9
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/shop/update.html
@@ -0,0 +1,306 @@
+<style>
+ #shop-update {
+ padding: 20px 25px 25px 0;
+ }
+
+ #shop-update .layui-treeSelect .ztree li a, .ztree li span {
+ margin: 0 0 2px 3px !important;
+ }
+ #shop-update #data-permission-tree-block {
+ border: 1px solid #eee;
+ border-radius: 2px;
+ padding: 3px 0;
+ }
+ #shop-update .layui-treeSelect .ztree li span.button.switch {
+ top: 1px;
+ left: 3px;
+ }
+ #shop-update img{
+ max-width:100px
+ }
+ #panel {
+ position: absolute;
+ background-color: white;
+ max-height: 90%;
+ overflow-y: auto;
+ top: 10px;
+ right: 10px;
+ width: 280px;
+ }
+ .amap-sug-result {
+ z-index: 19891016;
+ }
+
+</style>
+<script type="text/javascript" src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
+<div class="layui-fluid" id="shop-update">
+ <form class="layui-form" action="" lay-filter="shop-update-form">
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">店铺名称：</label>
+ <div class="layui-input-block">
+ <input type="text" name="shopName" autocomplete="off" class="layui-input" >
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">联系方式：</label>
+ <div class="layui-input-block">
+ <input type="text" name="phone" autocomplete="off" class="layui-input" >
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">缩略图：</label>
+ <div class="layui-input-block">
+ <button type="button" class="layui-btn" id="imageUpload" style="background-color: #009688; margin-bottom: 2px">图片上传</button>
+ <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
+ <div class=" layui-upload-list view-images" id="thumbImage">
+ </div>
+ </blockquote>
+ <div class="febs-hide">
+ <input type="text" id="thumb" name="shopImage" autocomplete="off" class="layui-input" readonly>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" id="area-picker">
+ <div class="layui-form-label febs-form-item-require">选择地区</div>
+ <div class="layui-input-inline" style="width: 200px;">
+ <select name="province" class="province-selector" lay-filter="province-1">
+ <option value="">请选择省</option>
+ </select>
+ </div>
+ <div class="layui-input-inline" style="width: 200px;">
+ <select name="city" class="city-selector" lay-filter="city-1">
+ <option value="">请选择市</option>
+ </select>
+ </div>
+ <div class="layui-input-inline" style="width: 200px;">
+ <select name="county" class="county-selector" lay-filter="county-1">
+ <option value="">请选择区</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">详细地址</label>
+ <div class="layui-input-block">
+ <div class="layui-inline layui-col-md9">
+ <input type="text" name="shopAddress" autocomplete="off" class="layui-input" id="tipinput">
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn" id="select-address" type="button">选择地址</button>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label"></label>
+ <div class="layui-input-block">
+ <div style="padding: .1rem;">
+ <div id="container" class="map"></div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item febs-hide">
+ <div class="layui-input-block">
+ <input type="text" name="longitude" id="longitude" autocomplete="off" class="layui-input" >
+ <input type="text" name="latitude" id="latitude" autocomplete="off" class="layui-input" >
+ </div>
+ </div>
+
+
+ <div class="layui-form-item febs-hide">
+ <button class="layui-btn" lay-submit="" lay-filter="shop-update-form-submit" id="submit"></button>
+ </div>
+ </form>
+</div>
+
+<script data-th-inline="javascript">
+ layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree','layedit', 'laydate', 'upload', 'layarea'], function () {
+ var $ = layui.$,
+ febs = layui.febs,
+ layer = layui.layer,
+ upload = layui.upload,
+ formSelects = layui.formSelects,
+ form = layui.form,
+ laydate = layui.laydate,
+ layedit = layui.layedit,
+ shopInfo = [[${shopInfo}]],
+ $view = $('#shop-update'),
+ $selectAddress = $('#select-address'),
+ $tipinput = $('#tipinput'),
+ $latitude = $('#latitude'),
+ $longitude = $('#longitude'),
+ validate = layui.validate
+ , layarea = layui.layarea;
+
+ form.render();
+ laydate.render({
+ elem: '#febs-form-group-date'
+ });
+
+ layedit.set({ //设置图片接口
+ uploadImage: {
+ url: 'admin/goods/uploadFileBase64', //接口url
+ type: 'post',
+ }
+ });
+ //创建一个编辑器
+ var index = layedit.build('lay_edit',{
+ height: 300
+ });
+ form.verify({
+ //content富文本域中的lay-verify值
+ content: function(value) {
+ return layedit.sync(index);
+ }
+ });
+
+ formSelects.render();
+ form.on('submit(shop-update-form-submit)', function (data) {
+ febs.post(ctx + 'admin/shop/update', data.field, function () {
+ layer.closeAll();
+ febs.alert.success('操作成功');
+ $('#febs-shopInfo').find('#reset').click();
+ });
+ return false;
+ });
+
+ upload.render({
+ elem: '#imageUpload'
+ ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+ ,multiple: false
+ ,before: function(obj){
+ //预读本地文件示例，不支持ie8
+ obj.preview(function(index, file, result){
+ $('#thumbImage').html('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img" style="width: 100px">')
+ });
+ }
+ ,done: function(res){
+ $("#thumb").val(res.data.src);
+ }
+ });
+
+
+ bindUpload();
+ function bindUpload() {
+ upload.render({
+ elem: '.upload'
+ ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+ ,accept: 'file'
+ ,before: function(obj){
+ layer.msg('上传中', {icon: 16, time: 0});
+ }
+ ,done: function(res){
+ var item = this.item;
+ //如果上传失败
+ if(res.code !== 0){
+ return layer.msg('上传失败');
+ }
+
+ // $(item).parent().prev().find('input').val(res.data[0]);
+ $("#videoUrl").val(res.data.src);
+ layer.msg('上传完毕', {icon: 1});
+ }
+ ,error: function(err){
+ return layer.msg('上传失败');
+ }
+ });
+ }
+
+ var map = new AMap.Map("container", {
+ resizeEnable: true,
+ zoom: 14
+ });
+
+
+ initUserValue();
+ function initUserValue() {
+ var thumb = shopInfo.shopImage;
+ $('#thumbImage').html('<img src="' + thumb + '" alt="" class="layui-upload-img new-image" style="width: 100px">')
+ form.val("shop-update-form", {
+ "id": shopInfo.id,
+ "shopName": shopInfo.shopName,
+ "shopAddress": shopInfo.shopAddress,
+ "phone": shopInfo.phone,
+ "longitude": shopInfo.longitude,
+ "latitude": shopInfo.latitude,
+ "province": shopInfo.province,
+ "city": shopInfo.city,
+ "county": shopInfo.county,
+ });
+ bindUpload();
+
+
+ var marker = new AMap.Marker();
+ marker.setPosition([shopInfo.longitude, shopInfo.latitude]);
+ map.add(marker);
+ map.setFitView(marker);
+ }
+
+ $view.find('#container').css({"height": 500 + 'px'});
+
+ AMap.plugin('AMap.AutoComplete', function() {
+ var auto = new AMap.AutoComplete({
+ input: "tipinput"
+ });
+
+ // AMap.Event.addListener(auto, "select", function(e) {
+ // console.log(e);
+ // })
+ })
+
+ var geocoder = new AMap.Geocoder({
+ });
+
+ var marker = new AMap.Marker();
+ function geoCode() {
+ var address = $tipinput.val()
+ if (!address) {
+ return;
+ }
+
+ geocoder.getLocation(address, function(status, result) {
+ console.log(result);
+ console.log(status)
+ if (status === 'complete' && result.geocodes.length) {
+ var lnglat = result.geocodes[0].location
+ marker.setPosition(lnglat);
+ map.add(marker);
+ map.setFitView(marker);
+
+ $latitude.val(lnglat.lat);
+ $longitude.val(lnglat.lng);
+ }else{
+ layui.msg('根据地址查询位置失败');
+ }
+ });
+ }
+
+ layarea.render({
+ elem: '#area-picker',
+ data:{
+ province: shopInfo.province,
+ city: shopInfo.city,
+ county: shopInfo.county,
+ },
+ change: function (res) {
+ //选择结果
+ console.log(res);
+ map.getCity(function(info) {
+ var city = info.city ? info.city : info.province
+ if (res.city && city !== res.city) {
+ map.setCity(res.city)
+ }
+ });
+ }
+ });
+
+ $selectAddress.on('click', function() {
+ geoCode();
+ })
+ });
+</script>
+<script type="text/javascript" src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
\ No newline at end of file
--
Gitblit v1.9.1