提交代码

hai-order/src/main/java/com/web/controller/business/OrderCouponController.java

@@ -75,6 +75,7 @@ public class OrderCouponController {
                                      @RequestParam(name = "payTimeE", required = false) Long payTimeE,
                                      @RequestParam(name = "finishTimeS", required = false) Long finishTimeS,
                                      @RequestParam(name = "finishTimeE", required = false) Long finishTimeE,
+                                     @RequestParam(name = "exceptionStatus", required = false) Boolean exceptionStatus,
                                      @RequestParam(name = "pageNum", required = true) Integer pageNum,
                                      @RequestParam(name = "pageSize", required = true) Integer pageSize,
                                      HttpServletRequest request) {
@@ -109,6 +110,7 @@ public class OrderCouponController {
             map.put("payTimeE", payTimeE);
             map.put("finishTimeS", finishTimeS);
             map.put("finishTimeE", finishTimeE);
+            map.put("exceptionStatus", exceptionStatus);
 
             PageHelper.startPage(pageNum,pageSize);
             return ResponseMsgUtil.success(new PageInfo<>(orderServiceExt.getOrderCouponList(map)));
@@ -120,7 +122,6 @@ public class OrderCouponController {
     }
 
 
-
     @RequestMapping(value = "/exportOrderCouponExcel", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "导出卡券订单")
@@ -138,6 +139,7 @@ public class OrderCouponController {
                                                @RequestParam(name = "payTimeE", required = false) Long payTimeE,
                                                @RequestParam(name = "finishTimeS", required = false) Long finishTimeS,
                                                @RequestParam(name = "finishTimeE", required = false) Long finishTimeE,
+                                               @RequestParam(name = "exceptionStatus", required = false) Integer exceptionStatus,
                                                HttpServletRequest request) {
         try {
 
@@ -169,6 +171,7 @@ public class OrderCouponController {
             map.put("payTimeE", payTimeE);
             map.put("finishTimeS", finishTimeS);
             map.put("finishTimeE", finishTimeE);
+            map.put("exceptionStatus", exceptionStatus);
 
             List<OrderCouponModel> list = orderServiceExt.getOrderCouponList(map);
 

hai-service/src/main/java/com/hai/dao/order/OrderMapperExt.java

@@ -60,7 +60,8 @@ public interface OrderMapperExt {
             " ELSE '未知' END orderStatus," +
             " b.create_time createTime," +
             " b.pay_time payTime," +
-            " b.finish_time finishTime" +
+            " b.finish_time finishTime," +
+            " case b.exception_status when 1 then '异常' when 0 then '正常' else '未知' end exceptionStatus" +
             " from high_child_order a" +
             " LEFT JOIN high_order b on b.id = a.order_id" +
             " LEFT JOIN high_coupon d on d.id = a.goods_id" +
@@ -80,6 +81,7 @@ public interface OrderMapperExt {
             " <if test='param.payTimeE != null'>  <![CDATA[ and b.pay_time <= #{param.payTimeE} ]]> </if>" +
             " <if test='param.finishTimeS != null'>  <![CDATA[ and b.finish_time >= #{param.finishTimeS} ]]> </if>" +
             " <if test='param.finishTimeE != null'>  <![CDATA[ and b.finish_time <= #{param.finishTimeE} ]]> </if>" +
+            " <if test='param.exceptionStatus != null'> and b.exception_status = #{param.exceptionStatus} </if>" +
             " ORDER BY b.create_time desc" +
             "</script>"})
     List<OrderCouponModel> queryOrderCoupon(@Param("param") Map<String, Object> param);

hai-service/src/main/java/com/hai/order/model/OrderCouponModel.java

@@ -95,4 +95,8 @@ public class OrderCouponModel {
     @ColumnWidth(20)
     @ExcelProperty(value = "完成时间")
     private Date finishTime;
+
+    @ColumnWidth(10)
+    @ExcelProperty(value = "异常状态")
+    private String exceptionStatus;
 }