From e518cacad3824660afcb65c53197c787aaa1d461 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 10 Apr 2023 16:56:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=BC=80=E7=A5=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/OrderInvoiceRecordController.java | 98 ++++++ .../pile/domain/OrderInvoiceRecord.java | 146 ++++++++ .../pile/mapper/OrderInvoiceRecordMapper.java | 61 ++++ .../service/IOrderInvoiceRecordService.java | 61 ++++ .../impl/OrderInvoiceRecordServiceImpl.java | 90 +++++ .../pile/MemberTransactionRecordMapper.xml | 0 .../mapper/pile/OrderInvoiceRecordMapper.xml | 101 ++++++ jsowell-ui/src/api/order/invoice.js | 44 +++ jsowell-ui/src/views/order/invoice/index.vue | 312 ++++++++++++++++++ 9 files changed, 913 insertions(+) create mode 100644 jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderInvoiceRecord.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java rename jsowell-pile/src/main/resources/mapper/{mapper => }/pile/MemberTransactionRecordMapper.xml (100%) create mode 100644 jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml create mode 100644 jsowell-ui/src/api/order/invoice.js create mode 100644 jsowell-ui/src/views/order/invoice/index.vue diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java new file mode 100644 index 000000000..072b551e1 --- /dev/null +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java @@ -0,0 +1,98 @@ +package com.jsowell.web.controller.pile; + +import com.jsowell.common.annotation.Log; +import com.jsowell.common.core.controller.BaseController; +import com.jsowell.common.core.domain.AjaxResult; +import com.jsowell.common.core.page.TableDataInfo; +import com.jsowell.common.enums.BusinessType; +import com.jsowell.common.util.poi.ExcelUtil; +import com.jsowell.pile.domain.OrderInvoiceRecord; +import com.jsowell.pile.service.IOrderInvoiceRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 申请开票Controller + * + * @author jsowell + * @date 2023-04-10 + */ +@RestController +@RequestMapping("/order/invoice") +public class OrderInvoiceRecordController extends BaseController { + @Autowired + private IOrderInvoiceRecordService orderInvoiceRecordService; + + /** + * 查询申请开票列表 + */ + @PreAuthorize("@ss.hasPermi('order:invoice:list')") + @GetMapping("/list") + public TableDataInfo list(OrderInvoiceRecord orderInvoiceRecord) { + startPage(); + List list = orderInvoiceRecordService.selectOrderInvoiceRecordList(orderInvoiceRecord); + return getDataTable(list); + } + + /** + * 导出申请开票列表 + */ + @PreAuthorize("@ss.hasPermi('order:invoice:export')") + @Log(title = "申请开票", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, OrderInvoiceRecord orderInvoiceRecord) { + List list = orderInvoiceRecordService.selectOrderInvoiceRecordList(orderInvoiceRecord); + ExcelUtil util = new ExcelUtil(OrderInvoiceRecord.class); + util.exportExcel(response, list, "申请开票数据"); + } + + /** + * 获取申请开票详细信息 + */ + @PreAuthorize("@ss.hasPermi('order:invoice:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Integer id) { + return AjaxResult.success(orderInvoiceRecordService.selectOrderInvoiceRecordById(id)); + } + + /** + * 新增申请开票 + */ + @PreAuthorize("@ss.hasPermi('order:invoice:add')") + @Log(title = "申请开票", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody OrderInvoiceRecord orderInvoiceRecord) { + return toAjax(orderInvoiceRecordService.insertOrderInvoiceRecord(orderInvoiceRecord)); + } + + /** + * 修改申请开票 + */ + @PreAuthorize("@ss.hasPermi('order:invoice:edit')") + @Log(title = "申请开票", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody OrderInvoiceRecord orderInvoiceRecord) { + return toAjax(orderInvoiceRecordService.updateOrderInvoiceRecord(orderInvoiceRecord)); + } + + /** + * 删除申请开票 + */ + @PreAuthorize("@ss.hasPermi('order:invoice:remove')") + @Log(title = "申请开票", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Integer[] ids) { + return toAjax(orderInvoiceRecordService.deleteOrderInvoiceRecordByIds(ids)); + } +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderInvoiceRecord.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderInvoiceRecord.java new file mode 100644 index 000000000..60428740a --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderInvoiceRecord.java @@ -0,0 +1,146 @@ +package com.jsowell.pile.domain; + +import com.jsowell.common.annotation.Excel; +import com.jsowell.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; + +/** + * 申请开票对象 order_invoice_record + * + * @author jsowell + * @date 2023-04-10 + */ +public class OrderInvoiceRecord extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer id; + + /** + * 会员id + */ + @Excel(name = "会员id") + private String memberId; + + /** + * 申请订单编号(逗号分割) + */ + @Excel(name = "申请订单编号", readConverterExp = "逗=号分割") + private String orderCodes; + + /** + * 状态(0-未开发票;1-已开发票) + */ + @Excel(name = "状态", readConverterExp = "0=-未开发票;1-已开发票") + private String status; + + /** + * 开票总金额 + */ + @Excel(name = "开票总金额") + private BigDecimal totalAmount; + + /** + * 总服务费金额 + */ + @Excel(name = "总服务费金额") + private BigDecimal totalServiceAmount; + + /** + * 总电费金额 + */ + @Excel(name = "总电费金额") + private BigDecimal totalElecAmount; + + /** + * 删除标识(0-正常;1-删除) + */ + private String delFlag; + + public void setId(Integer id) { + this.id = id; + } + + public Integer getId() { + return id; + } + + public void setMemberId(String memberId) { + this.memberId = memberId; + } + + public String getMemberId() { + return memberId; + } + + public void setOrderCodes(String orderCodes) { + this.orderCodes = orderCodes; + } + + public String getOrderCodes() { + return orderCodes; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getStatus() { + return status; + } + + public void setTotalAmount(BigDecimal totalAmount) { + this.totalAmount = totalAmount; + } + + public BigDecimal getTotalAmount() { + return totalAmount; + } + + public void setTotalServiceAmount(BigDecimal totalServiceAmount) { + this.totalServiceAmount = totalServiceAmount; + } + + public BigDecimal getTotalServiceAmount() { + return totalServiceAmount; + } + + public void setTotalElecAmount(BigDecimal totalElecAmount) { + this.totalElecAmount = totalElecAmount; + } + + public BigDecimal getTotalElecAmount() { + return totalElecAmount; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) + .append("id", getId()) + .append("memberId", getMemberId()) + .append("orderCodes", getOrderCodes()) + .append("status", getStatus()) + .append("totalAmount", getTotalAmount()) + .append("totalServiceAmount", getTotalServiceAmount()) + .append("totalElecAmount", getTotalElecAmount()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java new file mode 100644 index 000000000..dcb9310d2 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java @@ -0,0 +1,61 @@ +package com.jsowell.pile.mapper; + +import com.jsowell.pile.domain.OrderInvoiceRecord; + +import java.util.List; + +/** + * 申请开票Mapper接口 + * + * @author jsowell + * @date 2023-04-10 + */ +public interface OrderInvoiceRecordMapper { + /** + * 查询申请开票 + * + * @param id 申请开票主键 + * @return 申请开票 + */ + public OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id); + + /** + * 查询申请开票列表 + * + * @param orderInvoiceRecord 申请开票 + * @return 申请开票集合 + */ + public List selectOrderInvoiceRecordList(OrderInvoiceRecord orderInvoiceRecord); + + /** + * 新增申请开票 + * + * @param orderInvoiceRecord 申请开票 + * @return 结果 + */ + public int insertOrderInvoiceRecord(OrderInvoiceRecord orderInvoiceRecord); + + /** + * 修改申请开票 + * + * @param orderInvoiceRecord 申请开票 + * @return 结果 + */ + public int updateOrderInvoiceRecord(OrderInvoiceRecord orderInvoiceRecord); + + /** + * 删除申请开票 + * + * @param id 申请开票主键 + * @return 结果 + */ + public int deleteOrderInvoiceRecordById(Integer id); + + /** + * 批量删除申请开票 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteOrderInvoiceRecordByIds(Integer[] ids); +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java new file mode 100644 index 000000000..e69fcb83b --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java @@ -0,0 +1,61 @@ +package com.jsowell.pile.service; + +import com.jsowell.pile.domain.OrderInvoiceRecord; + +import java.util.List; + +/** + * 申请开票Service接口 + * + * @author jsowell + * @date 2023-04-10 + */ +public interface IOrderInvoiceRecordService { + /** + * 查询申请开票 + * + * @param id 申请开票主键 + * @return 申请开票 + */ + public OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id); + + /** + * 查询申请开票列表 + * + * @param orderInvoiceRecord 申请开票 + * @return 申请开票集合 + */ + public List selectOrderInvoiceRecordList(OrderInvoiceRecord orderInvoiceRecord); + + /** + * 新增申请开票 + * + * @param orderInvoiceRecord 申请开票 + * @return 结果 + */ + public int insertOrderInvoiceRecord(OrderInvoiceRecord orderInvoiceRecord); + + /** + * 修改申请开票 + * + * @param orderInvoiceRecord 申请开票 + * @return 结果 + */ + public int updateOrderInvoiceRecord(OrderInvoiceRecord orderInvoiceRecord); + + /** + * 批量删除申请开票 + * + * @param ids 需要删除的申请开票主键集合 + * @return 结果 + */ + public int deleteOrderInvoiceRecordByIds(Integer[] ids); + + /** + * 删除申请开票信息 + * + * @param id 申请开票主键 + * @return 结果 + */ + public int deleteOrderInvoiceRecordById(Integer id); +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java new file mode 100644 index 000000000..2c4da1d2f --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java @@ -0,0 +1,90 @@ +package com.jsowell.pile.service.impl; + +import com.jsowell.common.util.DateUtils; +import com.jsowell.pile.domain.OrderInvoiceRecord; +import com.jsowell.pile.mapper.OrderInvoiceRecordMapper; +import com.jsowell.pile.service.IOrderInvoiceRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 申请开票Service业务层处理 + * + * @author jsowell + * @date 2023-04-10 + */ +@Service +public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService { + @Autowired + private OrderInvoiceRecordMapper orderInvoiceRecordMapper; + + /** + * 查询申请开票 + * + * @param id 申请开票主键 + * @return 申请开票 + */ + @Override + public OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id) { + return orderInvoiceRecordMapper.selectOrderInvoiceRecordById(id); + } + + /** + * 查询申请开票列表 + * + * @param orderInvoiceRecord 申请开票 + * @return 申请开票 + */ + @Override + public List selectOrderInvoiceRecordList(OrderInvoiceRecord orderInvoiceRecord) { + return orderInvoiceRecordMapper.selectOrderInvoiceRecordList(orderInvoiceRecord); + } + + /** + * 新增申请开票 + * + * @param orderInvoiceRecord 申请开票 + * @return 结果 + */ + @Override + public int insertOrderInvoiceRecord(OrderInvoiceRecord orderInvoiceRecord) { + orderInvoiceRecord.setCreateTime(DateUtils.getNowDate()); + return orderInvoiceRecordMapper.insertOrderInvoiceRecord(orderInvoiceRecord); + } + + /** + * 修改申请开票 + * + * @param orderInvoiceRecord 申请开票 + * @return 结果 + */ + @Override + public int updateOrderInvoiceRecord(OrderInvoiceRecord orderInvoiceRecord) { + orderInvoiceRecord.setUpdateTime(DateUtils.getNowDate()); + return orderInvoiceRecordMapper.updateOrderInvoiceRecord(orderInvoiceRecord); + } + + /** + * 批量删除申请开票 + * + * @param ids 需要删除的申请开票主键 + * @return 结果 + */ + @Override + public int deleteOrderInvoiceRecordByIds(Integer[] ids) { + return orderInvoiceRecordMapper.deleteOrderInvoiceRecordByIds(ids); + } + + /** + * 删除申请开票信息 + * + * @param id 申请开票主键 + * @return 结果 + */ + @Override + public int deleteOrderInvoiceRecordById(Integer id) { + return orderInvoiceRecordMapper.deleteOrderInvoiceRecordById(id); + } +} diff --git a/jsowell-pile/src/main/resources/mapper/mapper/pile/MemberTransactionRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberTransactionRecordMapper.xml similarity index 100% rename from jsowell-pile/src/main/resources/mapper/mapper/pile/MemberTransactionRecordMapper.xml rename to jsowell-pile/src/main/resources/mapper/pile/MemberTransactionRecordMapper.xml diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml new file mode 100644 index 000000000..0fa5c4ba8 --- /dev/null +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + select id, member_id, order_codes, status, total_amount, total_service_amount, total_elec_amount, create_by, create_time, update_by, update_time, del_flag from order_invoice_record + + + + + + + + insert into order_invoice_record + + member_id, + order_codes, + status, + total_amount, + total_service_amount, + total_elec_amount, + create_by, + create_time, + update_by, + update_time, + del_flag, + + + #{memberId}, + #{orderCodes}, + #{status}, + #{totalAmount}, + #{totalServiceAmount}, + #{totalElecAmount}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{delFlag}, + + + + + update order_invoice_record + + member_id = #{memberId}, + order_codes = #{orderCodes}, + status = #{status}, + total_amount = #{totalAmount}, + total_service_amount = #{totalServiceAmount}, + total_elec_amount = #{totalElecAmount}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + del_flag = #{delFlag}, + + where id = #{id} + + + + delete from order_invoice_record where id = #{id} + + + + delete from order_invoice_record where id in + + #{id} + + + \ No newline at end of file diff --git a/jsowell-ui/src/api/order/invoice.js b/jsowell-ui/src/api/order/invoice.js new file mode 100644 index 000000000..b5cb7c38d --- /dev/null +++ b/jsowell-ui/src/api/order/invoice.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询申请开票列表 +export function listInvoice(query) { + return request({ + url: '/order/invoice/list', + method: 'get', + params: query + }) +} + +// 查询申请开票详细 +export function getInvoice(id) { + return request({ + url: '/order/invoice/' + id, + method: 'get' + }) +} + +// 新增申请开票 +export function addInvoice(data) { + return request({ + url: '/order/invoice', + method: 'post', + data: data + }) +} + +// 修改申请开票 +export function updateInvoice(data) { + return request({ + url: '/order/invoice', + method: 'put', + data: data + }) +} + +// 删除申请开票 +export function delInvoice(id) { + return request({ + url: '/order/invoice/' + id, + method: 'delete' + }) +} diff --git a/jsowell-ui/src/views/order/invoice/index.vue b/jsowell-ui/src/views/order/invoice/index.vue new file mode 100644 index 000000000..368336348 --- /dev/null +++ b/jsowell-ui/src/views/order/invoice/index.vue @@ -0,0 +1,312 @@ + + +