订单表添加查询

jsjp-admin/src/main/java/com/miaxis/pc/PcOrderInfoController.java

@@ -79,6 +79,23 @@ public class PcOrderInfoController extends BaseController{
         return toResponsePageInfo(list);
 
 
+    }
+
+    /**
+     * 查询驾校订单明细列表
+     */
+    @GetMapping("/school/detailed")
+    @ApiOperation("查询驾校订单明细列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<OrderInfo> detailed(@ModelAttribute QuerySchoolOrderListDTO schoolOrderListDTO) {
+        startPage();
+        List<OrderInfo> list = orderInfoService.selectSchoolOrderDetailed(schoolOrderListDTO);
+        return toResponsePageInfo(list);
+
+
     }
 
     /**

jsjp-service/src/main/java/com/miaxis/order/dto/QuerySchoolOrderListDTO.java

@@ -27,5 +27,9 @@ public class QuerySchoolOrderListDTO extends BaseBusinessEntity {
     @ApiModelProperty(value = "驾校名称")
     private String schoolName;
 
+    @ApiModelProperty(value = "支付状态")
+    private Integer tradeType;
 
+    @ApiModelProperty(value = "是否是合作订单")
+    private Integer isShare;
 }

jsjp-service/src/main/java/com/miaxis/order/mapper/OrderInfoMapper.java

@@ -25,4 +25,6 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
     OrderInfo getByOutTradeNo(String outTradeNo);
 
     List<QuerySchoolOrderListVo> selectSchoolOrderInfoList(QuerySchoolOrderListDTO schoolOrderListDTO);
+
+    List<OrderInfo> selectSchoolOrderDetailed(QuerySchoolOrderListDTO schoolOrderListDTO);
 }

jsjp-service/src/main/java/com/miaxis/order/service/IOrderInfoService.java

@@ -32,4 +32,6 @@ public interface IOrderInfoService extends IService<OrderInfo> {
     List<QuerySchoolOrderListVo> selectSchoolOrderInfoList(QuerySchoolOrderListDTO schoolOrderListDTO);
 
     public void refundOrder(WxJsOrder order);
+
+    List<OrderInfo> selectSchoolOrderDetailed(QuerySchoolOrderListDTO schoolOrderListDTO);
 }

jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -1309,6 +1309,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         return orderInfoMapper.selectSchoolOrderInfoList(schoolOrderListDTO);
     }
 
+    @Override
+    public List<OrderInfo> selectSchoolOrderDetailed(QuerySchoolOrderListDTO schoolOrderListDTO) {
+        return orderInfoMapper.selectSchoolOrderDetailed(schoolOrderListDTO);
+    }
+
 
     public void refundOrder(WxJsOrder order) {
         long oneYearLong = 1000 * 60 * 60 * 24 * 365l;

jsjp-service/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -15,6 +15,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="payType"    column="pay_type"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="isShare"    column="is_share"    />
+        <result property="dqbh"    column="dqbh"    />
+        <result property="dqmc"    column="dqmc"    />
+        <result property="school"    column="school"    />
+        <result property="schoolName"    column="school_name"    />
+        <result property="schoolCommission"    column="school_commission"    />
+        <result property="phoneType"    column="phone_type"    />
+        <result property="refundReason"    column="refund_reason"    />
+
+
     </resultMap>
 
     <sql id="selectOrderInfoVo">
@@ -47,19 +57,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(school_commission) as school_commission,
         sum(total) as orderTotal
         from order_info
-        where is_share =1
-        <if test="schoolName != null  and schoolName != ''">
-            and school_name like concat('%', #{schoolName}, '%')
-        </if>
-        <if test="startTime != null">
-            and DATE_FORMAT(create_time,'%Y-%m-%d')<![CDATA[ >= ]]> #{startTime}
-        </if>
-        <if test="endTime != null">
-            and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ < ]]> #{endTime}
-        </if>
+        <where>
+            <if test="isShare != null  and isShare != ''">
+                and is_share = #{isShare }
+            </if>
+            <if test="tradeType != null  and tradeType != ''">
+                and trade_type = #{tradeType }
+            </if>
+            <if test="schoolName != null  and schoolName != ''">
+                and school_name like concat('%', #{schoolName}, '%')
+            </if>
+            <if test="startTime != null">
+                and DATE_FORMAT(create_time,'%Y-%m-%d')<![CDATA[ >= ]]> #{startTime}
+            </if>
+            <if test="endTime != null">
+                and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ < ]]> #{endTime}
+            </if>
+        </where>
         group by school,school_name
 
+    </select>
+
 
+    <select id="selectSchoolOrderDetailed"  resultType="com.miaxis.order.domain.OrderInfo">
+        select * from order_info
+        <where>
+            <if test="isShare != null  and isShare != ''">
+                and is_share = #{isShare }
+            </if>
+            <if test="tradeType != null  and tradeType != ''">
+                and trade_type = #{tradeType }
+            </if>
+            <if test="schoolName != null  and schoolName != ''">
+                and school_name like concat('%', #{schoolName}, '%')
+            </if>
+            <if test="startTime != null">
+                and DATE_FORMAT(create_time,'%Y-%m-%d')<![CDATA[ >= ]]> #{startTime}
+            </if>
+            <if test="endTime != null">
+                and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ < ]]> #{endTime}
+            </if>
+        </where>
+        order by success_time desc
     </select>
 
+
 </mapper>