dianliang/dl-sale-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单部分、注意事项等页面

Browse Source
This commit is contained in:
lixiang 2024-10-25 18:12:58 +08:00
parent dcb4805669
commit 7b1123f1ae
22 changed files with 2547 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
ruoyi-admin/src/main/java/com/ruoyi/system/controller/BsNoteController.java Normal file
View File

@ -0,0 +1,104 @@
package com.ruoyi.system.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
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.system.domain.BsNote;
import com.ruoyi.system.service.IBsNoteService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 注意事项Controller
*
* @author ruoyi
* @date 2024-10-25
*/
@RestController
@RequestMapping("/system/note")
public class BsNoteController extends BaseController
{
@Autowired
private IBsNoteService bsNoteService;
/**
* 查询注意事项列表
*/
@PreAuthorize("@ss.hasPermi('system:note:list')")
@GetMapping("/list")
public TableDataInfo list(BsNote bsNote)
{
startPage();
List<BsNote> list = bsNoteService.selectBsNoteList(bsNote);
return getDataTable(list);
}
/**
* 导出注意事项列表
*/
@PreAuthorize("@ss.hasPermi('system:note:export')")
@Log(title = "注意事项", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BsNote bsNote)
{
List<BsNote> list = bsNoteService.selectBsNoteList(bsNote);
ExcelUtil<BsNote> util = new ExcelUtil<BsNote>(BsNote.class);
util.exportExcel(response, list, "注意事项数据");
}
/**
* 获取注意事项详细信息
*/
@PreAuthorize("@ss.hasPermi('system:note:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(bsNoteService.selectBsNoteById(id));
}
/**
* 新增注意事项
*/
@PreAuthorize("@ss.hasPermi('system:note:add')")
@Log(title = "注意事项", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BsNote bsNote)
{
return toAjax(bsNoteService.insertBsNote(bsNote));
}
/**
* 修改注意事项
*/
@PreAuthorize("@ss.hasPermi('system:note:edit')")
@Log(title = "注意事项", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BsNote bsNote)
{
return toAjax(bsNoteService.updateBsNote(bsNote));
}
/**
* 删除注意事项
*/
@PreAuthorize("@ss.hasPermi('system:note:remove')")
@Log(title = "注意事项", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(bsNoteService.deleteBsNoteByIds(ids));
}
}

116
ruoyi-admin/src/main/java/com/ruoyi/system/controller/BsOrderController.java Normal file
View File

@ -0,0 +1,116 @@
package com.ruoyi.system.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
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.system.domain.BsOrder;
import com.ruoyi.system.service.IBsOrderService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 订单Controller
*
* @author ruoyi
* @date 2024-10-25
*/
@RestController
@RequestMapping("/system/order")
public class BsOrderController extends BaseController
{
@Autowired
private IBsOrderService bsOrderService;
/**
* 查询订单列表
*/
@PreAuthorize("@ss.hasPermi('system:order:list')")
@GetMapping("/list")
public TableDataInfo list(BsOrder bsOrder)
{
startPage();
List<BsOrder> list = bsOrderService.selectBsOrderList(bsOrder);
return getDataTable(list);
}
/**
* 导出订单列表
*/
@PreAuthorize("@ss.hasPermi('system:order:export')")
@Log(title = "订单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BsOrder bsOrder)
{
List<BsOrder> list = bsOrderService.selectBsOrderList(bsOrder);
ExcelUtil<BsOrder> util = new ExcelUtil<BsOrder>(BsOrder.class);
util.exportExcel(response, list, "订单数据");
}
/**
* 获取订单详细信息
*/
@PreAuthorize("@ss.hasPermi('system:order:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(bsOrderService.selectBsOrderById(id));
}
/**
* 根据订单号获取订单详细信息
*/
@PreAuthorize("@ss.hasPermi('system:order:query')")
@GetMapping(value = "/orderNo/{num}")
public AjaxResult getInfoByOrderNo(@PathVariable("num") String num)
{
return success(bsOrderService.selectBsOrderByOrderNo(num));
}
/**
* 新增订单
*/
@PreAuthorize("@ss.hasPermi('system:order:add')")
@Log(title = "订单", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BsOrder bsOrder)
{
return toAjax(bsOrderService.insertBsOrder(bsOrder));
}
/**
* 修改订单
*/
@PreAuthorize("@ss.hasPermi('system:order:edit')")
@Log(title = "订单", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BsOrder bsOrder)
{
return toAjax(bsOrderService.updateBsOrder(bsOrder));
}
/**
* 删除订单
*/
@PreAuthorize("@ss.hasPermi('system:order:remove')")
@Log(title = "订单", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(bsOrderService.deleteBsOrderByIds(ids));
}
}

65
ruoyi-admin/src/main/java/com/ruoyi/system/domain/BsNote.java Normal file
View File

@ -0,0 +1,65 @@
package com.ruoyi.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 注意事项对象 bs_note
*
* @author ruoyi
* @date 2024-10-25
*/
public class BsNote extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 名称 */
@Excel(name = "名称")
private String name;
/** 详情 */
@Excel(name = "详情")
private String design;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setName(String name)
{
this.name = name;
}
public String getName()
{
return name;
}
public void setDesign(String design)
{
this.design = design;
}
public String getDesign()
{
return design;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("name", getName())
.append("design", getDesign())
.toString();
}
}

139
ruoyi-admin/src/main/java/com/ruoyi/system/domain/BsOrder.java Normal file
View File

@ -0,0 +1,139 @@
package com.ruoyi.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 订单对象 bs_order
*
* @author ruoyi
* @date 2024-10-25
*/
public class BsOrder extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 订单号 */
@Excel(name = "订单号")
private String orderNo;
/** 1:微信，2:支付宝 */
@Excel(name = "1:微信，2:支付宝")
private Long channel;
/** 支付时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date payTime;
/** 商品名称 */
@Excel(name = "商品名称")
private String goodsName;
/** 商品id */
@Excel(name = "商品id")
private Long goodsmin;
/** 订单价格 */
@Excel(name = "订单价格")
private String price;
/** 购买人id */
@Excel(name = "购买人id")
private String createId;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setOrderNo(String orderNo)
{
this.orderNo = orderNo;
}
public String getOrderNo()
{
return orderNo;
}
public void setChannel(Long channel)
{
this.channel = channel;
}
public Long getChannel()
{
return channel;
}
public void setPayTime(Date payTime)
{
this.payTime = payTime;
}
public Date getPayTime()
{
return payTime;
}
public void setGoodsName(String goodsName)
{
this.goodsName = goodsName;
}
public String getGoodsName()
{
return goodsName;
}
public void setGoodsmin(Long goodsmin)
{
this.goodsmin = goodsmin;
}
public Long getGoodsmin()
{
return goodsmin;
}
public void setPrice(String price)
{
this.price = price;
}
public String getPrice()
{
return price;
}
public void setCreateId(String createId)
{
this.createId = createId;
}
public String getCreateId()
{
return createId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("orderNo", getOrderNo())
.append("channel", getChannel())
.append("payTime", getPayTime())
.append("goodsName", getGoodsName())
.append("goodsmin", getGoodsmin())
.append("price", getPrice())
.append("createId", getCreateId())
.append("createTime", getCreateTime())
.toString();
}
}

61
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BsNoteMapper.java Normal file
View File

@ -0,0 +1,61 @@
package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.BsNote;
/**
* 注意事项Mapper接口
*
* @author ruoyi
* @date 2024-10-25
*/
public interface BsNoteMapper
{
/**
* 查询注意事项
*
* @param id 注意事项主键
* @return 注意事项
*/
public BsNote selectBsNoteById(Long id);
/**
* 查询注意事项列表
*
* @param bsNote 注意事项
* @return 注意事项集合
*/
public List<BsNote> selectBsNoteList(BsNote bsNote);
/**
* 新增注意事项
*
* @param bsNote 注意事项
* @return 结果
*/
public int insertBsNote(BsNote bsNote);
/**
* 修改注意事项
*
* @param bsNote 注意事项
* @return 结果
*/
public int updateBsNote(BsNote bsNote);
/**
* 删除注意事项
*
* @param id 注意事项主键
* @return 结果
*/
public int deleteBsNoteById(Long id);
/**
* 批量删除注意事项
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteBsNoteByIds(Long[] ids);
}

69
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BsOrderMapper.java Normal file
View File

@ -0,0 +1,69 @@
package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.BsOrder;
/**
* 订单Mapper接口
*
* @author ruoyi
* @date 2024-10-25
*/
public interface BsOrderMapper
{
/**
* 查询订单
*
* @param id 订单主键
* @return 订单
*/
public BsOrder selectBsOrderById(Long id);
/**
* 查询订单
*
* @param id 订单主键
* @return 订单
*/
public BsOrder selectBsOrderByOrderNo(String num);
/**
* 查询订单列表
*
* @param bsOrder 订单
* @return 订单集合
*/
public List<BsOrder> selectBsOrderList(BsOrder bsOrder);
/**
* 新增订单
*
* @param bsOrder 订单
* @return 结果
*/
public int insertBsOrder(BsOrder bsOrder);
/**
* 修改订单
*
* @param bsOrder 订单
* @return 结果
*/
public int updateBsOrder(BsOrder bsOrder);
/**
* 删除订单
*
* @param id 订单主键
* @return 结果
*/
public int deleteBsOrderById(Long id);
/**
* 批量删除订单
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteBsOrderByIds(Long[] ids);
}

61
ruoyi-admin/src/main/java/com/ruoyi/system/service/IBsNoteService.java Normal file
View File

@ -0,0 +1,61 @@
package com.ruoyi.system.service;
import java.util.List;
import com.ruoyi.system.domain.BsNote;
/**
* 注意事项Service接口
*
* @author ruoyi
* @date 2024-10-25
*/
public interface IBsNoteService
{
/**
* 查询注意事项
*
* @param id 注意事项主键
* @return 注意事项
*/
public BsNote selectBsNoteById(Long id);
/**
* 查询注意事项列表
*
* @param bsNote 注意事项
* @return 注意事项集合
*/
public List<BsNote> selectBsNoteList(BsNote bsNote);
/**
* 新增注意事项
*
* @param bsNote 注意事项
* @return 结果
*/
public int insertBsNote(BsNote bsNote);
/**
* 修改注意事项
*
* @param bsNote 注意事项
* @return 结果
*/
public int updateBsNote(BsNote bsNote);
/**
* 批量删除注意事项
*
* @param ids 需要删除的注意事项主键集合
* @return 结果
*/
public int deleteBsNoteByIds(Long[] ids);
/**
* 删除注意事项信息
*
* @param id 注意事项主键
* @return 结果
*/
public int deleteBsNoteById(Long id);
}

69
ruoyi-admin/src/main/java/com/ruoyi/system/service/IBsOrderService.java Normal file
View File

@ -0,0 +1,69 @@
package com.ruoyi.system.service;
import java.util.List;
import com.ruoyi.system.domain.BsOrder;
/**
* 订单Service接口
*
* @author ruoyi
* @date 2024-10-25
*/
public interface IBsOrderService
{
/**
* 查询订单
*
* @param id 订单主键
* @return 订单
*/
public BsOrder selectBsOrderById(Long id);
/**
* 根据订单编号查询订单
*
* @param num 订单编号
* @return 订单
*/
public BsOrder selectBsOrderByOrderNo(String num);
/**
* 查询订单列表
*
* @param bsOrder 订单
* @return 订单集合
*/
public List<BsOrder> selectBsOrderList(BsOrder bsOrder);
/**
* 新增订单
*
* @param bsOrder 订单
* @return 结果
*/
public int insertBsOrder(BsOrder bsOrder);
/**
* 修改订单
*
* @param bsOrder 订单
* @return 结果
*/
public int updateBsOrder(BsOrder bsOrder);
/**
* 批量删除订单
*
* @param ids 需要删除的订单主键集合
* @return 结果
*/
public int deleteBsOrderByIds(Long[] ids);
/**
* 删除订单信息
*
* @param id 订单主键
* @return 结果
*/
public int deleteBsOrderById(Long id);
}

93
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BsNoteServiceImpl.java Normal file
View File

@ -0,0 +1,93 @@
package com.ruoyi.system.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.BsNoteMapper;
import com.ruoyi.system.domain.BsNote;
import com.ruoyi.system.service.IBsNoteService;
/**
* 注意事项Service业务层处理
*
* @author ruoyi
* @date 2024-10-25
*/
@Service
public class BsNoteServiceImpl implements IBsNoteService
{
@Autowired
private BsNoteMapper bsNoteMapper;
/**
* 查询注意事项
*
* @param id 注意事项主键
* @return 注意事项
*/
@Override
public BsNote selectBsNoteById(Long id)
{
return bsNoteMapper.selectBsNoteById(id);
}
/**
* 查询注意事项列表
*
* @param bsNote 注意事项
* @return 注意事项
*/
@Override
public List<BsNote> selectBsNoteList(BsNote bsNote)
{
return bsNoteMapper.selectBsNoteList(bsNote);
}
/**
* 新增注意事项
*
* @param bsNote 注意事项
* @return 结果
*/
@Override
public int insertBsNote(BsNote bsNote)
{
return bsNoteMapper.insertBsNote(bsNote);
}
/**
* 修改注意事项
*
* @param bsNote 注意事项
* @return 结果
*/
@Override
public int updateBsNote(BsNote bsNote)
{
return bsNoteMapper.updateBsNote(bsNote);
}
/**
* 批量删除注意事项
*
* @param ids 需要删除的注意事项主键
* @return 结果
*/
@Override
public int deleteBsNoteByIds(Long[] ids)
{
return bsNoteMapper.deleteBsNoteByIds(ids);
}
/**
* 删除注意事项信息
*
* @param id 注意事项主键
* @return 结果
*/
@Override
public int deleteBsNoteById(Long id)
{
return bsNoteMapper.deleteBsNoteById(id);
}
}

109
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BsOrderServiceImpl.java Normal file
View File

@ -0,0 +1,109 @@
package com.ruoyi.system.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.BsOrderMapper;
import com.ruoyi.system.domain.BsOrder;
import com.ruoyi.system.service.IBsOrderService;
/**
* 订单Service业务层处理
*
* @author ruoyi
* @date 2024-10-25
*/
@Service
public class BsOrderServiceImpl implements IBsOrderService
{
@Autowired
private BsOrderMapper bsOrderMapper;
/**
* 查询订单
*
* @param id 订单主键
* @return 订单
*/
@Override
public BsOrder selectBsOrderById(Long id)
{
return bsOrderMapper.selectBsOrderById(id);
}
/**
* 根据订单编号查询订单
*
* @param num 订单编号
* @return 订单
*/
@Override
public BsOrder selectBsOrderByOrderNo(String num)
{
return bsOrderMapper.selectBsOrderByOrderNo(num);
}
/**
* 查询订单列表
*
* @param bsOrder 订单
* @return 订单
*/
@Override
public List<BsOrder> selectBsOrderList(BsOrder bsOrder)
{
return bsOrderMapper.selectBsOrderList(bsOrder);
}
/**
* 新增订单
*
* @param bsOrder 订单
* @return 结果
*/
@Override
public int insertBsOrder(BsOrder bsOrder)
{
bsOrder.setOrderNo(IdUtils.fastSimpleUUID());
bsOrder.setCreateTime(DateUtils.getNowDate());
return bsOrderMapper.insertBsOrder(bsOrder);
}
/**
* 修改订单
*
* @param bsOrder 订单
* @return 结果
*/
@Override
public int updateBsOrder(BsOrder bsOrder)
{
return bsOrderMapper.updateBsOrder(bsOrder);
}
/**
* 批量删除订单
*
* @param ids 需要删除的订单主键
* @return 结果
*/
@Override
public int deleteBsOrderByIds(Long[] ids)
{
return bsOrderMapper.deleteBsOrderByIds(ids);
}
/**
* 删除订单信息
*
* @param id 订单主键
* @return 结果
*/
@Override
public int deleteBsOrderById(Long id)
{
return bsOrderMapper.deleteBsOrderById(id);
}
}

61
ruoyi-admin/src/main/resources/mapper/system/BsNoteMapper.xml Normal file
View File

@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BsNoteMapper">
<resultMap type="BsNote" id="BsNoteResult">
<result property="id" column="id" />
<result property="name" column="name" />
<result property="design" column="design" />
</resultMap>
<sql id="selectBsNoteVo">
select id, name, design from bs_note
</sql>
<select id="selectBsNoteList" parameterType="BsNote" resultMap="BsNoteResult">
<include refid="selectBsNoteVo"/>
<where>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="design != null and design != ''"> and design = #{design}</if>
</where>
</select>
<select id="selectBsNoteById" parameterType="Long" resultMap="BsNoteResult">
<include refid="selectBsNoteVo"/>
where id = #{id}
</select>
<insert id="insertBsNote" parameterType="BsNote" useGeneratedKeys="true" keyProperty="id">
insert into bs_note
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="name != null">name,</if>
<if test="design != null">design,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">#{name},</if>
<if test="design != null">#{design},</if>
</trim>
</insert>
<update id="updateBsNote" parameterType="BsNote">
update bs_note
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="design != null">design = #{design},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBsNoteById" parameterType="Long">
delete from bs_note where id = #{id}
</delete>
<delete id="deleteBsNoteByIds" parameterType="String">
delete from bs_note where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

96
ruoyi-admin/src/main/resources/mapper/system/BsOrderMapper.xml Normal file
View File

@ -0,0 +1,96 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BsOrderMapper">
<resultMap type="BsOrder" id="BsOrderResult">
<result property="id" column="id" />
<result property="orderNo" column="order_no" />
<result property="channel" column="channel" />
<result property="payTime" column="pay_time" />
<result property="goodsName" column="goods_name" />
<result property="goodsmin" column="goodsmin" />
<result property="price" column="price" />
<result property="createId" column="create_id" />
<result property="createTime" column="create_time" />
</resultMap>
<sql id="selectBsOrderVo">
select id, order_no, channel, pay_time, goods_name, goodsmin, price, create_id, create_time from bs_order
</sql>
<select id="selectBsOrderList" parameterType="BsOrder" resultMap="BsOrderResult">
<include refid="selectBsOrderVo"/>
<where>
<if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
<if test="channel != null "> and channel = #{channel}</if>
<if test="payTime != null "> and pay_time = #{payTime}</if>
<if test="goodsName != null and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
<if test="goodsmin != null "> and goodsmin = #{goodsmin}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="createId != null and createId != ''"> and create_id = #{createId}</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
</where>
</select>
<select id="selectBsOrderById" parameterType="Long" resultMap="BsOrderResult">
<include refid="selectBsOrderVo"/>
where id = #{id}
</select>
<select id="selectBsOrderByOrderNo" parameterType="string" resultMap="BsOrderResult">
<include refid="selectBsOrderVo"/>
where order_no = #{num}
</select>
<insert id="insertBsOrder" parameterType="BsOrder" useGeneratedKeys="true" keyProperty="id">
insert into bs_order
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="orderNo != null">order_no,</if>
<if test="channel != null">channel,</if>
<if test="payTime != null">pay_time,</if>
<if test="goodsName != null">goods_name,</if>
<if test="goodsmin != null">goodsmin,</if>
<if test="price != null">price,</if>
<if test="createId != null">create_id,</if>
<if test="createTime != null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderNo != null">#{orderNo},</if>
<if test="channel != null">#{channel},</if>
<if test="payTime != null">#{payTime},</if>
<if test="goodsName != null">#{goodsName},</if>
<if test="goodsmin != null">#{goodsmin},</if>
<if test="price != null">#{price},</if>
<if test="createId != null">#{createId},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</insert>
<update id="updateBsOrder" parameterType="BsOrder">
update bs_order
<trim prefix="SET" suffixOverrides=",">
<if test="orderNo != null">order_no = #{orderNo},</if>
<if test="channel != null">channel = #{channel},</if>
<if test="payTime != null">pay_time = #{payTime},</if>
<if test="goodsName != null">goods_name = #{goodsName},</if>
<if test="goodsmin != null">goodsmin = #{goodsmin},</if>
<if test="price != null">price = #{price},</if>
<if test="createId != null">create_id = #{createId},</if>
<if test="createTime != null">create_time = #{createTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBsOrderById" parameterType="Long">
delete from bs_order where id = #{id}
</delete>
<delete id="deleteBsOrderByIds" parameterType="String">
delete from bs_order where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

44
ruoyi-ui/src/api/system/note.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询注意事项列表
export function listNote(query) {
return request({
url: '/system/note/list',
method: 'get',
params: query
})
}
// 查询注意事项详细
export function getNote(id) {
return request({
url: '/system/note/' + id,
method: 'get'
})
}
// 新增注意事项
export function addNote(data) {
return request({
url: '/system/note',
method: 'post',
data: data
})
}
// 修改注意事项
export function updateNote(data) {
return request({
url: '/system/note',
method: 'put',
data: data
})
}
// 删除注意事项
export function delNote(id) {
return request({
url: '/system/note/' + id,
method: 'delete'
})
}

52
ruoyi-ui/src/api/system/order.js Normal file
View File

@ -0,0 +1,52 @@
import request from '@/utils/request'
// 查询订单列表
export function listOrder(query) {
return request({
url: '/system/order/list',
method: 'get',
params: query
})
}
// 查询订单详细
export function getOrder(id) {
return request({
url: '/system/order/' + id,
method: 'get'
})
}
// 根据订单编号查询订单详细
export function getOrderByOrderNo(num) {
return request({
url: '/system/order/orderNo/' + num,
method: 'get'
})
}
// 新增订单
export function addOrder(data) {
return request({
url: '/system/order',
method: 'post',
data: data
})
}
// 修改订单
export function updateOrder(data) {
return request({
url: '/system/order',
method: 'put',
data: data
})
}
// 删除订单
export function delOrder(id) {
return request({
url: '/system/order/' + id,
method: 'delete'
})
}

10
ruoyi-ui/src/router/index.js
View File

@ -81,6 +81,16 @@ export const constantRoutes = [
component: () => import('@/views/system/userFront/payBefore'),
hidden: true
},
{
path: '/userOrder',
component: () => import('@/views/system/userFront/order'),
hidden: true
},
{
path: '/note',
component: () => import('@/views/system/userFront/precautions'),
hidden: true
},
{
path: '',
component: Layout,

269
ruoyi-ui/src/views/system/note/index.vue Normal file
View File

@ -0,0 +1,269 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:note:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:note:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:note:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:note:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="noteList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="详情" align="center" prop="design">
<template slot-scope="scope">
<div class="introduction" :title="scope.row.design">
{{ scope.row.design }}
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:note:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:note:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改注意事项对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="名称" prop="name">
<el-input v-model="form.name" placeholder="请输入名称" />
</el-form-item>
<el-form-item label="详情">
<editor v-model="form.design" :min-height="192"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listNote, getNote, delNote, addNote, updateNote } from "@/api/system/note";
export default {
name: "Note",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 注意事项表格数据
noteList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
name: null,
design: null
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询注意事项列表 */
getList() {
this.loading = true;
listNote(this.queryParams).then(response => {
this.noteList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
name: null,
design: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加注意事项";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getNote(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改注意事项";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateNote(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addNote(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除注意事项编号为"' + ids + '"的数据项？').then(function() {
return delNote(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/note/export', {
...this.queryParams
}, `note_${new Date().getTime()}.xlsx`)
}
}
};
</script>
<style scoped>
.introduction {
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
text-overflow: ellipsis;
word-break: break-all;
}
</style>

334
ruoyi-ui/src/views/system/order/index.vue Normal file
View File

@ -0,0 +1,334 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单号" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="支付时间" prop="payTime">
<el-date-picker clearable
v-model="queryParams.payTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择支付时间">
</el-date-picker>
</el-form-item>
<el-form-item label="商品名称" prop="goodsName">
<el-input
v-model="queryParams.goodsName"
placeholder="请输入商品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="购买人id" prop="createId">
<el-input
v-model="queryParams.createId"
placeholder="请输入购买人id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- <el-row :gutter="10" class="mb8">-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['system:order:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['system:order:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['system:order:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['system:order:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
<!-- </el-row>-->
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="订单号" align="center" prop="orderNo" />
<el-table-column label="支付方式" align="center" prop="channel" >
<template slot-scope="scope">
{{ getPaymentMethod(scope.row.channel) }}
</template>
</el-table-column>
<el-table-column label="支付时间" align="center" prop="payTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="商品名称" align="center" prop="goodsName" />
<el-table-column label="商品id" align="center" prop="goodsmin" />
<el-table-column label="订单价格" align="center" prop="price" />
<el-table-column label="购买人id" align="center" prop="createId" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['system:order:edit']"-->
<!-- >修改</el-button>-->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:order:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改订单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="订单号" prop="orderNo">
<el-input v-model="form.orderNo" placeholder="请输入订单号" />
</el-form-item>
<el-form-item label="1:微信，2:支付宝" prop="channel">
<el-input v-model="form.channel" placeholder="请输入1:微信，2:支付宝" />
</el-form-item>
<el-form-item label="支付时间" prop="payTime">
<el-date-picker clearable
v-model="form.payTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择支付时间">
</el-date-picker>
</el-form-item>
<el-form-item label="商品名称" prop="goodsName">
<el-input v-model="form.goodsName" placeholder="请输入商品名称" />
</el-form-item>
<el-form-item label="订单价格" prop="price">
<el-input v-model="form.price" placeholder="请输入订单价格" />
</el-form-item>
<el-form-item label="购买人id" prop="createId">
<el-input v-model="form.createId" placeholder="请输入购买人id" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/system/order";
export default {
name: "Order",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 订单表格数据
orderList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderNo: null,
channel: null,
payTime: null,
goodsName: null,
goodsmin: null,
price: null,
createId: null,
createTime: null
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询订单列表 */
getList() {
this.loading = true;
listOrder(this.queryParams).then(response => {
this.orderList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
orderNo: null,
channel: null,
payTime: null,
goodsName: null,
goodsmin: null,
price: null,
createId: null,
createTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加订单";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getOrder(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改订单";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateOrder(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addOrder(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除订单编号为"' + ids + '"的数据项？').then(function() {
return delOrder(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/order/export', {
...this.queryParams
}, `order_${new Date().getTime()}.xlsx`)
},
getPaymentMethod(channel) {
switch (channel) {
case 1:
return '微信支付';
case 2:
return '支付宝支付';
default:
return '未知支付方式';
}
}
}
};
</script>

50
ruoyi-ui/src/views/system/userFront/details.vue
View File

@ -2,14 +2,18 @@
<div id="app">
<!-- 顶部导航栏 -->
<el-header class="navbar">
<el-menu mode="horizontal" background-color="#333" text-color="#fff" active-text-color="#ffd04b">
<el-menu-item index="1">安装教程</el-menu-item>
<el-menu-item index="2">开发服务</el-menu-item>
<el-menu-item index="3">我的订单</el-menu-item>
</el-menu>
<div class="user-actions">
<el-button type="primary">立即登录</el-button>
<el-button type="success">快速注册</el-button>
<el-menu mode="horizontal" background-color="#333" text-color="#fff" active-text-color="#ffd04b">
<el-menu-item>
<router-link to="/cus" style="display: block;">首页</router-link>
</el-menu-item>
<el-menu-item>
<router-link to="/note" style="display: block;">注意事项</router-link>
</el-menu-item>
<el-menu-item>
<router-link to="/userOrder" style="display: block;">订单查询</router-link>
</el-menu-item>
</el-menu>
</div>
</el-header>
@ -35,7 +39,12 @@
<el-card class="details-card">
<h2>{{ goods.name }}</h2>
<span>{{ goods.introduction }}</span>
<div v-html="goods.details"></div>
<div class="box" v-html="goods.details" @click="showImage($event)"></div>
<el-image-viewer
v-if="dialogVisible"
:on-close="closeImage"
:url-list="[url]"
/>
</el-card>
</el-col>
<el-col :span="4">
@ -81,8 +90,13 @@ import axios from 'axios';
import {getGoods, listAllGoods} from "@/api/system/goods";
import {listType} from "@/api/system/type";
import {listDesignType} from "@/api/system/designType";
import ElImageViewer from "element-ui/packages/image/src/image-viewer"
export default {
components: {
ElImageViewer
},
data() {
return {
// 总条数
@ -106,7 +120,11 @@ export default {
createTime: null,
},
goodsId: null, // 用于存储接收的商品ID
goodsDetail: '' // 用于存储商品详情
goodsDetail: '', // 用于存储商品详情
//图片预览相关
url: '',
dialogVisible: false,
};
},
mounted() {
@ -235,6 +253,18 @@ export default {
console.error('下载文件出错:', error);
this.$message.error('下载文件出现错误，请联系管理员！');
});
},
//图片预览相关
showImage (e) {
if (e.target.tagName == 'IMG') {
console.log(e.target.src)
this.url = e.target.src
this.dialogVisible = true
}
},
closeImage () {
this.dialogVisible = false
this.url = ''
}
}
};
@ -277,7 +307,7 @@ export default {
background-color: #333;
color: #fff;
display: flex;
justify-content: space-between;
justify-content: flex-end;
align-items: center;
padding: 10px;
}

113
ruoyi-ui/src/views/system/userFront/index.vue
View File

@ -2,14 +2,17 @@
<div id="app">
<!-- 顶部导航栏 -->
<el-header class="navbar">
<el-menu mode="horizontal" background-color="#333" text-color="#fff" active-text-color="#ffd04b">
<!-- <el-menu-item index="1">安装教程</el-menu-item>-->
<!-- <el-menu-item index="2">开发服务</el-menu-item>-->
<!-- <el-menu-item index="3">我的订单</el-menu-item>-->
</el-menu>
<div class="user-actions">
<el-button type="primary">立即登录</el-button>
<el-button type="success">快速注册</el-button>
<el-menu mode="horizontal" background-color="#333" text-color="#fff" active-text-color="#ffd04b">
<el-menu-item>
<router-link to="/note" style="display: block;">注意事项</router-link>
</el-menu-item>
<el-menu-item>
<router-link to="/userOrder" style="display: block;">订单查询</router-link>
</el-menu-item>
</el-menu>
</div>
</el-header>
@ -39,13 +42,13 @@
<el-main>
<el-menu mode="horizontal"
class="categories"
@select="handleQueryByType">
@select="handleQueryByTType">
<el-menu-item index="" @click="getList()">全部</el-menu-item>
<el-menu-item
v-for="(item, index) in typeList"
v-for="item in typeList"
:key="item.number"
:index="item.id"
@click="handleQueryByType(item.number)">
:index="String(item.id)"
@click="handleQueryByTType(item.number)">
{{ item.name }}
</el-menu-item>
</el-menu>
@ -61,15 +64,14 @@
v-for="(tag, index) in designTypeList"
:key="tag.type"
:label="tag.name"
@click="handleQueryByType(tag.type)"
@click="handleQueryByTagType(tag.type)"
style="margin: 5px;"
class="tag">
{{ tag.name }}
</el-button>
</div>
<div class="wai">
<el-row :gutter="20" >
<el-row :gutter="20" class="card-row">
<template v-if="goodsList.length > 0">
<el-col :span="6" v-for="(item, index) in goodsList" :key="index" style="margin-bottom: 30px">
<router-link :to="`/cusDetails/${item.id}`">
@ -98,23 +100,23 @@
</el-col>
</template>
<template v-else>
<div class="no-data" style="text-align: center; margin-top: 50px;">
<div class="no-data" style="text-align: center; margin-top: 150px;">
<p>暂无数据</p>
</div>
</template>
</el-row>
</div>
</div>
</div>
</div>
<pagination
<el-pagination
background
layout="prev, pager, next"
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
:current-page.sync="queryParams.pageNum"
:page-size.sync="queryParams.pageSize"
@current-change="getList">
</el-pagination>
</el-main>
<!--页脚部分-->
@ -180,9 +182,11 @@ export default {
name: null,
type: null,
},
technicalType: null
};
},
mounted() {
this.getList();
},
created() {
this.getList();
@ -193,6 +197,8 @@ export default {
methods: {
/** 查询商品列表 */
getList() {
this.queryParams.pageSize = 12
listAllGoods(this.queryParams).then(response => {
this.goodsList = response.rows;
this.total = response.total;
@ -217,15 +223,40 @@ export default {
this.queryParams.pageNum = 1;
this.getList();
},
/** 根据type查询商品列表 */
handleQueryByType(type) {
/** 根据技术type查询商品列表 */
handleQueryByTType(type) {
this.reset()
this.technicalType = type
this.queryParams.technicalTypeId = type;
listAllGoods(this.queryParams).then(response => {
this.goodsList = response.rows;
this.total = response.total;
});
},
/** 根据设计type查询商品列表 */
handleQueryByTagType(type) {
this.queryParams.technicalTypeId = this.technicalType
this.queryParams.designTypeId = type;
listAllGoods(this.queryParams).then(response => {
this.goodsList = response.rows;
this.total = response.total;
});
},
reset() {
this.queryParams = {
name: null,
cover: null,
technicalTypeId: null,
designTypeId: null,
price: null,
introduction: null,
details: null,
resource: null,
technicalName: null,
designName: null,
createTime: null,
};
},
}
};
</script>
@ -261,7 +292,7 @@ export default {
background-color: #333;
color: #fff;
display: flex;
justify-content: space-between;
justify-content: flex-end;
align-items: center;
padding: 10px;
}
@ -371,7 +402,7 @@ export default {
.wai{
margin: 0 auto;
display: flex;
justify-content: center;
justify-content: flex-start;
align-items: center;
width: 1200px;
height: 100%;
@ -404,7 +435,31 @@ export default {
}
.no-data {
display: flex;
min-height: 600px; /* 设置最小高度，根据实际需求调整 */
min-width: 1200px; /* 设置最小高度，根据实际需求调整 */
justify-content: center; /* 使卡片在行内均匀分布 */
font-size: 30px;
color: #999;
}
.el-pagination {
display: flex;
justify-content: center;
align-items: center;
}
.card-row {
display: flex;
flex-wrap: wrap;
min-height: 600px; /* 设置最小高度，根据实际需求调整 */
min-width: 1200px; /* 设置最小高度，根据实际需求调整 */
justify-content: flex-start; /* 使卡片在行内均匀分布 */
}
</style>

321
ruoyi-ui/src/views/system/userFront/order.vue Normal file
View File

@ -0,0 +1,321 @@
<template>
<div class="app">
<!-- 顶部导航栏 -->
<el-header class="header">
<div class="header-menu">
<el-menu mode="horizontal" background-color="#333" text-color="#fff" active-text-color="#ffd04b">
<router-link to="/cus">
<el-menu-item index="3" style="display: block;">首页</el-menu-item>
</router-link>
</el-menu>
</div>
<div class="header-span"><span class="header-span">订单查询</span></div>
</el-header>
<!-- 内容区域 -->
<el-main class="content">
<div class="payment">
<p class="warning">请输入您支付时的订单号进行查询。</p>
</div>
<div class="sl-from">
<el-form :model="queryParams" ref="queryForm" size="medium" :rules="rules" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单号" prop="orderNo" >
<el-input
v-model="queryParams.orderNo"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</div>
<el-table v-if="orderMsgList.length > 0 && orderMsgList[0] !== undefined" :data="orderMsgList">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="订单号" align="center" prop="orderNo" />
<el-table-column label="支付方式" align="center" prop="channel" >
<template slot-scope="scope">
{{ getPaymentMethod(scope.row.channel) }}
</template>
</el-table-column>
<el-table-column label="支付时间" align="center" prop="payTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="商品名称" align="center" prop="goodsName" />
<el-table-column label="订单价格" align="center" prop="price" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-download"
@click="getGood(scope.row.goodsmin)"
>下载</el-button>
</template>
</el-table-column>
</el-table>
<div v-else-if="showEmptyMessage" class="empty-message">
<p>没有找到相关的订单信息。</p>
</div>
</el-main>
</div>
</template>
<script>
import {getGoods} from "@/api/system/goods";
import {getOrderByOrderNo, listOrder} from "@/api/system/order";
import {parseTime} from "../../../utils/ruoyi";
import axios from "axios";
export default {
data() {
return {
queryParams: {
orderNo: null,
},
orderMsgList: [
],
// 显示搜索条件
showSearch: true,
// 表单参数
queryForm: {},
// 表单校验
rules: {
orderNo: [{required: true, message: '请输入订单号', trigger: 'blur'}],
},
loading: true,
showEmptyMessage: false, // 控制提示信息的显示
// 商品表格数据
goods: [],
// 商品表资源地址
goodsResource: null,
};
},
methods: {
parseTime,
/** 查询订单列表 */
getOrder() {
this.loading = true;
getOrderByOrderNo(this.queryParams.orderNo).then(response => {
this.orderMsgList.push(response.data);
this.showEmptyMessage = this.orderMsgList.length === 0 || this.orderMsgList[0] === undefined; // 根据数据更新提示信息
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.$refs.queryForm.validate(valid => {
if (valid) {
this.orderMsgList = [];
this.showEmptyMessage = false; // 点击查询时先隐藏提示信息
this.getOrder(); // 只有当表单通过校验时才调用获取订单的方法
} else {
console.log('表单校验失败!');
return false; // 表单校验不通过，不发送请求
}
});
},
/** 重置按钮操作 */
resetQuery() {
this.$refs.queryForm.resetFields(); // 调用 resetFields 方法重置表单
this.orderMsgList = []; // 清空订单信息
this.showEmptyMessage = false; // 隐藏提示信息
},
getPaymentMethod(channel) {
switch (channel) {
case 1:
return '微信支付';
case 2:
return '支付宝支付';
default:
return '未知支付方式';
}
},
/** 查询商品 */
getGood(id) {
getGoods(id).then(response => {
// this.goods = response.data;
this.goodsResource = response.data.resource;
if(this.goodsResource !== null){
this.downloadFile(this.goodsResource)
}else{
this.$message.error('文件不存在，请联系管理员！');
}
console.log('good',this.goodsResource)
});
},
/** 下载文件 */
downloadFile(fileUrl) {
console.log('文件路径:', fileUrl);
if (!fileUrl) {
this.$message.error('文件路径为空，无法下载');
return;
}
if (!fileUrl.startsWith('http')) {
fileUrl = 'http://127.0.0.1:8080' + fileUrl;
}
axios({
url: fileUrl,
method: 'GET',
responseType: 'blob'
}).then(response => {
const blob = new Blob([response.data], { type: 'application/octet-stream' });
// 生成新的文件名
const originalFileName = fileUrl.split('/').pop();
const timestamp = new Date().toISOString().replace(/[:.-]/g, '');
const newFileName = `${timestamp}_${originalFileName}`;
// 检查浏览器是否支持 showSaveFilePicker API
if (window.showSaveFilePicker) {
// 使用 showSaveFilePicker API 让用户选择保存路径
window.showSaveFilePicker({ suggestedName: newFileName }).then(handle => {
handle.createWritable().then(writer => {
writer.write(blob);
writer.close();
}).catch(error => {
console.error('创建文件写入器失败:', error);
this.$message.error('创建文件写入器失败，请联系管理员！');
});
}).catch(error => {
});
} else {
// 使用传统的 a 标签下载文件
const link = document.createElement('a');
link.href = URL.createObjectURL(blob);
link.download = newFileName;
link.click();
URL.revokeObjectURL(link.href);
}
}).catch(error => {
console.error('下载文件出错:', error);
this.$message.error('下载文件出现错误，请联系管理员！');
});
},
goHome() {
// 实现跳转首页逻辑
this.$router.push('/cus');
}
}
};
</script>
<style scoped>
/* 页面布局样式 */
.container {
padding: 20px;
}
.header {
display: flex;
justify-content: center;
align-items: center;
background-color: #333;
padding: 10px;
}
.header-menu {
width: 50px;
}
.el-menu {
display: flex;
justify-content: center;
align-items: center;
border-bottom: none; /* 去掉底部的横线 */
}
.header-span {
display: flex;
justify-content: center;
align-items: center;
width: 1800px;
font-size: 24px;
color: white;
}
.content {
background-color: #f5f5f5;
padding: 20px;
margin-top: 20px;
}
.payment {
text-align: center;
}
.payment p {
margin-bottom: 10px;
font-size: 16px;
}
.footer {
margin-top: 30px;
padding: 20px;
background-color: #fff;
text-align: center;
font-size: 14px;
}
.tip {
color: #333;
}
.warning {
color: red;
font-weight: bold;
}
.sl-from {
width: 100%;
display: flex;
flex-direction: column; /* 垂直排列 */
align-items: center; /* 水平居中对齐 */
margin-top: 30px;
}
.el-input {
width: 500px; /* 设置所有 el-input 的宽度 */
}
.el-form {
width: 100%;
display: flex;
flex-direction: column; /* 垂直排列 */
align-items: center; /* 水平居中对齐 */
}
.el-form-item {
width: 100%;
text-align: center; /* 文本居中对齐 */
}
.el-form-item__content {
display: flex;
justify-content: center; /* 水平居中对齐 */
}
.empty-message {
text-align: center;
margin-top: 20px;
color: #999;
font-size: 16px;
}
</style>

28
ruoyi-ui/src/views/system/userFront/payBefore.vue
View File

@ -1,14 +1,17 @@
<template>
<div class="app">
<!-- 顶部导航栏 -->
<el-header class="header">
<el-menu class="menu" mode="horizontal" background-color="#333" text-color="#fff" active-text-color="#ffd04b">
<el-menu-item>安装教程</el-menu-item>
<el-menu-item>开题报告</el-menu-item>
<el-menu-item>相关疑问</el-menu-item>
<el-menu-item>留言评价</el-menu-item>
<el-menu-item>我的订单</el-menu-item>
</el-menu>
<el-header class="navbar">
<div class="user-actions">
<el-menu mode="horizontal" background-color="#333" text-color="#fff" active-text-color="#ffd04b">
<el-menu-item>
<router-link to="/cus">首页</router-link>
</el-menu-item>
<el-menu-item>
<router-link to="/userOrder">订单查询</router-link>
</el-menu-item>
</el-menu>
</div>
</el-header>
<!-- 内容区域 -->
@ -103,7 +106,14 @@ export default {
background-color: #333;
padding: 10px;
}
.navbar {
background-color: #333;
color: #fff;
display: flex;
justify-content: flex-end;
align-items: center;
padding: 10px;
}
.logo {
height: 40px;
}

331
ruoyi-ui/src/views/system/userFront/precautions.vue Normal file
View File

@ -0,0 +1,331 @@
<template>
<div id="app">
<!-- 顶部导航栏 -->
<el-header class="navbar">
<div class="user-actions">
<el-menu mode="horizontal" background-color="#333" text-color="#fff" active-text-color="#ffd04b">
<el-menu-item>
<router-link to="/cus" style="display: block;">首页</router-link>
</el-menu-item>
<el-menu-item>
<router-link to="/userOrder" style="display: block;">订单查询</router-link>
</el-menu-item>
</el-menu>
</div>
</el-header>
<!-- note详情 -->
<el-main>
<div class="content">
<el-row>
<el-col :span="20">
<el-card class="details-card">
<h2>{{ note.name }}</h2>
<div class="box" v-html="note.design" @click="showImage($event)"></div>
<el-image-viewer
v-if="dialogVisible"
:on-close="closeImage"
:url-list="[url]"
/>
</el-card>
</el-col>
<el-col :span="4">
<el-card class="right-card">
<el-menu
:default-active="activeMenu"
class="el-menu-vertical-demo"
@select="handleMenuSelect"
:style="{ border: 'none' }"
>
<el-menu-item
v-for="(item, index) in noteList"
:key="item.id"
:index="String(item.id)"
class="menu-item-with-line"
>
{{ item.name }}
</el-menu-item>
</el-menu>
</el-card>
</el-col>
</el-row>
</div>
</el-main>
<!--页脚部分-->
<footer class="footer">
<div class="footer-content">
<p>© 2024 Company Name. All Rights Reserved.</p>
<p>联系我们: contact@example.com | 电话: 123-456-7890</p>
<nav>
<a href="/about">关于我们</a> |
<a href="/privacy">隐私政策</a> |
<a href="/terms">使用条款</a>
</nav>
</div>
</footer>
</div>
</template>
<script>
import {getNote, listNote} from "@/api/system/note";
import ElImageViewer from "element-ui/packages/image/src/image-viewer"
export default {
components: {
ElImageViewer
},
data() {
return {
// 总条数
total: 0,
// 商品表格数据
note: [],
// 查询参数
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
name: null,
design: null
},
// 注意事项表格数据
noteList: [],
// 当前选中的菜单项
activeMenu: '1',
url: '',
dialogVisible: false
};
},
mounted() {
this.getList();
this.getNoteMsg(1)
},
created() {
},
methods: {
/** 查询注意事项列表 */
getList() {
this.loading = true;
listNote(this.queryParams).then(response => {
this.noteList = response.rows;
this.total = response.total;
this.loading = false;
});
},
getNoteMsg(index) {
getNote(index).then(response => {
this.note = response.data;
})
},
// 处理菜单项点击事件
handleMenuSelect(index) {
this.activeMenu = index;
this.getNoteMsg(index);
},
//图片预览相关
showImage (e) {
if (e.target.tagName == 'IMG') {
console.log(e.target.src)
this.url = e.target.src
this.dialogVisible = true
}
},
closeImage () {
this.dialogVisible = false
this.url = ''
}
}
};
</script>
<style scoped lang="scss">
.container {
width: 60%; /* 调整宽度，留出两边空白 */
margin: 0 auto; /* 自动左右边距居中 */
}
/* 卡片的布局样式 */
.card-container {
display: flex; /* 使用 flex 布局来水平排列卡片 */
justify-content: space-around; /* 在卡片之间留出空隙 */
}
.el-card1 {
width: 800px; /* 卡片宽度调整 */
height: auto;
text-align: center;
padding: 10px; /* 给卡片增加一些内边距 */
background-color: #f4f4f4; /* 设置背景颜色 */
border-radius: 8px; /* 圆角样式 */
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); /* 添加阴影效果 */
}
.details-card {
margin-right: 35px;
}
.right-card {
margin-bottom: 20px;
width: 300px;
}
.card img {
width: 100%; /* 图片占满卡片宽度 */
border-radius: 8px; /* 图片圆角和卡片保持一致 */
}
/* 样式和之前相同 */
.navbar {
background-color: #333;
color: #fff;
display: flex;
justify-content: flex-end;
align-items: center;
padding: 10px;
}
.search-section {
text-align: center;
background-color: #333;
color: white;
padding: 50px 20px;
}
.search-box {
margin-top: 20px;
width: 400px;
}
.project-grid {
margin-top: 20px;
}
.image {
width: 100%;
height: 150px;
}
.price {
color: #ff9900;
font-weight: bold;
}
.bottom {
display: flex;
justify-content: space-between;
align-items: center;
}
.button {
color: #409EFF;
cursor: pointer;
}
.tags-container {
display: flex;
justify-content: center;
flex-wrap: wrap;
margin: 20px;
}
.tags-container span {
margin: 10px;
padding: 8px 15px;
border: 1px solid #ccc;
border-radius: 5px;
cursor: pointer;
background-color: #fff;
transition: background-color 0.3s;
}
.tags-container span:hover {
background-color: #eee;
}
/* 页脚样式 */
.footer {
background-color: #333;
color: white;
padding: 20px 0;
text-align: center;
margin-top: 20px;
}
.footer a {
color: #ddd;
margin: 0 10px;
text-decoration: none;
}
.footer a:hover {
color: white;
}
.footer-content p {
margin: 5px 0;
}
.el-menu {
border-bottom: none; /* 去掉底部的线条 */
}
.content {
margin: 0 auto;
display: flex;
justify-content: center;
align-items: center;
width: 1250px;
}
.pay-guide {
width: 260px;
height: 40px;
background-color: #4AB7BD;
display: flex;
justify-content: center;
align-items: center;
}
.but-pay {
font-size: 16px;
width: 200px;
height: 40px;
box-shadow: 0 0 5px 1px rgba(0, 123, 255, 0.8); /* 蓝色发光边框 */
border-radius: 6px; /* 可选：添加圆角 */
transition: box-shadow 0.3s ease; /* 平滑过渡效果 */
}
.pay-but {
display: flex;
justify-content: center;
align-items: center;
width: 270px;
height: 60px;
}
.but-pay:hover {
background-color: #007bff;
box-shadow: 0 0 6px 2px rgba(0, 123, 255, 1); /* 鼠标悬停时增强发光效果 */
}
.pay-but:hover .el-button {
color: #ffffff;
}
::v-deep img{
max-width:100%;
}
/* 自定义菜单项的样式，添加横线 */
.menu-item-with-line {
border-bottom: 1px solid #e0e0e0; /* 设置下边框的颜色和宽度 */
padding-bottom: 10px; /* 让菜单项有一些额外的下边距 */
}
/* 去掉最后一个菜单项的横线 */
.menu-item-with-line:last-child {
border-bottom: none;
}
</style>