add 订单录入

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderController.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.OrderAddBo;
+import com.zhongzheng.modules.order.bo.OrderEditBo;
+import com.zhongzheng.modules.order.bo.OrderQueryBo;
+import com.zhongzheng.modules.order.service.IOrderService;
+import com.zhongzheng.modules.order.vo.OrderVo;
+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 ruoyi
+ * @date 2021-11-08
+ */
+@Api(value = "订单控制器", tags = {"订单管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/order")
+public class OrderController extends BaseController {
+
+    private final IOrderService iOrderService;
+
+    /**
+     * 查询订单列表
+     */
+    @ApiOperation("查询订单列表")
+    @PreAuthorize("@ss.hasPermi('system:order:list')")
+    @GetMapping("/list")
+    public TableDataInfo<OrderVo> list(OrderQueryBo bo) {
+        startPage();
+        List<OrderVo> list = iOrderService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订单列表
+     */
+    /*@ApiOperation("导出订单列表")
+    @PreAuthorize("@ss.hasPermi('system:order:export')")
+    @Log(title = "订单", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<OrderVo> export(OrderQueryBo bo) {
+        List<OrderVo> list = iOrderService.queryList(bo);
+        ExcelUtil<OrderVo> util = new ExcelUtil<OrderVo>(OrderVo.class);
+        return util.exportExcel(list, "订单");
+    }*/
+
+    /**
+     * 获取订单详细信息
+     */
+    @ApiOperation("获取订单详细信息")
+    @PreAuthorize("@ss.hasPermi('system:order:query')")
+    @GetMapping("/{orderId}")
+    public AjaxResult<OrderVo> getInfo(@PathVariable("orderId" ) Long orderId) {
+        return AjaxResult.success(iOrderService.queryById(orderId));
+    }
+
+    /**
+     * 新增订单
+     */
+    @ApiOperation("新增业务员订单")
+    @PreAuthorize("@ss.hasPermi('system:order:add')")
+    @Log(title = "订单", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult add(@RequestBody OrderAddBo bo) {
+        bo.setCreateBy(SecurityUtils.getUsername());
+        return AjaxResult.success(iOrderService.placePlatOrder(bo));
+    }
+
+    /**
+     * 修改订单
+     */
+    @ApiOperation("修改订单")
+    @PreAuthorize("@ss.hasPermi('system:order:edit')")
+    @Log(title = "订单", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody OrderEditBo bo) {
+        return toAjax(iOrderService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除订单
+     */
+   /* @ApiOperation("删除订单")
+    @PreAuthorize("@ss.hasPermi('system:order:remove')")
+    @Log(title = "订单" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{orderIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] orderIds) {
+        return toAjax(iOrderService.deleteWithValidByIds(Arrays.asList(orderIds), true) ? 1 : 0);
+    }*/
+}

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

@@ -0,0 +1,80 @@
+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;
+import java.util.List;
+
+/**
+ * 订单添加对象 order
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单添加对象")
+public class OrderAddBo {
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String oderSn;
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+    /** 订单价格 */
+    @ApiModelProperty("订单价格")
+    private BigDecimal orderPrice;
+    /** 支付订单号 */
+    @ApiModelProperty("支付订单号")
+    private String orderGeneral;
+    /** 订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功 */
+    @ApiModelProperty("订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功")
+    private Integer orderStatus;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 支付时间 */
+    @ApiModelProperty("支付时间")
+    private Long payTime;
+    /** 支付平台 1微信 2支付宝 */
+    @ApiModelProperty("支付平台 1微信 2支付宝")
+    private Integer payType;
+    /** 微信流水号 */
+    @ApiModelProperty("微信流水号")
+    private String transid;
+    /** 关闭时间 */
+    @ApiModelProperty("关闭时间")
+    private Long cancelTime;
+    /** 订单完成时间 */
+    @ApiModelProperty("订单完成时间")
+    private Long finishTime;
+    /** 订单类型 1充值订单 2金币消费订单 */
+    @ApiModelProperty("订单类型 1充值订单 2金币消费订单")
+    private Integer orderType;
+    /** 支付价格 */
+    @ApiModelProperty("支付价格")
+    private BigDecimal payPrice;
+    /** 收费方式 1即刻收费 2稍后收费 */
+    @ApiModelProperty("收费方式 1即刻收费 2稍后收费")
+    private Integer chargingType;
+    /** 订单来源 1业务员录单 */
+    @ApiModelProperty("订单来源 1业务员录单")
+    private Integer orderFrom;
+    @ApiModelProperty("商品列表")
+    private List<OrderGoodsAddBo> goodsList;
+    @ApiModelProperty("业务信息")
+    private OrderBusinessAddBo orderBusiness;
+    @ApiModelProperty("学员信息")
+    private OrderStudentInfoAddBo OrderStudent;
+    /** 系统订单操作人 */
+    @ApiModelProperty("系统订单操作人")
+    private String createBy;
+}

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

@@ -0,0 +1,40 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 订单采集信息数据添加对象 order_input_template
+ *
+ * @author hjl
+ * @date 2021-11-05
+ */
+@Data
+@ApiModel("订单采集信息数据添加对象")
+public class OrderBusinessAddBo {
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+    /** 业务归属人 */
+    @ApiModelProperty("业务归属人")
+    private String businessOwner;
+    /** 归属部门 */
+    @ApiModelProperty("归属部门")
+    private String dept;
+    /** 渠道来源 */
+    @ApiModelProperty("渠道来源")
+    private String source;
+    /** 到访校区 */
+    @ApiModelProperty("到访校区")
+    private String school;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+}

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

@@ -0,0 +1,48 @@
+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;
+
+
+/**
+ * 订单业务信息编辑对象 order_business
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单业务信息编辑对象")
+public class OrderBusinessEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long orderBusinessId;
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+    /** 业务归属人 */
+    @ApiModelProperty("业务归属人")
+    private String businessOwner;
+
+    /** 归属部门 */
+    @ApiModelProperty("归属部门")
+    private String dept;
+
+    /** 渠道来源 */
+    @ApiModelProperty("渠道来源")
+    private String source;
+
+    /** 到访校区 */
+    @ApiModelProperty("到访校区")
+    private String school;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+}

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

@@ -0,0 +1,51 @@
+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_business
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单业务信息分页查询对象")
+public class OrderBusinessQueryBo 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 businessOwner;
+	/** 归属部门 */
+	@ApiModelProperty("归属部门")
+	private String dept;
+	/** 渠道来源 */
+	@ApiModelProperty("渠道来源")
+	private String source;
+	/** 到访校区 */
+	@ApiModelProperty("到访校区")
+	private String school;
+}

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

@@ -0,0 +1,96 @@
+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;
+import java.util.List;
+
+/**
+ * 订单编辑对象 order
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单编辑对象")
+public class OrderEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long orderId;
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String oderSn;
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+    /** 订单价格 */
+    @ApiModelProperty("订单价格")
+    private BigDecimal orderPrice;
+
+    /** 支付订单号 */
+    @ApiModelProperty("支付订单号")
+    private String orderGeneral;
+
+    /** 订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功 */
+    @ApiModelProperty("订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功")
+    private Integer orderStatus;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 支付时间 */
+    @ApiModelProperty("支付时间")
+    private Long payTime;
+
+    /** 支付平台 1微信 2支付宝 */
+    @ApiModelProperty("支付平台 1微信 2支付宝")
+    private Integer payType;
+
+    /** 微信流水号 */
+    @ApiModelProperty("微信流水号")
+    private String transid;
+
+    /** 关闭时间 */
+    @ApiModelProperty("关闭时间")
+    private Long cancelTime;
+
+    /** 订单完成时间 */
+    @ApiModelProperty("订单完成时间")
+    private Long finishTime;
+
+    /** 订单类型 1充值订单 2金币消费订单 */
+    @ApiModelProperty("订单类型 1充值订单 2金币消费订单")
+    private Integer orderType;
+
+    /** 支付价格 */
+    @ApiModelProperty("支付价格")
+    private BigDecimal payPrice;
+
+
+    /** 收费方式 1即刻收费 2稍后收费 */
+    @ApiModelProperty("收费方式 1即刻收费 2稍后收费")
+    private Integer chargingType;
+
+
+    /** 订单来源 1业务员录单 */
+    @ApiModelProperty("订单来源 1业务员录单")
+    private Integer orderFrom;
+
+    @ApiModelProperty("商品列表")
+    private List<OrderGoodsEditBo> goodsList;
+
+    @ApiModelProperty("业务信息")
+    private OrderBusinessEditBo orderBusiness;
+    @ApiModelProperty("学员信息")
+    private OrderStudentInfoEditBo OrderStudent;
+
+}

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

@@ -0,0 +1,40 @@
+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_goods
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单商品添加对象")
+public class OrderGoodsAddBo {
+
+    /** 商品id */
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+    /** 商品采集数据 */
+    @ApiModelProperty("商品采集数据")
+    private OrderInputDataAddBo goodsInputData;
+    /** 商品标准价格 */
+    @ApiModelProperty("商品标准价格")
+    private BigDecimal goodsPrice;
+    /** 商品成交价格 */
+    @ApiModelProperty("商品成交价格")
+    private BigDecimal goodsRealPrice;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

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

@@ -0,0 +1,53 @@
+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_goods
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单商品编辑对象")
+public class OrderGoodsEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long orderGoodsId;
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+    /** 商品id */
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+
+    /** 商品采集数据 */
+    @ApiModelProperty("商品采集数据")
+    private OrderInputDataAddBo goodsInputData;
+
+    /** 商品标准价格 */
+    @ApiModelProperty("商品标准价格")
+    private BigDecimal goodsPrice;
+
+    /** 商品成交价格 */
+    @ApiModelProperty("商品成交价格")
+    private BigDecimal goodsRealPrice;
+
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+}

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

@@ -0,0 +1,52 @@
+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_goods
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单商品分页查询对象")
+public class OrderGoodsQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 商品id */
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+	/** 商品采集数据 */
+	@ApiModelProperty("商品采集数据")
+	private String goodsInputData;
+	/** 商品标准价格 */
+	@ApiModelProperty("商品标准价格")
+	private BigDecimal goodsPrice;
+	/** 商品成交价格 */
+	@ApiModelProperty("商品成交价格")
+	private BigDecimal goodsRealPrice;
+}

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

@@ -0,0 +1,31 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 订单采集信息数据添加对象 order_input_template
+ *
+ * @author hjl
+ * @date 2021-11-05
+ */
+@Data
+@ApiModel("订单采集信息数据添加对象")
+public class OrderInputDataAddBo {
+
+    /** 对应模板类型 */
+    @ApiModelProperty("对应模板类型")
+    private String type;
+    /** $column.columnComment */
+    @ApiModelProperty("班级")
+    private String gradeJson;
+    /** 备注 */
+    @ApiModelProperty("报考地区")
+    private String applyAreasJson;
+    /** 0 禁用 1启用 */
+    @ApiModelProperty("考期")
+    private String examDateJson;
+
+}

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

@@ -0,0 +1,85 @@
+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
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单分页查询对象")
+public class OrderQueryBo 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 oderSn;
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 订单价格 */
+	@ApiModelProperty("订单价格")
+	private BigDecimal orderPrice;
+	/** 支付订单号 */
+	@ApiModelProperty("支付订单号")
+	private String orderGeneral;
+	/** 订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功 */
+	@ApiModelProperty("订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功")
+	private Integer orderStatus;
+	/** 支付时间 */
+	@ApiModelProperty("支付时间")
+	private Long payTime;
+	/** 支付平台 1微信 2支付宝 */
+	@ApiModelProperty("支付平台 1微信 2支付宝")
+	private Integer payType;
+	/** 微信流水号 */
+	@ApiModelProperty("微信流水号")
+	private String transid;
+	/** 关闭时间 */
+	@ApiModelProperty("关闭时间")
+	private Long cancelTime;
+	/** 订单完成时间 */
+	@ApiModelProperty("订单完成时间")
+	private Long finishTime;
+	/** 订单类型 1充值订单 2金币消费订单 */
+	@ApiModelProperty("订单类型 1充值订单 2金币消费订单")
+	private Integer orderType;
+	/** 支付价格 */
+	@ApiModelProperty("支付价格")
+	private BigDecimal payPrice;
+	/** 收费方式 1即刻收费 2稍后收费 */
+	@ApiModelProperty("收费方式 1即刻收费 2稍后收费")
+	private Integer chargingType;
+	/** 收货地址 */
+	@ApiModelProperty("收货地址")
+	private String address;
+	/** 订单来源 1业务员录单 */
+	@ApiModelProperty("订单来源 1业务员录单")
+	private Integer orderFrom;
+}

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

@@ -0,0 +1,36 @@
+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;
+
+
+
+/**
+ * 订单学员信息添加对象 order_student_info
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单学员信息添加对象")
+public class OrderStudentInfoAddBo {
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+    /** 收货地址 */
+    @ApiModelProperty("收货地址")
+    private String address;
+    /** 所在公司 */
+    @ApiModelProperty("所在公司")
+    private String company;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

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

@@ -0,0 +1,41 @@
+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;
+
+
+/**
+ * 订单学员信息编辑对象 order_student_info
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单学员信息编辑对象")
+public class OrderStudentInfoEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long oderStudentId;
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+    /** 收货地址 */
+    @ApiModelProperty("收货地址")
+    private String address;
+
+    /** 所在公司 */
+    @ApiModelProperty("所在公司")
+    private String company;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+}

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

@@ -0,0 +1,48 @@
+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_student_info
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单学员信息分页查询对象")
+public class OrderStudentInfoQueryBo 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 address;
+	/** 所在公司 */
+	@ApiModelProperty("所在公司")
+	private String company;
+}

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

@@ -0,0 +1,67 @@
+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
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("order")
+public class Order implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "order_id")
+    private Long orderId;
+    /** 订单编号 */
+    private String oderSn;
+    /** 用户ID */
+    private Long userId;
+    /** 订单价格 */
+    private BigDecimal orderPrice;
+    /** 支付订单号 */
+    private String orderGeneral;
+    /** 订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功 */
+    private Integer orderStatus;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 支付时间 */
+    private Long payTime;
+    /** 支付平台 1微信 2支付宝 */
+    private Integer payType;
+    /** 微信流水号 */
+    private String transid;
+    /** 关闭时间 */
+    private Long cancelTime;
+    /** 订单完成时间 */
+    private Long finishTime;
+    /** 订单类型 1充值订单 2金币消费订单 */
+    private Integer orderType;
+    /** 支付价格 */
+    private BigDecimal payPrice;
+    /** 收费方式 1即刻收费 2稍后收费 */
+    private Integer chargingType;
+    /** 订单来源 1业务员录单 */
+    private Integer orderFrom;
+    /** 系统订单操作人 */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+}

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

@@ -0,0 +1,45 @@
+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_business
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("order_business")
+public class OrderBusiness implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "order_business_id")
+    private Long orderBusinessId;
+    /** 订单编号 */
+    private String orderSn;
+    /** 业务归属人 */
+    private String businessOwner;
+    /** 归属部门 */
+    private String dept;
+    /** 渠道来源 */
+    private String source;
+    /** 到访校区 */
+    private String school;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

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

@@ -0,0 +1,44 @@
+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_goods
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("order_goods")
+public class OrderGoods implements Serializable {
+
+private static final long serialVersionUID=1L;
+    /** $column.columnComment */
+    @TableId(value = "order_goods_id")
+    private Long orderGoodsId;
+    /** 订单编号 */
+    private String orderSn;
+    /** 商品id */
+    private Long goodsId;
+    /** 商品采集数据 */
+    private String goodsInputData;
+    /** 商品标准价格 */
+    private BigDecimal goodsPrice;
+    /** 商品成交价格 */
+    private BigDecimal goodsRealPrice;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

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

@@ -0,0 +1,41 @@
+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_student_info
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("order_student_info")
+public class OrderStudentInfo implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "oder_student_id")
+    private Long oderStudentId;
+    /** 订单编号 */
+    private String orderSn;
+    /** 收货地址 */
+    private String address;
+    /** 所在公司 */
+    private String company;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.domain.OrderBusiness;
+
+/**
+ * 订单业务信息Mapper接口
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+public interface OrderBusinessMapper extends BaseMapper<OrderBusiness> {
+
+}

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

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

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

@@ -0,0 +1,13 @@
+package com.zhongzheng.modules.order.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.domain.Order;
+
+/**
+ * 订单Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+public interface OrderMapper extends BaseMapper<Order> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.domain.OrderStudentInfo;
+
+/**
+ * 订单学员信息Mapper接口
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+public interface OrderStudentInfoMapper extends BaseMapper<OrderStudentInfo> {
+
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.order.bo.OrderBusinessAddBo;
+import com.zhongzheng.modules.order.bo.OrderBusinessEditBo;
+import com.zhongzheng.modules.order.bo.OrderBusinessQueryBo;
+import com.zhongzheng.modules.order.domain.OrderBusiness;
+import com.zhongzheng.modules.order.vo.OrderBusinessVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单业务信息Service接口
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+public interface IOrderBusinessService extends IService<OrderBusiness> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	OrderBusinessVo queryById(String orderSn);
+
+	/**
+	 * 查询列表
+	 */
+	List<OrderBusinessVo> queryList(OrderBusinessQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单业务信息
+	 * @param bo 订单业务信息新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(OrderBusinessAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单业务信息
+	 * @param bo 订单业务信息编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(OrderBusinessEditBo 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/IOrderGoodsService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.order.bo.OrderGoodsAddBo;
+import com.zhongzheng.modules.order.bo.OrderGoodsEditBo;
+import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
+import com.zhongzheng.modules.order.domain.OrderGoods;
+import com.zhongzheng.modules.order.vo.OrderGoodsVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单商品Service接口
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+public interface IOrderGoodsService extends IService<OrderGoods> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	OrderGoodsVo queryById(String orderSn);
+
+	/**
+	 * 查询列表
+	 */
+	List<OrderGoodsVo> queryList(OrderGoodsQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单商品
+	 * @param bo 订单商品新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(OrderGoodsAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单商品
+	 * @param bo 订单商品编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(OrderGoodsEditBo 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/IOrderService.java

@@ -0,0 +1,58 @@
+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.OrderEditBo;
+import com.zhongzheng.modules.order.bo.OrderQueryBo;
+import com.zhongzheng.modules.order.domain.Order;
+import com.zhongzheng.modules.order.vo.OrderVo;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 订单Service接口
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+public interface IOrderService extends IService<Order> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	OrderVo queryById(Long orderId);
+
+	/**
+	 * 查询列表
+	 */
+	List<OrderVo> queryList(OrderQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单
+	 * @param bo 订单新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(OrderAddBo bo);
+
+	Map<String, String> placeOrder(OrderAddBo bo);
+
+
+	Map<String, Object> placePlatOrder(OrderAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单
+	 * @param bo 订单编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(OrderEditBo 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/IOrderStudentInfoService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.order.bo.OrderStudentInfoAddBo;
+import com.zhongzheng.modules.order.bo.OrderStudentInfoEditBo;
+import com.zhongzheng.modules.order.bo.OrderStudentInfoQueryBo;
+import com.zhongzheng.modules.order.domain.OrderStudentInfo;
+import com.zhongzheng.modules.order.vo.OrderStudentInfoVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单学员信息Service接口
+ *
+ * @author hjl
+ * @date 2021-11-08
+ */
+public interface IOrderStudentInfoService extends IService<OrderStudentInfo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	OrderStudentInfoVo queryById(Long oderStudentId);
+
+	/**
+	 * 查询列表
+	 */
+	List<OrderStudentInfoVo> queryList(OrderStudentInfoQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单学员信息
+	 * @param bo 订单学员信息新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(OrderStudentInfoAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单学员信息
+	 * @param bo 订单学员信息编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(OrderStudentInfoEditBo 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/impl/OrderBusinessServiceImpl.java

@@ -0,0 +1,102 @@
+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.OrderBusinessAddBo;
+import com.zhongzheng.modules.order.bo.OrderBusinessEditBo;
+import com.zhongzheng.modules.order.bo.OrderBusinessQueryBo;
+import com.zhongzheng.modules.order.domain.OrderBusiness;
+import com.zhongzheng.modules.order.mapper.OrderBusinessMapper;
+import com.zhongzheng.modules.order.service.IOrderBusinessService;
+import com.zhongzheng.modules.order.vo.OrderBusinessVo;
+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-08
+ */
+@Service
+public class OrderBusinessServiceImpl extends ServiceImpl<OrderBusinessMapper, OrderBusiness> implements IOrderBusinessService {
+
+    @Override
+    public OrderBusinessVo queryById(String orderSn){
+        OrderBusiness db = this.baseMapper.selectById(orderSn);
+        return BeanUtil.toBean(db, OrderBusinessVo.class);
+    }
+
+    @Override
+    public List<OrderBusinessVo> queryList(OrderBusinessQueryBo bo) {
+        LambdaQueryWrapper<OrderBusiness> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getBusinessOwner()), OrderBusiness::getBusinessOwner, bo.getBusinessOwner());
+        lqw.eq(StrUtil.isNotBlank(bo.getDept()), OrderBusiness::getDept, bo.getDept());
+        lqw.eq(StrUtil.isNotBlank(bo.getSource()), OrderBusiness::getSource, bo.getSource());
+        lqw.eq(StrUtil.isNotBlank(bo.getSchool()), OrderBusiness::getSchool, bo.getSchool());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<OrderBusinessVo> entity2Vo(Collection<OrderBusiness> collection) {
+        List<OrderBusinessVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, OrderBusinessVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<OrderBusiness> page = (Page<OrderBusiness>)collection;
+            Page<OrderBusinessVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(OrderBusinessAddBo bo) {
+        OrderBusiness add = BeanUtil.toBean(bo, OrderBusiness.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(OrderBusinessEditBo bo) {
+        OrderBusiness update = BeanUtil.toBean(bo, OrderBusiness.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(OrderBusiness 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/OrderGoodsServiceImpl.java

@@ -0,0 +1,102 @@
+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.OrderGoodsAddBo;
+import com.zhongzheng.modules.order.bo.OrderGoodsEditBo;
+import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
+import com.zhongzheng.modules.order.domain.OrderGoods;
+import com.zhongzheng.modules.order.mapper.OrderGoodsMapper;
+import com.zhongzheng.modules.order.service.IOrderGoodsService;
+import com.zhongzheng.modules.order.vo.OrderGoodsVo;
+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-08
+ */
+@Service
+public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGoods> implements IOrderGoodsService {
+
+    @Override
+    public OrderGoodsVo queryById(String orderSn){
+        OrderGoods db = this.baseMapper.selectById(orderSn);
+        return BeanUtil.toBean(db, OrderGoodsVo.class);
+    }
+
+    @Override
+    public List<OrderGoodsVo> queryList(OrderGoodsQueryBo bo) {
+        LambdaQueryWrapper<OrderGoods> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getGoodsId() != null, OrderGoods::getGoodsId, bo.getGoodsId());
+        lqw.eq(StrUtil.isNotBlank(bo.getGoodsInputData()), OrderGoods::getGoodsInputData, bo.getGoodsInputData());
+        lqw.eq(bo.getGoodsPrice() != null, OrderGoods::getGoodsPrice, bo.getGoodsPrice());
+        lqw.eq(bo.getGoodsRealPrice() != null, OrderGoods::getGoodsRealPrice, bo.getGoodsRealPrice());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<OrderGoodsVo> entity2Vo(Collection<OrderGoods> collection) {
+        List<OrderGoodsVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, OrderGoodsVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<OrderGoods> page = (Page<OrderGoods>)collection;
+            Page<OrderGoodsVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(OrderGoodsAddBo bo) {
+        OrderGoods add = BeanUtil.toBean(bo, OrderGoods.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(OrderGoodsEditBo bo) {
+        OrderGoods update = BeanUtil.toBean(bo, OrderGoods.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(OrderGoods 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/OrderServiceImpl.java

@@ -0,0 +1,197 @@
+package com.zhongzheng.modules.order.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.bank.domain.QuestionBusiness;
+import com.zhongzheng.modules.order.bo.*;
+import com.zhongzheng.modules.order.domain.Order;
+import com.zhongzheng.modules.order.domain.OrderBusiness;
+import com.zhongzheng.modules.order.domain.OrderGoods;
+import com.zhongzheng.modules.order.domain.OrderStudentInfo;
+import com.zhongzheng.modules.order.mapper.OrderMapper;
+import com.zhongzheng.modules.order.service.IOrderBusinessService;
+import com.zhongzheng.modules.order.service.IOrderGoodsService;
+import com.zhongzheng.modules.order.service.IOrderService;
+import com.zhongzheng.modules.order.service.IOrderStudentInfoService;
+import com.zhongzheng.modules.order.vo.OrderVo;
+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.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 订单Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+@Service
+public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
+
+
+    @Autowired
+    private IOrderGoodsService iOrderGoodsService;
+
+    @Autowired
+    private IOrderBusinessService iOrderBusinessService;
+
+    @Autowired
+    private IOrderStudentInfoService iOrderStudentInfoService;
+
+    @Override
+    public OrderVo queryById(Long orderId){
+        Order db = this.baseMapper.selectById(orderId);
+        return BeanUtil.toBean(db, OrderVo.class);
+    }
+
+    @Override
+    public List<OrderVo> queryList(OrderQueryBo bo) {
+        LambdaQueryWrapper<Order> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getOderSn()), Order::getOderSn, bo.getOderSn());
+        lqw.eq(bo.getUserId() != null, Order::getUserId, bo.getUserId());
+        lqw.eq(bo.getOrderPrice() != null, Order::getOrderPrice, bo.getOrderPrice());
+        lqw.eq(StrUtil.isNotBlank(bo.getOrderGeneral()), Order::getOrderGeneral, bo.getOrderGeneral());
+        lqw.eq(bo.getOrderStatus() != null, Order::getOrderStatus, bo.getOrderStatus());
+        lqw.eq(bo.getPayTime() != null, Order::getPayTime, bo.getPayTime());
+        lqw.eq(bo.getPayType() != null, Order::getPayType, bo.getPayType());
+        lqw.eq(StrUtil.isNotBlank(bo.getTransid()), Order::getTransid, bo.getTransid());
+        lqw.eq(bo.getCancelTime() != null, Order::getCancelTime, bo.getCancelTime());
+        lqw.eq(bo.getFinishTime() != null, Order::getFinishTime, bo.getFinishTime());
+        lqw.eq(bo.getOrderType() != null, Order::getOrderType, bo.getOrderType());
+        lqw.eq(bo.getPayPrice() != null, Order::getPayPrice, bo.getPayPrice());
+        lqw.eq(bo.getChargingType() != null, Order::getChargingType, bo.getChargingType());
+        lqw.eq(bo.getOrderFrom() != null, Order::getOrderFrom, bo.getOrderFrom());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<OrderVo> entity2Vo(Collection<Order> collection) {
+        List<OrderVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, OrderVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<Order> page = (Page<Order>)collection;
+            Page<OrderVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(OrderAddBo bo) {
+        Order add = BeanUtil.toBean(bo, Order.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, String> placeOrder(OrderAddBo bo) {
+
+
+        return null;
+    }
+
+    /**
+     * 业务员平台下单
+     * @param bo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> placePlatOrder(OrderAddBo bo) {
+        List<OrderGoodsAddBo> goodsList = bo.getGoodsList();
+        if(goodsList==null||goodsList.size()<1){
+            throw new CustomException("商品列表为空");
+        }
+        Order add = BeanUtil.toBean(bo, Order.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+
+
+        //生成订单号
+        String out_trade_no = DateUtils.getDateOrderSn();
+
+        //生成业务
+        OrderBusinessAddBo orderBusinessAddBo = bo.getOrderBusiness();
+        orderBusinessAddBo.setOrderSn(out_trade_no);
+        iOrderBusinessService.insertByAddBo(orderBusinessAddBo);
+
+        //生成学员
+        OrderStudentInfoAddBo orderStudentInfoAddBo = bo.getOrderStudent();
+        orderStudentInfoAddBo.setOrderSn(out_trade_no);
+        iOrderStudentInfoService.insertByAddBo(orderStudentInfoAddBo);
+        BigDecimal totalPrice = new BigDecimal(0);
+        BigDecimal payPrice = new BigDecimal(0);
+        //生成订单
+        Collection<OrderGoods> coll = new HashSet<>();
+        for (OrderGoodsAddBo g : goodsList) {
+            OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
+            orderGoods.setOrderSn(out_trade_no);
+            orderGoods.setGoodsInputData(JSON.toJSONString(g.getGoodsInputData()));
+            orderGoods.setCreateTime(DateUtils.getNowTime());
+            orderGoods.setUpdateTime(DateUtils.getNowTime());
+            coll.add(orderGoods);
+            //订单价格不计算优惠
+            totalPrice = totalPrice.add(g.getGoodsPrice());
+            //暂不计算优惠券
+            payPrice = payPrice.add(g.getGoodsPrice());
+        }
+        iOrderGoodsService.saveBatch(coll);
+
+        add.setOderSn(out_trade_no);
+        add.setOrderFrom(1);
+        add.setPayPrice(payPrice);
+        add.setOrderPrice(totalPrice);
+
+        this.save(add);
+        Map<String, Object> result = new HashMap<>();
+        result.put("oderId",add.getOrderId());
+        return result;
+    }
+
+    @Override
+    public Boolean updateByEditBo(OrderEditBo bo) {
+        Order update = BeanUtil.toBean(bo, Order.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(Order 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/OrderStudentInfoServiceImpl.java

@@ -0,0 +1,101 @@
+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.OrderStudentInfoAddBo;
+import com.zhongzheng.modules.order.bo.OrderStudentInfoEditBo;
+import com.zhongzheng.modules.order.bo.OrderStudentInfoQueryBo;
+import com.zhongzheng.modules.order.domain.OrderStudentInfo;
+import com.zhongzheng.modules.order.mapper.OrderStudentInfoMapper;
+import com.zhongzheng.modules.order.service.IOrderStudentInfoService;
+import com.zhongzheng.modules.order.vo.OrderStudentInfoVo;
+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-08
+ */
+@Service
+public class OrderStudentInfoServiceImpl extends ServiceImpl<OrderStudentInfoMapper, OrderStudentInfo> implements IOrderStudentInfoService {
+
+    @Override
+    public OrderStudentInfoVo queryById(Long oderStudentId){
+        OrderStudentInfo db = this.baseMapper.selectById(oderStudentId);
+        return BeanUtil.toBean(db, OrderStudentInfoVo.class);
+    }
+
+    @Override
+    public List<OrderStudentInfoVo> queryList(OrderStudentInfoQueryBo bo) {
+        LambdaQueryWrapper<OrderStudentInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), OrderStudentInfo::getOrderSn, bo.getOrderSn());
+        lqw.eq(StrUtil.isNotBlank(bo.getAddress()), OrderStudentInfo::getAddress, bo.getAddress());
+        lqw.eq(StrUtil.isNotBlank(bo.getCompany()), OrderStudentInfo::getCompany, bo.getCompany());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<OrderStudentInfoVo> entity2Vo(Collection<OrderStudentInfo> collection) {
+        List<OrderStudentInfoVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, OrderStudentInfoVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<OrderStudentInfo> page = (Page<OrderStudentInfo>)collection;
+            Page<OrderStudentInfoVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(OrderStudentInfoAddBo bo) {
+        OrderStudentInfo add = BeanUtil.toBean(bo, OrderStudentInfo.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(OrderStudentInfoEditBo bo) {
+        OrderStudentInfo update = BeanUtil.toBean(bo, OrderStudentInfo.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(OrderStudentInfo 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/vo/OrderBusinessVo.java

@@ -0,0 +1,45 @@
+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-08
+ */
+@Data
+@ApiModel("订单业务信息视图对象")
+public class OrderBusinessVo {
+	private static final long serialVersionUID = 1L;
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long orderBusinessId;
+	/** 订单编号 */
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+
+	/** 业务归属人 */
+	@Excel(name = "业务归属人")
+	@ApiModelProperty("业务归属人")
+	private String businessOwner;
+	/** 归属部门 */
+	@Excel(name = "归属部门")
+	@ApiModelProperty("归属部门")
+	private String dept;
+	/** 渠道来源 */
+	@Excel(name = "渠道来源")
+	@ApiModelProperty("渠道来源")
+	private String source;
+	/** 到访校区 */
+	@Excel(name = "到访校区")
+	@ApiModelProperty("到访校区")
+	private String school;
+}

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

@@ -0,0 +1,46 @@
+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-08
+ */
+@Data
+@ApiModel("订单商品视图对象")
+public class OrderGoodsVo {
+	private static final long serialVersionUID = 1L;
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long orderGoodsId;
+	/** 订单编号 */
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+
+	/** 商品id */
+	@Excel(name = "商品id")
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+	/** 商品采集数据 */
+	@Excel(name = "商品采集数据")
+	@ApiModelProperty("商品采集数据")
+	private String goodsInputData;
+	/** 商品标准价格 */
+	@Excel(name = "商品标准价格")
+	@ApiModelProperty("商品标准价格")
+	private BigDecimal goodsPrice;
+	/** 商品成交价格 */
+	@Excel(name = "商品成交价格")
+	@ApiModelProperty("商品成交价格")
+	private BigDecimal goodsRealPrice;
+}

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

@@ -0,0 +1,39 @@
+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-08
+ */
+@Data
+@ApiModel("订单学员信息视图对象")
+public class OrderStudentInfoVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long oderStudentId;
+
+	/** 订单编号 */
+	@Excel(name = "订单编号")
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+	/** 收货地址 */
+	@Excel(name = "收货地址")
+	@ApiModelProperty("收货地址")
+	private String address;
+	/** 所在公司 */
+	@Excel(name = "所在公司")
+	@ApiModelProperty("所在公司")
+	private String company;
+}

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

@@ -0,0 +1,84 @@
+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 ruoyi
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单视图对象")
+public class OrderVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long orderId;
+
+	/** 订单编号 */
+	@Excel(name = "订单编号")
+	@ApiModelProperty("订单编号")
+	private String oderSn;
+	/** 用户ID */
+	@Excel(name = "用户ID")
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 订单价格 */
+	@Excel(name = "订单价格")
+	@ApiModelProperty("订单价格")
+	private BigDecimal orderPrice;
+	/** 支付订单号 */
+	@Excel(name = "支付订单号")
+	@ApiModelProperty("支付订单号")
+	private String orderGeneral;
+	/** 订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功 */
+	@Excel(name = "订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功")
+	@ApiModelProperty("订单状态 -2 超时关闭，-1手动关闭，0普通状态，1为已付款，3为成功")
+	private Integer orderStatus;
+	/** 支付时间 */
+	@Excel(name = "支付时间")
+	@ApiModelProperty("支付时间")
+	private Long payTime;
+	/** 支付平台 1微信 2支付宝 */
+	@Excel(name = "支付平台 1微信 2支付宝")
+	@ApiModelProperty("支付平台 1微信 2支付宝")
+	private Integer payType;
+	/** 微信流水号 */
+	@Excel(name = "微信流水号")
+	@ApiModelProperty("微信流水号")
+	private String transid;
+	/** 关闭时间 */
+	@Excel(name = "关闭时间")
+	@ApiModelProperty("关闭时间")
+	private Long cancelTime;
+	/** 订单完成时间 */
+	@Excel(name = "订单完成时间")
+	@ApiModelProperty("订单完成时间")
+	private Long finishTime;
+	/** 订单类型 1充值订单 2金币消费订单 */
+	@Excel(name = "订单类型 1充值订单 2金币消费订单")
+	@ApiModelProperty("订单类型 1充值订单 2金币消费订单")
+	private Integer orderType;
+	/** 支付价格 */
+	@Excel(name = "支付价格")
+	@ApiModelProperty("支付价格")
+	private BigDecimal payPrice;
+	/** 收费方式 1即刻收费 2稍后收费 */
+	@Excel(name = "收费方式 1即刻收费 2稍后收费")
+	@ApiModelProperty("收费方式 1即刻收费 2稍后收费")
+	private Integer chargingType;
+	/** 订单来源 1业务员录单 */
+	@Excel(name = "订单来源 1业务员录单")
+	@ApiModelProperty("订单来源 1业务员录单")
+	private Integer orderFrom;
+}

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

@@ -0,0 +1,19 @@
+<?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.OrderBusinessMapper">
+
+    <resultMap type="com.zhongzheng.modules.order.domain.OrderBusiness" id="OrderBusinessResult">
+        <result property="orderBusinessId" column="order_business_id"/>
+        <result property="orderSn" column="order_sn"/>
+        <result property="businessOwner" column="business_owner"/>
+        <result property="dept" column="dept"/>
+        <result property="source" column="source"/>
+        <result property="school" column="school"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?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.OrderGoodsMapper">
+
+    <resultMap type="com.zhongzheng.modules.order.domain.OrderGoods" id="OrderGoodsResult">
+        <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="orderSn" column="order_sn"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="goodsInputData" column="goods_input_data"/>
+        <result property="goodsPrice" column="goods_price"/>
+        <result property="goodsRealPrice" column="goods_real_price"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,29 @@
+<?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.OrderMapper">
+
+    <resultMap type="com.zhongzheng.modules.order.domain.Order" id="OrderResult">
+        <result property="orderId" column="order_id"/>
+        <result property="oderSn" column="oder_sn"/>
+        <result property="userId" column="user_id"/>
+        <result property="orderPrice" column="order_price"/>
+        <result property="orderGeneral" column="order_general"/>
+        <result property="orderStatus" column="order_status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="payTime" column="pay_time"/>
+        <result property="payType" column="pay_type"/>
+        <result property="transid" column="transid"/>
+        <result property="cancelTime" column="cancel_time"/>
+        <result property="finishTime" column="finish_time"/>
+        <result property="orderType" column="order_type"/>
+        <result property="payPrice" column="pay_price"/>
+        <result property="chargingType" column="charging_type"/>
+        <result property="orderFrom" column="order_from"/>
+        <result property="createBy" column="create_by"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,17 @@
+<?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.OrderStudentInfoMapper">
+
+    <resultMap type="com.zhongzheng.modules.order.domain.OrderStudentInfo" id="OrderStudentInfoResult">
+        <result property="oderStudentId" column="oder_student_id"/>
+        <result property="orderSn" column="order_sn"/>
+        <result property="address" column="address"/>
+        <result property="company" column="company"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>