'1'

zzjs-admin/src/main/java/com/miaxis/app/controller/film/FilmController.java

@@ -9,6 +9,7 @@ import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.common.utils.uuid.CommonUtils;
@@ -16,11 +17,11 @@ import com.miaxis.feign.dto.FilmDTO;
 import com.miaxis.film.domain.FilmOrder;
 import com.miaxis.film.dto.CinemaData;
 import com.miaxis.film.dto.FilmOrderCreateDTO;
+import com.miaxis.film.dto.FilmOrderListDTO;
 import com.miaxis.film.service.IFilmOrderService;
+import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.system.service.ISysConfigService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +35,7 @@ import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.ByteArrayOutputStream;
@@ -85,6 +87,26 @@ public class FilmController extends BaseController {
 
 
 
+
+    /**
+     * 查询题库列表
+     */
+
+    @GetMapping("/order/list")
+    @ApiOperation("查询订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<FilmOrder> list(@ModelAttribute FilmOrderListDTO filmOrderListDTO){
+
+        String openid = SecurityUtils.getLoginUser().getStudent().getOpenid();
+        startPage();
+        filmOrderListDTO.setOpenid(openid);
+        List<FilmOrder> list = filmOrderService.selectOrderList(filmOrderListDTO);
+        return toResponsePageInfo(list);
+    }
+
     /**
      * 微信支付获取预订单id
      */
@@ -101,6 +123,9 @@ public class FilmController extends BaseController {
         UserInfo student = SecurityUtils.getLoginUser().getStudent();
 
 
+
+
+
         //生成预订单
         Long id = student.getId();
         String orderCode = getOrderCode(id);
@@ -236,6 +261,9 @@ public class FilmController extends BaseController {
     }
 
 
+
+
+
     /**
      * 微信支付查单接口
      */

zzjs-service/src/main/java/com/miaxis/film/dto/FilmOrderListDTO.java

@@ -0,0 +1,19 @@
+package com.miaxis.film.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FilmOrderListDTO {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "近几天的天数")
+    private Integer days;
+
+
+    @ApiModelProperty(value = "openid",hidden = true)
+    private String  openid;
+
+
+
+}

zzjs-service/src/main/java/com/miaxis/film/dto/FilmOrderNotifyDbJSON.java

@@ -0,0 +1,53 @@
+package com.miaxis.film.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 微信支付回调 dto
+ */
+@Data
+public class FilmOrderNotifyDbJSON {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "时间戳")
+    private String time;
+
+
+    @ApiModelProperty(value = "订单状态发生变更时的事件如： ORDER_CLOSE")
+    private String eventName;
+
+
+    @ApiModelProperty(value = "接入方下单时的订单号")
+    private String thirdOrderId;
+
+    @ApiModelProperty(value = "回调地址，各个场景发生时，将通过此地址通知接入方")
+    private String notifyUrl;
+
+
+
+
+    @ApiModelProperty(value = "api下单成本价（竞价结束回调通知返回：WAIT_TICKET场景）")
+    private String orderPrice;
+
+
+    @ApiModelProperty(value = "如果事件为订单关闭 ORDER_CLOSE 则有此字段")
+    private String closeCause;
+
+    @ApiModelProperty(value = "实际出票座位，仅供参考，可能与票不一样，也可能为空，一般当实际座位与下单座位不一样时会有")
+    private String realSeat;
+
+
+
+    @ApiModelProperty(value = "取票码字符串如： “[\\”123123\\”,\\”4564357\\”]” 直接用json解析可得到数组，如取票失败则用使用原始截图")
+    private String ticketCode;
+
+    @ApiModelProperty(value = "取票码原始截图如： “[\\”http:\\\\/\\\\/shoutudyp.oss-cn-shenzhen.aliyuncs.com\\\\/b768007aa9071eba3e3018a27dcc47c0.png\\”,\\”http:\\\\/\\\\/shoutudyp.oss-cn-shenzhen.aliyuncs.com\\\\/f9774915e35fae41ae96ebf288477394.jpg\\”]” 直接用json解析可得到数组")
+    private String ticketImage;
+
+
+
+
+
+
+}

zzjs-service/src/main/java/com/miaxis/film/mapper/FilmOrderMapper.java

@@ -3,6 +3,7 @@ package com.miaxis.film.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.film.domain.FilmOrder;
+import com.miaxis.film.dto.FilmOrderListDTO;
 
 /**
  * 电影订单Mapper接口
@@ -20,4 +21,6 @@ public interface FilmOrderMapper extends BaseMapper<FilmOrder> {
     public List<FilmOrder> selectFilmOrderList(FilmOrder filmOrder);
 
     FilmOrder getByOutTradeNo(String outTradeNo);
+
+    List<FilmOrder> selectOrderList(FilmOrderListDTO filmOrderListDTO);
 }

zzjs-service/src/main/java/com/miaxis/film/service/IFilmOrderService.java

@@ -6,6 +6,7 @@ import java.util.List;
 import com.miaxis.feign.dto.FilmDTO;
 import com.miaxis.film.domain.FilmOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.film.dto.FilmOrderListDTO;
 
 /**
  * 电影订单Service接口
@@ -25,4 +26,6 @@ public interface IFilmOrderService extends IService<FilmOrder>{
     FilmOrder getByOutTradeNo(String outTradeNo);
 
     String excuteFilmApi(FilmDTO filmDTO) ;
+
+    List<FilmOrder> selectOrderList(FilmOrderListDTO filmOrderListDTO);
 }

zzjs-service/src/main/java/com/miaxis/film/service/impl/FilmOrderServiceImpl.java

@@ -13,6 +13,7 @@ import com.miaxis.common.sms.MD5Utils;
 import com.miaxis.common.utils.DateUtils;
 import com.miaxis.common.utils.StringUtils;
 import com.miaxis.feign.dto.FilmDTO;
+import com.miaxis.film.dto.FilmOrderListDTO;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -137,4 +138,9 @@ public class FilmOrderServiceImpl extends ServiceImpl<FilmOrderMapper, FilmOrder
         }
 
     }
+
+    @Override
+    public List<FilmOrder> selectOrderList(FilmOrderListDTO filmOrderListDTO) {
+        return filmOrderMapper.selectOrderList(filmOrderListDTO);
+    }
 }

zzjs-service/src/main/resources/mapper/film/FilmOrderMapper.xml

@@ -77,4 +77,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+
+    <select id="selectOrderList" resultType="com.miaxis.film.domain.FilmOrder">
+        select * from film_order
+         where DATE_SUB(CURDATE(), INTERVAL #{days} DAY) &lt;= date(create_time)
+         and openid=#{openid}
+         order by create_time desc
+    </select>
+
 </mapper>