fix 商品状态

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

@@ -11,6 +11,7 @@ import com.zhongzheng.modules.order.bo.OrderQueryBo;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
+import com.zhongzheng.modules.order.vo.OrderListVo;
 import com.zhongzheng.modules.order.vo.OrderVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -54,9 +55,9 @@ public class OrderController extends BaseController {
     @ApiOperation("查询订单列表")
     @PreAuthorize("@ss.hasPermi('system:order:list')")
     @GetMapping("/list")
-    public TableDataInfo<OrderVo> list(OrderQueryBo bo) {
+    public TableDataInfo<OrderListVo> list(OrderQueryBo bo) {
         startPage();
-        List<OrderVo> list = iOrderService.queryList(bo);
+        List<OrderListVo> list = iOrderService.selectList(bo);
         return getDataTable(list);
     }
 

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

@@ -1,6 +1,12 @@
 package com.zhongzheng.modules.order.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
+import com.zhongzheng.modules.order.bo.OrderQueryBo;
 import com.zhongzheng.modules.order.domain.Order;
+import com.zhongzheng.modules.order.vo.OrderGoodsVo;
+import com.zhongzheng.modules.order.vo.OrderListVo;
+
+import java.util.List;
 
 /**
  * 订单Mapper接口
@@ -9,5 +15,5 @@ import com.zhongzheng.modules.order.domain.Order;
  * @date 2021-11-08
  */
 public interface OrderMapper extends BaseMapper<Order> {
-
+    List<OrderListVo> selectList(OrderQueryBo bo);
 }

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

@@ -5,6 +5,7 @@ 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.OrderListVo;
 import com.zhongzheng.modules.order.vo.OrderVo;
 
 import java.util.Collection;
@@ -29,6 +30,8 @@ public interface IOrderService extends IService<Order> {
 	 */
 	List<OrderVo> queryList(OrderQueryBo bo);
 
+	List<OrderListVo> selectList(OrderQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入订单
 	 * @param bo 订单新增业务对象

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

@@ -16,6 +16,7 @@ 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.OrderListVo;
 import com.zhongzheng.modules.order.vo.OrderVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +49,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     private IOrderStudentInfoService iOrderStudentInfoService;
 
+    @Autowired
+    private OrderMapper orderMapper;
+
     @Override
     public OrderVo queryById(Long orderId){
         Order db = this.baseMapper.selectById(orderId);
@@ -74,6 +78,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<OrderListVo> selectList(OrderQueryBo bo) {
+        return orderMapper.selectList(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

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

@@ -0,0 +1,112 @@
+package com.zhongzheng.modules.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 订单视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单视图对象")
+public class OrderListVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long orderId;
+
+	/** 订单编号 */
+	@Excel(name = "订单编号")
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+	/** 用户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;
+	@ApiModelProperty("订单创建时间")
+	private Long createTime;
+	/** 商品标准价格 */
+	@Excel(name = "商品标准价格")
+	@ApiModelProperty("商品标准价格")
+	private BigDecimal goodsPrice;
+	/** 商品成交价格 */
+	@Excel(name = "商品成交价格")
+	@ApiModelProperty("商品成交价格")
+	private BigDecimal goodsRealPrice;
+	/** 商品名称 */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+	@Excel(name = "年份")
+	@ApiModelProperty("年份")
+	private Long year;
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+
+	@ApiModelProperty("教育名称")
+	private String educationName;
+	@ApiModelProperty("项目名称")
+	private String projectName;
+	@ApiModelProperty("业务名称")
+	private String businessName;
+	@ApiModelProperty("学校名称")
+	private String schoolName;
+	@ApiModelProperty("专业名称")
+	private String categoryName;
+}

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

@@ -25,7 +25,70 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createBy" column="create_by"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.order.vo.OrderListVo" id="OrderResultVo">
+        <result property="orderId" column="order_id"/>
+        <result property="orderSn" column="order_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="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"/>
+
+        <result property="goodsName" column="goods_name"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="year" column="year"/>
+
+        <result property="educationName" column="education_name"/>
+        <result property="projectName" column="project_name"/>
+        <result property="businessName" column="business_name"/>
+        <result property="schoolName" column="school_name"/>
+        <result property="categoryName" column="category_name"/>
+
+        <result property="goodsPrice" column="goods_price"/>
+        <result property="goodsRealPrice" column="goods_real_price"/>
+
+        <result property="idCard" column="id_card"/>
+        <result property="telphone" column="telphone"/>
+        <result property="realname" column="realname"/>
+    </resultMap>
 
+    <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderQueryBo" resultMap="OrderResultVo">
+        SELECT
+            o.*,
+            g.goods_id,
+            g.goods_name,
+            g.year,
+            og.goods_price,
+            og.goods_real_price,
+            u.telphone,
+            u.realname,
+            u.id_card,
+            cet.education_name,
+            cpt.project_name,
+            cb.business_name,
+            s.school_name,
+            m.category_name
+        FROM
+            `order` o
+                LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+                LEFT JOIN goods g ON og.goods_id = g.goods_id
+                LEFT JOIN `user` u ON o.user_id = o.user_id
+                LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
+                LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
+                LEFT JOIN course_business cb ON g.business_id = cb.id
+                LEFT JOIN school s ON s.id = g.school_id
+                LEFT JOIN major m ON g.major_id = m.id
+    </select>
 
 
 </mapper>