From 6359692ea0151592bd3799547dc18cf300f2d974 Mon Sep 17 00:00:00 2001 From: kino <378907426@qq.com> Date: Tue, 19 Jan 2021 10:33:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppMerchantController.java | 131 ++++++++ .../com/ruoyi/winery/domain/AppMerchant.java | 66 ++++ .../winery/mapper/AppMerchantMapper.java | 14 + .../winery/service/IAppMerchantService.java | 14 + .../service/impl/AppMerchantServiceImpl.java | 18 ++ .../mapper/winery/AppMerchantMapper.xml | 18 ++ ruoyi-ui/src/api/winery/merchant.js | 53 +++ ruoyi-ui/src/views/winery/detail/index.vue | 27 +- ruoyi-ui/src/views/winery/merchant/index.vue | 302 ++++++++++++++++++ 9 files changed, 622 insertions(+), 21 deletions(-) create mode 100644 hope-winery/src/main/java/com/ruoyi/winery/controller/AppMerchantController.java create mode 100644 hope-winery/src/main/java/com/ruoyi/winery/domain/AppMerchant.java create mode 100644 hope-winery/src/main/java/com/ruoyi/winery/mapper/AppMerchantMapper.java create mode 100644 hope-winery/src/main/java/com/ruoyi/winery/service/IAppMerchantService.java create mode 100644 hope-winery/src/main/java/com/ruoyi/winery/service/impl/AppMerchantServiceImpl.java create mode 100644 hope-winery/src/main/resources/mapper/winery/AppMerchantMapper.xml create mode 100644 ruoyi-ui/src/api/winery/merchant.js create mode 100644 ruoyi-ui/src/views/winery/merchant/index.vue diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppMerchantController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppMerchantController.java new file mode 100644 index 000000000..2d27b287b --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppMerchantController.java @@ -0,0 +1,131 @@ +package com.ruoyi.winery.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; + +import java.util.List; +import java.util.Arrays; + +import com.itextpdf.styledxmlparser.jsoup.nodes.Document; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.winery.utils.RichTextUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.winery.domain.AppMerchant; +import com.ruoyi.winery.service.IAppMerchantService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 商户Controller + * + * @author ruoyi + * @date 2021-01-19 + */ +@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RestController +@RequestMapping("/winery/merchant" ) +public class AppMerchantController extends BaseController { + + private final IAppMerchantService iAppMerchantService; + + /** + * 查询商户列表 + */ + @PreAuthorize("@ss.hasPermi('winery:merchant:list')") + @GetMapping("/list") + public TableDataInfo list(AppMerchant appMerchant) + { + startPage(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(appMerchant); + if (StringUtils.isNotBlank(appMerchant.getName())){ + lqw.like(AppMerchant::getName ,appMerchant.getName()); + } + if (StringUtils.isNotBlank(appMerchant.getSubtitle())){ + lqw.eq(AppMerchant::getSubtitle ,appMerchant.getSubtitle()); + } + if (StringUtils.isNotBlank(appMerchant.getAvatar())){ + lqw.eq(AppMerchant::getAvatar ,appMerchant.getAvatar()); + } + if (StringUtils.isNotBlank(appMerchant.getDesc())){ + lqw.eq(AppMerchant::getDesc ,appMerchant.getDesc()); + } + List list = iAppMerchantService.list(lqw); + return getDataTable(list); + } + + /** + * 导出商户列表 + */ + @PreAuthorize("@ss.hasPermi('winery:merchant:export')" ) + @Log(title = "商户" , businessType = BusinessType.EXPORT) + @GetMapping("/export" ) + public AjaxResult export(AppMerchant appMerchant) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper(appMerchant); + List list = iAppMerchantService.list(lqw); + ExcelUtil util = new ExcelUtil(AppMerchant. class); + return util.exportExcel(list, "merchant" ); + } + + /** + * 获取商户详细信息 + */ + @PreAuthorize("@ss.hasPermi('winery:merchant:query')" ) + @GetMapping(value = "/{id}" ) + public AjaxResult getInfo(@PathVariable("id" ) String id) { + return AjaxResult.success(iAppMerchantService.getById(id)); + } + + /** + * 新增商户 + */ + @PreAuthorize("@ss.hasPermi('winery:merchant:add')" ) + @Log(title = "商户" , businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody AppMerchant appMerchant) { + String richText = appMerchant.getDesc(); + if (richText != null && StringUtils.isNotEmpty(richText)) { + Document doc = RichTextUtil.setImgStyle(richText, "width: 100%"); + appMerchant.setDesc(doc.body().children().toString()); + } + return toAjax(iAppMerchantService.save(appMerchant) ? 1 : 0); + } + + /** + * 修改商户 + */ + @PreAuthorize("@ss.hasPermi('winery:merchant:edit')" ) + @Log(title = "商户" , businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AppMerchant appMerchant) { + String richText = appMerchant.getDesc(); + if (richText != null && StringUtils.isNotEmpty(richText)) { + Document doc = RichTextUtil.setImgStyle(richText, "width: 100%"); + appMerchant.setDesc(doc.body().children().toString()); + } + return toAjax(iAppMerchantService.updateById(appMerchant) ? 1 : 0); + } + + /** + * 删除商户 + */ + @PreAuthorize("@ss.hasPermi('winery:merchant:remove')" ) + @Log(title = "商户" , businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}" ) + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(iAppMerchantService.removeByIds(Arrays.asList(ids)) ? 1 : 0); + } +} diff --git a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppMerchant.java b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppMerchant.java new file mode 100644 index 000000000..d4d4f8c72 --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppMerchant.java @@ -0,0 +1,66 @@ +package com.ruoyi.winery.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.Accessors; +import com.ruoyi.common.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 商户对象 app_merchant + * + * @author ruoyi + * @date 2021-01-19 + */ +@Data +@ToString +@EqualsAndHashCode +@NoArgsConstructor +@Accessors(chain = true) +@TableName("app_merchant") +public class AppMerchant implements Serializable { + +private static final long serialVersionUID=1L; + + + /** ID */ + @TableId(value = "id") + private String id; + + /** 商户名称 */ + @Excel(name = "商户名称") + private String name; + + /** 副标题 */ + @Excel(name = "副标题") + private String subtitle; + + /** 图标 */ + @Excel(name = "图标") + private String avatar; + + /** 介绍 */ + @Excel(name = "介绍") + private String desc; + + /** 创建者 */ + private String createBy; + + /** 创建时间 */ + private Date createTime; + + /** 更新者 */ + private String updateBy; + + /** 更新时间 */ + private Date updateTime; +} diff --git a/hope-winery/src/main/java/com/ruoyi/winery/mapper/AppMerchantMapper.java b/hope-winery/src/main/java/com/ruoyi/winery/mapper/AppMerchantMapper.java new file mode 100644 index 000000000..5de8f5072 --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/mapper/AppMerchantMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.winery.mapper; + +import com.ruoyi.winery.domain.AppMerchant; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 商户Mapper接口 + * + * @author ruoyi + * @date 2021-01-19 + */ +public interface AppMerchantMapper extends BaseMapper { + +} diff --git a/hope-winery/src/main/java/com/ruoyi/winery/service/IAppMerchantService.java b/hope-winery/src/main/java/com/ruoyi/winery/service/IAppMerchantService.java new file mode 100644 index 000000000..c20dd45a9 --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/service/IAppMerchantService.java @@ -0,0 +1,14 @@ +package com.ruoyi.winery.service; + +import com.ruoyi.winery.domain.AppMerchant; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 商户Service接口 + * + * @author ruoyi + * @date 2021-01-19 + */ +public interface IAppMerchantService extends IService { + +} diff --git a/hope-winery/src/main/java/com/ruoyi/winery/service/impl/AppMerchantServiceImpl.java b/hope-winery/src/main/java/com/ruoyi/winery/service/impl/AppMerchantServiceImpl.java new file mode 100644 index 000000000..c8fd9b697 --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/service/impl/AppMerchantServiceImpl.java @@ -0,0 +1,18 @@ +package com.ruoyi.winery.service.impl; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.winery.mapper.AppMerchantMapper; +import com.ruoyi.winery.domain.AppMerchant; +import com.ruoyi.winery.service.IAppMerchantService; + +/** + * 商户Service业务层处理 + * + * @author ruoyi + * @date 2021-01-19 + */ +@Service +public class AppMerchantServiceImpl extends ServiceImpl implements IAppMerchantService { + +} diff --git a/hope-winery/src/main/resources/mapper/winery/AppMerchantMapper.xml b/hope-winery/src/main/resources/mapper/winery/AppMerchantMapper.xml new file mode 100644 index 000000000..ffb7c1c67 --- /dev/null +++ b/hope-winery/src/main/resources/mapper/winery/AppMerchantMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/winery/merchant.js b/ruoyi-ui/src/api/winery/merchant.js new file mode 100644 index 000000000..f92a90a1c --- /dev/null +++ b/ruoyi-ui/src/api/winery/merchant.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询商户列表 +export function listMerchant(query) { + return request({ + url: '/winery/merchant/list', + method: 'get', + params: query + }) +} + +// 查询商户详细 +export function getMerchant(id) { + return request({ + url: '/winery/merchant/' + id, + method: 'get' + }) +} + +// 新增商户 +export function addMerchant(data) { + return request({ + url: '/winery/merchant', + method: 'post', + data: data + }) +} + +// 修改商户 +export function updateMerchant(data) { + return request({ + url: '/winery/merchant', + method: 'put', + data: data + }) +} + +// 删除商户 +export function delMerchant(id) { + return request({ + url: '/winery/merchant/' + id, + method: 'delete' + }) +} + +// 导出商户 +export function exportMerchant(query) { + return request({ + url: '/winery/merchant/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/winery/detail/index.vue b/ruoyi-ui/src/views/winery/detail/index.vue index ec8abe0a4..788caf0bc 100644 --- a/ruoyi-ui/src/views/winery/detail/index.vue +++ b/ruoyi-ui/src/views/winery/detail/index.vue @@ -46,14 +46,8 @@ @keyup.enter.native="handleQuery" /> - - + + @@ -130,10 +124,7 @@ - + - + - + 请选择字典生成 @@ -268,10 +256,7 @@ export default { { required: true, message: "商品ID不能为空", trigger: "blur" } ], status: [ - { required: true, message: "明细状态: -5.退款申请 -6.退款中 -7.退款成功不能为空", trigger: "blur" } + { required: true, message: "明细状态不能为空", trigger: "blur" } ], createTime: [ { required: true, message: "创建时间不能为空", trigger: "blur" } diff --git a/ruoyi-ui/src/views/winery/merchant/index.vue b/ruoyi-ui/src/views/winery/merchant/index.vue new file mode 100644 index 000000000..add20c1fa --- /dev/null +++ b/ruoyi-ui/src/views/winery/merchant/index.vue @@ -0,0 +1,302 @@ + + +