add

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderBillSheetController.java

@@ -0,0 +1,114 @@
+package com.zhongzheng.controller.order;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.utils.SecurityUtils;
+import com.zhongzheng.modules.order.bo.OrderBillSheetAddBo;
+import com.zhongzheng.modules.order.bo.OrderBillSheetEditBo;
+import com.zhongzheng.modules.order.bo.OrderBillSheetQueryBo;
+import com.zhongzheng.modules.order.service.IOrderBillSheetService;
+import com.zhongzheng.modules.order.vo.OrderBillSheetVo;
+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.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 订单计费单Controller
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+@Api(value = "订单计费单控制器", tags = {"订单计费单管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/order/sheet")
+public class OrderBillSheetController extends BaseController {
+
+    private final IOrderBillSheetService iOrderBillSheetService;
+
+    /**
+     * 查询订单计费单列表
+     */
+    @ApiOperation("查询订单计费单列表")
+    @PreAuthorize("@ss.hasPermi('system:sheet:list')")
+    @GetMapping("/list")
+    public TableDataInfo<OrderBillSheetVo> list(OrderBillSheetQueryBo bo) {
+        startPage();
+        List<OrderBillSheetVo> list = iOrderBillSheetService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订单计费单列表
+     */
+    /*@ApiOperation("导出订单计费单列表")
+    @PreAuthorize("@ss.hasPermi('system:sheet:export')")
+    @Log(title = "订单计费单", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<OrderBillSheetVo> export(OrderBillSheetQueryBo bo) {
+        List<OrderBillSheetVo> list = iOrderBillSheetService.queryList(bo);
+        ExcelUtil<OrderBillSheetVo> util = new ExcelUtil<OrderBillSheetVo>(OrderBillSheetVo.class);
+        return util.exportExcel(list, "订单计费单");
+    }*/
+
+    /**
+     * 获取订单计费单详细信息
+     */
+    @ApiOperation("获取订单计费单详细信息")
+    @PreAuthorize("@ss.hasPermi('system:sheet:query')")
+    @GetMapping("/{sheetId}")
+    public AjaxResult<OrderBillSheetVo> getInfo(@PathVariable("sheetId" ) Long sheetId) {
+        return AjaxResult.success(iOrderBillSheetService.queryById(sheetId));
+    }
+
+    /**
+     * 新增订单计费单
+     */
+    @ApiOperation("新增订单计费单")
+    @PreAuthorize("@ss.hasPermi('system:sheet:add')")
+    @Log(title = "订单计费单", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult add(@RequestBody OrderBillSheetAddBo bo) {
+        bo.setCreateBy(SecurityUtils.getUsername());
+        return AjaxResult.success(iOrderBillSheetService.placeBillOrder(bo));
+    }
+
+    /**
+     * 修改订单计费单
+     */
+   /* @ApiOperation("修改订单计费单")
+    @PreAuthorize("@ss.hasPermi('system:sheet:edit')")
+    @Log(title = "订单计费单", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody OrderBillSheetEditBo bo) {
+        return toAjax(iOrderBillSheetService.updateByEditBo(bo) ? 1 : 0);
+    }*/
+
+    /**
+     * 删除订单计费单
+     */
+   /* @ApiOperation("删除订单计费单")
+    @PreAuthorize("@ss.hasPermi('system:sheet:remove')")
+    @Log(title = "订单计费单" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{sheetIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] sheetIds) {
+        return toAjax(iOrderBillSheetService.deleteWithValidByIds(Arrays.asList(sheetIds), true) ? 1 : 0);
+    }*/
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBillGoodsAddBo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+import java.math.BigDecimal;
+
+/**
+ * 订单计费单商品添加对象 order_bill_goods
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+@Data
+@ApiModel("订单计费单商品添加对象")
+public class OrderBillGoodsAddBo {
+
+    /** 计费单编号 */
+    @ApiModelProperty("计费单编号")
+    private String sheetSn;
+    /** 商品id */
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+    /** 收费性质 */
+    @ApiModelProperty("收费性质")
+    private String natureCharges;
+    /** 费用类型 */
+    @ApiModelProperty("费用类型")
+    private String costType;
+    /** 本次收费金额 */
+    @ApiModelProperty("本次收费金额")
+    private BigDecimal amount;
+    /** 收费说明 */
+    @ApiModelProperty("收费说明")
+    private String description;
+    /** 订单号 */
+    @ApiModelProperty("订单号")
+    private String orderSn;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBillGoodsEditBo.java

@@ -0,0 +1,62 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单计费单商品编辑对象 order_bill_goods
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+@Data
+@ApiModel("订单计费单商品编辑对象")
+public class OrderBillGoodsEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 计费单编号 */
+    @ApiModelProperty("计费单编号")
+    private String sheetSn;
+
+    /** 商品id */
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+
+    /** 收费性质 */
+    @ApiModelProperty("收费性质")
+    private String natureCharges;
+
+    /** 费用类型 */
+    @ApiModelProperty("费用类型")
+    private String costType;
+
+    /** 本次收费金额 */
+    @ApiModelProperty("本次收费金额")
+    private BigDecimal amount;
+
+    /** 收费说明 */
+    @ApiModelProperty("收费说明")
+    private String description;
+
+    /** 订单号 */
+    @ApiModelProperty("订单号")
+    private String orderSn;
+
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBillGoodsQueryBo.java

@@ -0,0 +1,64 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import java.math.BigDecimal;
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 订单计费单商品分页查询对象 order_bill_goods
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单计费单商品分页查询对象")
+public class OrderBillGoodsQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 计费单编号 */
+	@ApiModelProperty("计费单编号")
+	private String sheetSn;
+	/** 商品id */
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+	/** 收费性质 */
+	@ApiModelProperty("收费性质")
+	private String natureCharges;
+	/** 费用类型 */
+	@ApiModelProperty("费用类型")
+	private String costType;
+	/** 本次收费金额 */
+	@ApiModelProperty("本次收费金额")
+	private BigDecimal amount;
+	/** 收费说明 */
+	@ApiModelProperty("收费说明")
+	private String description;
+	/** 订单号 */
+	@ApiModelProperty("订单号")
+	private String orderSn;
+	/** 状态 1正常 0关闭 */
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBillSheetAddBo.java

@@ -0,0 +1,71 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 订单计费单添加对象 order_bill_sheet
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+@Data
+@ApiModel("订单计费单添加对象")
+public class OrderBillSheetAddBo {
+
+    /** 订单号 */
+    @ApiModelProperty("订单号")
+    private String orderSn;
+    /** 付款人 */
+    @ApiModelProperty("付款人")
+    private String payer;
+    /** 付款人手机号码 */
+    @ApiModelProperty("付款人手机号码")
+    private String payerTel;
+    /** 付款方式 */
+    @ApiModelProperty("付款方式")
+    private String payType;
+    /** 付款账号 */
+    @ApiModelProperty("付款账号")
+    private String payAccount;
+    /** 收款方 */
+    @ApiModelProperty("收款方")
+    private String payee;
+    /** 收款账号 */
+    @ApiModelProperty("收款账号")
+    private String collectionAccount;
+    /** 支付通道 */
+    @ApiModelProperty("支付通道")
+    private String payChannel;
+    /** POS机终端号 */
+    @ApiModelProperty("POS机终端号")
+    private String posNumber;
+    /** 凭证号 */
+    @ApiModelProperty("凭证号")
+    private String voucherNo;
+    /** 参考号 */
+    @ApiModelProperty("参考号")
+    private String refNo;
+    /** 计费单编号 */
+    @ApiModelProperty("计费单编号")
+    private String sheetSn;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+    @ApiModelProperty("商品列表")
+    private List<OrderBillGoodsAddBo> goodsList;
+    /** 系统订单操作人 */
+    @ApiModelProperty("系统订单操作人")
+    private String createBy;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBillSheetEditBo.java

@@ -0,0 +1,82 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 订单计费单编辑对象 order_bill_sheet
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+@Data
+@ApiModel("订单计费单编辑对象")
+public class OrderBillSheetEditBo {
+
+    /** 计算单id */
+    @ApiModelProperty("计算单id")
+    private Long sheetId;
+
+    /** 订单号 */
+    @ApiModelProperty("订单号")
+    private String orderSn;
+
+    /** 付款人 */
+    @ApiModelProperty("付款人")
+    private String payer;
+
+    /** 付款人手机号码 */
+    @ApiModelProperty("付款人手机号码")
+    private String payerTel;
+
+    /** 付款方式 */
+    @ApiModelProperty("付款方式")
+    private String payType;
+
+    /** 付款账号 */
+    @ApiModelProperty("付款账号")
+    private String payAccount;
+
+    /** 收款方 */
+    @ApiModelProperty("收款方")
+    private String payee;
+
+    /** 收款账号 */
+    @ApiModelProperty("收款账号")
+    private String collectionAccount;
+
+    /** 支付通道 */
+    @ApiModelProperty("支付通道")
+    private String payChannel;
+
+    /** POS机终端号 */
+    @ApiModelProperty("POS机终端号")
+    private String posNumber;
+
+    /** 凭证号 */
+    @ApiModelProperty("凭证号")
+    private String voucherNo;
+
+    /** 参考号 */
+    @ApiModelProperty("参考号")
+    private String refNo;
+
+    /** 计费单编号 */
+    @ApiModelProperty("计费单编号")
+    private String sheetSn;
+
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBillSheetQueryBo.java

@@ -0,0 +1,78 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 订单计费单分页查询对象 order_bill_sheet
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单计费单分页查询对象")
+public class OrderBillSheetQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 订单号 */
+	@ApiModelProperty("订单号")
+	private String orderSn;
+	/** 付款人 */
+	@ApiModelProperty("付款人")
+	private String payer;
+	/** 付款人手机号码 */
+	@ApiModelProperty("付款人手机号码")
+	private String payerTel;
+	/** 付款方式 */
+	@ApiModelProperty("付款方式")
+	private String payType;
+	/** 付款账号 */
+	@ApiModelProperty("付款账号")
+	private String payAccount;
+	/** 收款方 */
+	@ApiModelProperty("收款方")
+	private String payee;
+	/** 收款账号 */
+	@ApiModelProperty("收款账号")
+	private String collectionAccount;
+	/** 支付通道 */
+	@ApiModelProperty("支付通道")
+	private String payChannel;
+	/** POS机终端号 */
+	@ApiModelProperty("POS机终端号")
+	private String posNumber;
+	/** 凭证号 */
+	@ApiModelProperty("凭证号")
+	private String voucherNo;
+	/** 参考号 */
+	@ApiModelProperty("参考号")
+	private String refNo;
+	/** 计费单编号 */
+	@ApiModelProperty("计费单编号")
+	private String sheetSn;
+	/** 状态 1正常 0关闭 */
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderBillGoods.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.order.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 订单计费单商品对象 order_bill_goods
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("order_bill_goods")
+public class OrderBillGoods implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 计费单编号 */
+    private String sheetSn;
+    /** 商品id */
+    private Long goodsId;
+    /** 收费性质 */
+    private String natureCharges;
+    /** 费用类型 */
+    private String costType;
+    /** 本次收费金额 */
+    private BigDecimal amount;
+    /** 收费说明 */
+    private String description;
+    /** 订单号 */
+    private String orderSn;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderBillSheet.java

@@ -0,0 +1,64 @@
+package com.zhongzheng.modules.order.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 订单计费单对象 order_bill_sheet
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("order_bill_sheet")
+public class OrderBillSheet implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 计算单id */
+    @TableId(value = "sheet_id")
+    private Long sheetId;
+    /** 订单号 */
+    private String orderSn;
+    /** 付款人 */
+    private String payer;
+    /** 付款人手机号码 */
+    private String payerTel;
+    /** 付款方式 */
+    private String payType;
+    /** 付款账号 */
+    private String payAccount;
+    /** 收款方 */
+    private String payee;
+    /** 收款账号 */
+    private String collectionAccount;
+    /** 支付通道 */
+    private String payChannel;
+    /** POS机终端号 */
+    private String posNumber;
+    /** 凭证号 */
+    private String voucherNo;
+    /** 参考号 */
+    private String refNo;
+    /** 计费单编号 */
+    private String sheetSn;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    private Integer status;
+    /** 系统订单操作人 */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderBillGoodsMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.domain.OrderBillGoods;
+
+/**
+ * 订单计费单商品Mapper接口
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+public interface OrderBillGoodsMapper extends BaseMapper<OrderBillGoods> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderBillSheetMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.domain.OrderBillSheet;
+
+/**
+ * 订单计费单Mapper接口
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+public interface OrderBillSheetMapper extends BaseMapper<OrderBillSheet> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderBillGoodsService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.order.bo.OrderBillGoodsAddBo;
+import com.zhongzheng.modules.order.bo.OrderBillGoodsEditBo;
+import com.zhongzheng.modules.order.bo.OrderBillGoodsQueryBo;
+import com.zhongzheng.modules.order.domain.OrderBillGoods;
+import com.zhongzheng.modules.order.vo.OrderBillGoodsVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单计费单商品Service接口
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+public interface IOrderBillGoodsService extends IService<OrderBillGoods> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	OrderBillGoodsVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<OrderBillGoodsVo> queryList(OrderBillGoodsQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单计费单商品
+	 * @param bo 订单计费单商品新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(OrderBillGoodsAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单计费单商品
+	 * @param bo 订单计费单商品编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(OrderBillGoodsEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderBillSheetService.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.order.bo.OrderAddBo;
+import com.zhongzheng.modules.order.bo.OrderBillSheetAddBo;
+import com.zhongzheng.modules.order.bo.OrderBillSheetEditBo;
+import com.zhongzheng.modules.order.bo.OrderBillSheetQueryBo;
+import com.zhongzheng.modules.order.domain.OrderBillSheet;
+import com.zhongzheng.modules.order.vo.OrderBillSheetVo;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 订单计费单Service接口
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+public interface IOrderBillSheetService extends IService<OrderBillSheet> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	OrderBillSheetVo queryById(Long sheetId);
+
+	/**
+	 * 查询列表
+	 */
+	List<OrderBillSheetVo> queryList(OrderBillSheetQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单计费单
+	 * @param bo 订单计费单新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(OrderBillSheetAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单计费单
+	 * @param bo 订单计费单编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(OrderBillSheetEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	Map<String, Object> placeBillOrder(OrderBillSheetAddBo bo);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderBillGoodsServiceImpl.java

@@ -0,0 +1,106 @@
+package com.zhongzheng.modules.order.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.order.bo.OrderBillGoodsAddBo;
+import com.zhongzheng.modules.order.bo.OrderBillGoodsEditBo;
+import com.zhongzheng.modules.order.bo.OrderBillGoodsQueryBo;
+import com.zhongzheng.modules.order.domain.OrderBillGoods;
+import com.zhongzheng.modules.order.mapper.OrderBillGoodsMapper;
+import com.zhongzheng.modules.order.service.IOrderBillGoodsService;
+import com.zhongzheng.modules.order.vo.OrderBillGoodsVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 订单计费单商品Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+@Service
+public class OrderBillGoodsServiceImpl extends ServiceImpl<OrderBillGoodsMapper, OrderBillGoods> implements IOrderBillGoodsService {
+
+    @Override
+    public OrderBillGoodsVo queryById(Long id){
+        OrderBillGoods db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, OrderBillGoodsVo.class);
+    }
+
+    @Override
+    public List<OrderBillGoodsVo> queryList(OrderBillGoodsQueryBo bo) {
+        LambdaQueryWrapper<OrderBillGoods> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getSheetSn()), OrderBillGoods::getSheetSn, bo.getSheetSn());
+        lqw.eq(bo.getGoodsId() != null, OrderBillGoods::getGoodsId, bo.getGoodsId());
+        lqw.eq(StrUtil.isNotBlank(bo.getNatureCharges()), OrderBillGoods::getNatureCharges, bo.getNatureCharges());
+        lqw.eq(StrUtil.isNotBlank(bo.getCostType()), OrderBillGoods::getCostType, bo.getCostType());
+        lqw.eq(bo.getAmount() != null, OrderBillGoods::getAmount, bo.getAmount());
+        lqw.eq(StrUtil.isNotBlank(bo.getDescription()), OrderBillGoods::getDescription, bo.getDescription());
+        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), OrderBillGoods::getOrderSn, bo.getOrderSn());
+        lqw.eq(bo.getStatus() != null, OrderBillGoods::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<OrderBillGoodsVo> entity2Vo(Collection<OrderBillGoods> collection) {
+        List<OrderBillGoodsVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, OrderBillGoodsVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<OrderBillGoods> page = (Page<OrderBillGoods>)collection;
+            Page<OrderBillGoodsVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(OrderBillGoodsAddBo bo) {
+        OrderBillGoods add = BeanUtil.toBean(bo, OrderBillGoods.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(OrderBillGoodsEditBo bo) {
+        OrderBillGoods update = BeanUtil.toBean(bo, OrderBillGoods.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(OrderBillGoods entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderBillSheetServiceImpl.java

@@ -0,0 +1,148 @@
+package com.zhongzheng.modules.order.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.order.bo.*;
+import com.zhongzheng.modules.order.domain.OrderBillGoods;
+import com.zhongzheng.modules.order.domain.OrderBillSheet;
+import com.zhongzheng.modules.order.domain.OrderGoods;
+import com.zhongzheng.modules.order.mapper.OrderBillSheetMapper;
+import com.zhongzheng.modules.order.service.IOrderBillGoodsService;
+import com.zhongzheng.modules.order.service.IOrderBillSheetService;
+import com.zhongzheng.modules.order.service.IOrderGoodsService;
+import com.zhongzheng.modules.order.vo.OrderBillSheetVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 订单计费单Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+@Service
+public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper, OrderBillSheet> implements IOrderBillSheetService {
+
+    @Autowired
+    private IOrderBillGoodsService iOrderBillGoodsService;
+
+    @Override
+    public OrderBillSheetVo queryById(Long sheetId){
+        OrderBillSheet db = this.baseMapper.selectById(sheetId);
+        return BeanUtil.toBean(db, OrderBillSheetVo.class);
+    }
+
+    @Override
+    public List<OrderBillSheetVo> queryList(OrderBillSheetQueryBo bo) {
+        LambdaQueryWrapper<OrderBillSheet> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), OrderBillSheet::getOrderSn, bo.getOrderSn());
+        lqw.eq(StrUtil.isNotBlank(bo.getPayer()), OrderBillSheet::getPayer, bo.getPayer());
+        lqw.eq(StrUtil.isNotBlank(bo.getPayerTel()), OrderBillSheet::getPayerTel, bo.getPayerTel());
+        lqw.eq(StrUtil.isNotBlank(bo.getPayType()), OrderBillSheet::getPayType, bo.getPayType());
+        lqw.eq(StrUtil.isNotBlank(bo.getPayAccount()), OrderBillSheet::getPayAccount, bo.getPayAccount());
+        lqw.eq(StrUtil.isNotBlank(bo.getPayee()), OrderBillSheet::getPayee, bo.getPayee());
+        lqw.eq(StrUtil.isNotBlank(bo.getCollectionAccount()), OrderBillSheet::getCollectionAccount, bo.getCollectionAccount());
+        lqw.eq(StrUtil.isNotBlank(bo.getPayChannel()), OrderBillSheet::getPayChannel, bo.getPayChannel());
+        lqw.eq(StrUtil.isNotBlank(bo.getPosNumber()), OrderBillSheet::getPosNumber, bo.getPosNumber());
+        lqw.eq(StrUtil.isNotBlank(bo.getVoucherNo()), OrderBillSheet::getVoucherNo, bo.getVoucherNo());
+        lqw.eq(StrUtil.isNotBlank(bo.getRefNo()), OrderBillSheet::getRefNo, bo.getRefNo());
+        lqw.eq(StrUtil.isNotBlank(bo.getSheetSn()), OrderBillSheet::getSheetSn, bo.getSheetSn());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<OrderBillSheetVo> entity2Vo(Collection<OrderBillSheet> collection) {
+        List<OrderBillSheetVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, OrderBillSheetVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<OrderBillSheet> page = (Page<OrderBillSheet>)collection;
+            Page<OrderBillSheetVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(OrderBillSheetAddBo bo) {
+        OrderBillSheet add = BeanUtil.toBean(bo, OrderBillSheet.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(OrderBillSheetEditBo bo) {
+        OrderBillSheet update = BeanUtil.toBean(bo, OrderBillSheet.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(OrderBillSheet entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> placeBillOrder(OrderBillSheetAddBo bo) {
+        List<OrderBillGoodsAddBo> goodsList = bo.getGoodsList();
+        if(goodsList==null||goodsList.size()<1){
+            throw new CustomException("商品列表为空");
+        }
+        OrderBillSheet add = BeanUtil.toBean(bo, OrderBillSheet.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        //计费订单号
+        String sheet_no = DateUtils.getDateOrderSn();
+        add.setSheetSn(sheet_no);
+        //生成订单
+        Collection<OrderBillGoods> coll = new HashSet<>();
+        for (OrderBillGoodsAddBo g : goodsList) {
+            OrderBillGoods orderGoods = BeanUtil.toBean(g, OrderBillGoods.class);
+            orderGoods.setOrderSn(bo.getOrderSn());
+            orderGoods.setSheetSn(bo.getSheetSn());
+            orderGoods.setCreateTime(DateUtils.getNowTime());
+            orderGoods.setUpdateTime(DateUtils.getNowTime());
+            coll.add(orderGoods);
+        }
+        iOrderBillGoodsService.saveBatch(coll);
+        this.save(add);
+        Map<String, Object> result = new HashMap<>();
+        result.put("sheetId",add.getSheetId());
+        result.put("sheetSn",sheet_no);
+        return result;
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -169,6 +169,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         this.save(add);
         Map<String, Object> result = new HashMap<>();
         result.put("oderId",add.getOrderId());
+        result.put("orderSn",out_trade_no);
         return result;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderBillGoodsVo.java

@@ -0,0 +1,60 @@
+package com.zhongzheng.modules.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 订单计费单商品视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+@Data
+@ApiModel("订单计费单商品视图对象")
+public class OrderBillGoodsVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 计费单编号 */
+	@Excel(name = "计费单编号")
+	@ApiModelProperty("计费单编号")
+	private String sheetSn;
+	/** 商品id */
+	@Excel(name = "商品id")
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+	/** 收费性质 */
+	@Excel(name = "收费性质")
+	@ApiModelProperty("收费性质")
+	private String natureCharges;
+	/** 费用类型 */
+	@Excel(name = "费用类型")
+	@ApiModelProperty("费用类型")
+	private String costType;
+	/** 本次收费金额 */
+	@Excel(name = "本次收费金额")
+	@ApiModelProperty("本次收费金额")
+	private BigDecimal amount;
+	/** 收费说明 */
+	@Excel(name = "收费说明")
+	@ApiModelProperty("收费说明")
+	private String description;
+	/** 订单号 */
+	@Excel(name = "订单号")
+	@ApiModelProperty("订单号")
+	private String orderSn;
+	/** 状态 1正常 0关闭 */
+	@Excel(name = "状态 1正常 0关闭")
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderBillSheetVo.java

@@ -0,0 +1,79 @@
+package com.zhongzheng.modules.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 订单计费单视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-11-09
+ */
+@Data
+@ApiModel("订单计费单视图对象")
+public class OrderBillSheetVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 计算单id */
+	@ApiModelProperty("计算单id")
+	private Long sheetId;
+
+	/** 订单号 */
+	@Excel(name = "订单号")
+	@ApiModelProperty("订单号")
+	private String orderSn;
+	/** 付款人 */
+	@Excel(name = "付款人")
+	@ApiModelProperty("付款人")
+	private String payer;
+	/** 付款人手机号码 */
+	@Excel(name = "付款人手机号码")
+	@ApiModelProperty("付款人手机号码")
+	private String payerTel;
+	/** 付款方式 */
+	@Excel(name = "付款方式")
+	@ApiModelProperty("付款方式")
+	private String payType;
+	/** 付款账号 */
+	@Excel(name = "付款账号")
+	@ApiModelProperty("付款账号")
+	private String payAccount;
+	/** 收款方 */
+	@Excel(name = "收款方")
+	@ApiModelProperty("收款方")
+	private String payee;
+	/** 收款账号 */
+	@Excel(name = "收款账号")
+	@ApiModelProperty("收款账号")
+	private String collectionAccount;
+	/** 支付通道 */
+	@Excel(name = "支付通道")
+	@ApiModelProperty("支付通道")
+	private String payChannel;
+	/** POS机终端号 */
+	@Excel(name = "POS机终端号")
+	@ApiModelProperty("POS机终端号")
+	private String posNumber;
+	/** 凭证号 */
+	@Excel(name = "凭证号")
+	@ApiModelProperty("凭证号")
+	private String voucherNo;
+	/** 参考号 */
+	@Excel(name = "参考号")
+	@ApiModelProperty("参考号")
+	private String refNo;
+	/** 计费单编号 */
+	@Excel(name = "计费单编号")
+	@ApiModelProperty("计费单编号")
+	private String sheetSn;
+	/** 状态 1正常 0关闭 */
+	@Excel(name = "状态 1正常 0关闭")
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+}

zhongzheng-system/src/main/resources/mapper/modules/order/OrderBillGoodsMapper.xml

@@ -0,0 +1,22 @@
+<?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.zhongzheng.modules.order.mapper.OrderBillGoodsMapper">
+
+    <resultMap type="com.zhongzheng.modules.order.domain.OrderBillGoods" id="OrderBillGoodsResult">
+        <result property="id" column="id"/>
+        <result property="sheetSn" column="sheet_sn"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="natureCharges" column="nature_charges"/>
+        <result property="costType" column="cost_type"/>
+        <result property="amount" column="amount"/>
+        <result property="description" column="description"/>
+        <result property="orderSn" column="order_sn"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/order/OrderBillSheetMapper.xml

@@ -0,0 +1,28 @@
+<?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.zhongzheng.modules.order.mapper.OrderBillSheetMapper">
+
+    <resultMap type="com.zhongzheng.modules.order.domain.OrderBillSheet" id="OrderBillSheetResult">
+        <result property="sheetId" column="sheet_id"/>
+        <result property="orderSn" column="order_sn"/>
+        <result property="payer" column="payer"/>
+        <result property="payerTel" column="payer_tel"/>
+        <result property="payType" column="pay_type"/>
+        <result property="payAccount" column="pay_account"/>
+        <result property="payee" column="payee"/>
+        <result property="collectionAccount" column="collection_account"/>
+        <result property="payChannel" column="pay_channel"/>
+        <result property="posNumber" column="pos_number"/>
+        <result property="voucherNo" column="voucher_no"/>
+        <result property="refNo" column="ref_no"/>
+        <result property="sheetSn" column="sheet_sn"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+    </resultMap>
+
+
+</mapper>