'1'

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

@@ -15,12 +15,11 @@ import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.common.utils.uuid.CommonUtils;
 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.dto.*;
 import com.miaxis.film.service.IFilmOrderService;
 import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.system.service.ISysConfigService;
+import com.miaxis.system.service.ISysDictDataService;
 import io.swagger.annotations.*;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
@@ -32,6 +31,7 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.util.EntityUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
@@ -76,6 +76,9 @@ public class FilmController extends BaseController {
     @Autowired
     private ISysConfigService configService;
 
+    @Autowired
+    private ISysDictDataService dictDataService;
+
     @Value("${app.appid}")
     private String appid;
     @Value("${film.appKey}")
@@ -119,24 +122,33 @@ public class FilmController extends BaseController {
 
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         ObjectMapper objectMapper = new ObjectMapper();
-
         UserInfo student = SecurityUtils.getLoginUser().getStudent();
 
-
-
-
-
-        //生成预订单
+        //1 本地创建订单
+        FilmOrder order = new FilmOrder();
         Long id = student.getId();
         String orderCode = getOrderCode(id);
+        order.setOutTradeNo(orderCode);
+        order.setOpenid(student.getOpenid());
+        dictDataService.selectDictLabel("goods_type",filmOrderCreateDTO.getGoodsType());
+        order.setGoodsType(filmOrderCreateDTO.getGoodsType());
+        order.setGoodsPictureUrl(filmOrderCreateDTO.getGoodsPictureUrl());
+        FilmOrderJsonData filmOrderJsonData = new FilmOrderJsonData();
+        filmOrderCreateDTO.setThirdOrderId(orderCode);
+        filmOrderJsonData.setFilmOrderCreateDTO(filmOrderCreateDTO);
         //通过影院api 获取单票价格
-        Integer price = getPrice(filmOrderCreateDTO.getCinemaId(),filmOrderCreateDTO.getShowId());
+        Integer price = getPrice(filmOrderCreateDTO.getCinemaId(),filmOrderCreateDTO.getShowId(),filmOrderJsonData);
         int number = filmOrderCreateDTO.getSeat().split(",").length;
+        order.setOrderDataJson(JSONObject.toJSONString(filmOrderJsonData));
+        filmOrderService.save(order);
+
 
+
+        // 2 调用微信接口生成预订单
         ObjectNode rootNode = objectMapper.createObjectNode();
         rootNode.put("mchid",wxpayConfig.getMerchantId())
                 .put("appid", appid)
-                .put("description", "电影票")
+                .put("description", filmOrderCreateDTO.getGoodsType())
                 .put("notify_url", notifyUrl)
                 .put("out_trade_no", orderCode);
         rootNode.putObject("amount")
@@ -152,19 +164,8 @@ public class FilmController extends BaseController {
             throw new CustomException(JSONObject.parseObject(bodyAsString).get("message").toString());
         }
 
-        //本地创建订单
-        FilmOrder order = new FilmOrder();
-        order.setShowId(filmOrderCreateDTO.getShowId());
-        order.setOutTradeNo(orderCode);
-        order.setSeat(filmOrderCreateDTO.getSeat());
-        order.setAcceptChangeSeat(filmOrderCreateDTO.getAcceptChangeSeat());
-        order.setSeatId(filmOrderCreateDTO.getSeatId());
-        order.setSeatNo(filmOrderCreateDTO.getSeatNo());
-        order.setReservedPhone(filmOrderCreateDTO.getReservedPhone());
-        order.setOpenid(student.getOpenid());
-        filmOrderService.save(order);
-
 
+        //3 生成前端小程序调用调起微信支付所需参数
         String  packageStr = "prepay_id="+JSONObject.parseObject(bodyAsString).get("prepay_id");
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("package",packageStr);
@@ -195,7 +196,10 @@ public class FilmController extends BaseController {
 
     }
 
-    private Integer getPrice(String cinemaId, String showId) {
+
+
+    private Integer getPrice(String cinemaId, String showId, FilmOrderJsonData filmOrderJsonData) {
+
         FilmDTO filmDTO = new FilmDTO();
         filmDTO.setUrl("movieapi/movie-info/get-schedule-list");
         StringBuffer paramData =  new StringBuffer();
@@ -208,7 +212,9 @@ public class FilmController extends BaseController {
         JSONArray list = data.getJSONArray("list");
         List<CinemaData> cinemaData = list.toJavaList(CinemaData.class);
         List<CinemaData> listdata = cinemaData.stream().filter(a -> showId.equals(a.getShowId())).collect(Collectors.toList());
-        Integer netPrice = listdata.get(0).getNetPrice();
+        CinemaData realCinemaData = listdata.get(0);
+        filmOrderJsonData.setCinemaData(realCinemaData);
+        Integer netPrice = realCinemaData.getNetPrice();
         Double upDiscountRate = discountRule.getDouble("upDiscountRate");
         Double downDiscountRate = discountRule.getDouble("downDiscountRate");
         String film_discount = configService.selectConfigByKey("film_discount");
@@ -251,41 +257,47 @@ public class FilmController extends BaseController {
     /**
      * 获取电影订单详细信息
      */
-    @GetMapping(value = "/{id}")
+    @GetMapping(value = "/{outTradeNo}")
     @ApiOperation("获取电影订单详细信息")
     public Response<FilmOrder> getInfo(
-            @ApiParam(name = "id", value = "电影订单参数", required = true)
-            @PathVariable("id") Long id
+            @ApiParam(name = "outTradeNo", value = "电影订单参数", required = true)
+            @PathVariable("outTradeNo") String outTradeNo
     ){
-        return Response.success(filmOrderService.getById(id));
+        FilmOrder filmOrder = filmOrderService.getByOutTradeNo(outTradeNo);
+        if (!filmOrder.getOpenid().equals(SecurityUtils.getLoginUser().getStudent().getOpenid())){
+            throw new CustomException("该用户无访问此订单权限");
+        }
+        return Response.success();
     }
 
 
 
 
 
-    /**
-     * 微信支付查单接口
-     */
-    @GetMapping(value = "/wxorder/{outTradeNo}")
-    @ApiOperation("根据订单号查询订单状态")
-    public Response<String> getOrderInfo(
-            @ApiParam(name = "outTradeNo", value = "商户订单号", required = true)
-            @PathVariable("outTradeNo") String outTradeNo
-    ) throws IOException {
-        HttpGet get = new HttpGet("https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/"
-                +outTradeNo+"?mchid="+wxpayConfig.getMerchantId());
-        get.addHeader("Accept", "application/json");
-        HttpResponse response = httpClient.execute(get);
-        String bodyAsString = EntityUtils.toString(response.getEntity());
-        JSONObject jsonObject = JSONObject.parseObject(bodyAsString);
-        int statusCode = response.getStatusLine().getStatusCode();
-        if (statusCode == 200) {
-            return Response.success(jsonObject.getString("trade_state"));
-        } else {
-            throw new CustomException(EntityUtils.toString(response.getEntity()));
-        }
-    }
+
+
+//    /**
+//     * 微信支付查单接口
+//     */
+//    @GetMapping(value = "/wxorder/{outTradeNo}")
+//    @ApiOperation("根据订单号查询订单状态")
+//    public Response<String> getOrderInfo(
+//            @ApiParam(name = "outTradeNo", value = "商户订单号", required = true)
+//            @PathVariable("outTradeNo") String outTradeNo
+//    ) throws IOException {
+//        HttpGet get = new HttpGet("https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/"
+//                +outTradeNo+"?mchid="+wxpayConfig.getMerchantId());
+//        get.addHeader("Accept", "application/json");
+//        HttpResponse response = httpClient.execute(get);
+//        String bodyAsString = EntityUtils.toString(response.getEntity());
+//        JSONObject jsonObject = JSONObject.parseObject(bodyAsString);
+//        int statusCode = response.getStatusLine().getStatusCode();
+//        if (statusCode == 200) {
+//            return Response.success(jsonObject.getString("trade_state"));
+//        } else {
+//            throw new CustomException(EntityUtils.toString(response.getEntity()));
+//        }
+//    }
 
 
 

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

@@ -9,16 +9,20 @@ import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.AesUtil;
 import com.miaxis.feign.dto.FilmDTO;
 import com.miaxis.film.domain.FilmOrder;
+import com.miaxis.film.dto.FilmOrderCreateDTO;
+import com.miaxis.film.dto.FilmOrderJsonData;
 import com.miaxis.film.dto.FilmOrderNotifyDTO;
 import com.miaxis.film.dto.FilmWxpayDTO;
 import com.miaxis.film.service.IFilmOrderService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.joda.time.DateTime;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -76,26 +80,34 @@ public class NotifyController {
 
         return wxNotifyReturnDTO;
     }
-
     /**
      * 电影回调接口
      */
     @PostMapping(value = "/filmOrder")
     @ApiOperation("电影订单回调")
-    public FilmNotifyReturnDTO filmOrderNotify(FilmOrderNotifyDTO filmOrderNotifyDTO) {
+    public FilmNotifyReturnDTO filmOrderNotify(FilmOrderNotifyDTO filmOrderNotifyDTO ,String sign, String appKey) {
         FilmOrder filmOrder = filmOrderService.getByOutTradeNo(filmOrderNotifyDTO.getThirdOrderId());
        //todo 检查sign
-        filmOrder.setOrderState(filmOrderNotifyDTO.getEventName());
-        if (filmOrderNotifyDTO.getOrderPrice()!= null)
-        filmOrder.setOrderPrice(Integer.valueOf(filmOrderNotifyDTO.getOrderPrice()));
-        if (filmOrderNotifyDTO.getCloseCause()!= null)
-        filmOrder.setCloseCause(filmOrderNotifyDTO.getCloseCause());
-        if (filmOrderNotifyDTO.getRealSeat()!= null)
-        filmOrder.setRealSeat(filmOrderNotifyDTO.getRealSeat());
-        if (filmOrderNotifyDTO.getTicketCode()!= null)
-        filmOrder.setTicketCode(filmOrderNotifyDTO.getTicketCode());
-        if (filmOrderNotifyDTO.getTicketImage()!= null)
-        filmOrder.setTicketImage(filmOrderNotifyDTO.getTicketImage());
+        String orderDataJson = filmOrder.getOrderDataJson();
+        FilmOrderJsonData filmOrderJsonData = JSONObject.parseObject(orderDataJson, FilmOrderJsonData.class);
+        FilmOrderNotifyDTO dbFilmOrderNotifyDTO= filmOrderJsonData.getFilmOrderNotifyDTO();
+        if (dbFilmOrderNotifyDTO == null){
+            dbFilmOrderNotifyDTO = filmOrderNotifyDTO;
+        }else{
+            dbFilmOrderNotifyDTO.setEventName(filmOrderNotifyDTO.getEventName());
+            if (filmOrderNotifyDTO.getOrderPrice()!= null)
+                dbFilmOrderNotifyDTO.setOrderPrice(filmOrderNotifyDTO.getOrderPrice());
+            if (filmOrderNotifyDTO.getCloseCause()!= null)
+                dbFilmOrderNotifyDTO.setCloseCause(filmOrderNotifyDTO.getCloseCause());
+            if (filmOrderNotifyDTO.getRealSeat()!= null)
+                dbFilmOrderNotifyDTO.setRealSeat(filmOrderNotifyDTO.getRealSeat());
+            if (filmOrderNotifyDTO.getTicketCode()!= null)
+                dbFilmOrderNotifyDTO.setTicketCode(filmOrderNotifyDTO.getTicketCode());
+            if (filmOrderNotifyDTO.getTicketImage()!= null)
+                dbFilmOrderNotifyDTO.setTicketImage(filmOrderNotifyDTO.getTicketImage());
+        }
+        filmOrderJsonData.setFilmOrderNotifyDTO(dbFilmOrderNotifyDTO);
+        filmOrder.setOrderDataJson(JSONObject.toJSONString(filmOrderJsonData));
         filmOrderService.updateById(filmOrder);
 
 
@@ -114,16 +126,18 @@ public class NotifyController {
     @ApiOperation("电影订单下单测试")
     public Response<String> filmOrderNotifytest(String outTradeNo) throws GeneralSecurityException, IOException {
         String s = "";
-        FilmOrder filmOrder = filmOrderService.getByOutTradeNo(outTradeNo);
+        FilmOrder filmOrder1 = filmOrderService.getByOutTradeNo(outTradeNo);
         FilmDTO filmDTO = new FilmDTO();
         filmDTO.setUrl("api/order/create");
         StringBuffer paramData =  new StringBuffer();
+        FilmOrderJsonData filmOrderJsonData = JSONObject.parseObject(filmOrder1.getOrderDataJson(), FilmOrderJsonData.class);
+        FilmOrderCreateDTO filmOrder = filmOrderJsonData.getFilmOrderCreateDTO();
         paramData.append("showId="+filmOrder.getShowId()+"&");
         paramData.append("seat="+filmOrder.getSeat()+"&");
         if (filmOrder.getReservedPhone() != null){
             paramData.append("reservedPhone="+filmOrder.getReservedPhone()+"&");
         }
-        paramData.append("thirdOrderId="+filmOrder.getOutTradeNo()+"&");
+        paramData.append("thirdOrderId="+filmOrder.getThirdOrderId()+"&");
         paramData.append("notifyUrl="+notifyUrl+"&");
         if (filmOrder.getSeatId() != null){
             paramData.append("seatId="+filmOrder.getSeatId()+"&");
@@ -166,20 +180,22 @@ public class NotifyController {
             filmOrder.setDeviceId(sceneInfo.getString("device_id"));
         }
         //如果订单还未下过电影票订单，则异步调用电影下单api
-        String orderState = filmOrder.getOrderState();
-        if (orderState == null){
+        String  orderDataJson= filmOrder.getOrderDataJson();
+        FilmOrderJsonData filmOrderJsonData = JSONObject.parseObject(orderDataJson, FilmOrderJsonData.class);
+        if (filmOrderJsonData != null && filmOrderJsonData.getFilmOrderNotifyDTO() == null){
             threadPoolTaskExecutor.execute(new Runnable() {
                 @Override
                 public void run() {
                     FilmDTO filmDTO = new FilmDTO();
                     filmDTO.setUrl("api/order/create");
                     StringBuffer paramData =  new StringBuffer();
+                    FilmOrderCreateDTO filmOrder = filmOrderJsonData.getFilmOrderCreateDTO();
                     paramData.append("showId="+filmOrder.getShowId()+"&");
                     paramData.append("seat="+filmOrder.getSeat()+"&");
                     if (filmOrder.getReservedPhone() != null){
                         paramData.append("reservedPhone="+filmOrder.getReservedPhone()+"&");
                     }
-                    paramData.append("thirdOrderId="+filmOrder.getOutTradeNo()+"&");
+                    paramData.append("thirdOrderId="+filmOrder.getThirdOrderId()+"&");
                     paramData.append("notifyUrl="+notifyUrl+"&");
                     if (filmOrder.getSeatId() != null){
                         paramData.append("seatId="+filmOrder.getSeatId()+"&");

zzjs-framework/src/main/java/com/miaxis/framework/web/exception/GlobalExceptionHandler.java

@@ -107,7 +107,7 @@ public class GlobalExceptionHandler
     public Response handleException(Exception e)
     {
         log.error(e.getMessage(), e);
-        return Response.error().setMsg(toString());
+        return Response.error().setMsg(e.getMessage());
     }
 //    /**
 //     * 演示模式异常

zzjs-service/src/main/java/com/miaxis/film/domain/FilmOrder.java

@@ -47,14 +47,14 @@ public class FilmOrder extends BaseBusinessEntity{
     private String tradeType;
 
     /** 交易状态，枚举值：
-SUCCESS：支付成功
-REFUND：转入退款
-NOTPAY：未支付
-CLOSED：已关闭
-REVOKED：已撤销（付款码支付）
-USERPAYING：用户支付中（付款码支付）
-PAYERROR：支付失败(其他原因，如银行返回失败)
-ACCEPT：已接收，等待扣款 */
+        SUCCESS：支付成功
+        REFUND：转入退款
+        NOTPAY：未支付
+        CLOSED：已关闭
+        REVOKED：已撤销（付款码支付）
+        USERPAYING：用户支付中（付款码支付）
+        PAYERROR：支付失败(其他原因，如银行返回失败)
+        ACCEPT：已接收，等待扣款 */
     @TableField("trade_state")
     @ApiModelProperty(value = "交易状态，枚举值： SUCCESS：支付成功 REFUND：转入退款 NOTPAY：" +
             "未支付 CLOSED：已关闭 REVOKED：已撤销（付款码支付） " +
@@ -92,10 +92,16 @@ ACCEPT：已接收，等待扣款 */
     private String openid;
 
     /** 商品名称 */
-    @Excel(name = "商品名称")
-    @TableField("goods_name")
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
+    @Excel(name = "商品类型")
+    @TableField("goods_type")
+    @ApiModelProperty(value = "商品类型，具体查看字典定义.")
+    private String goodsType;
+
+    /** 商品名称 */
+    @Excel(name = "商品图片地址")
+    @TableField("goods_picture_url")
+    @ApiModelProperty(value = "商品图片地址")
+    private String goodsPictureUrl;
 
     /** 订单总金额，单位为分。 */
     @Excel(name = "订单总金额，单位为分。")
@@ -127,82 +133,14 @@ ACCEPT：已接收，等待扣款 */
     @ApiModelProperty(value = "商户端设备号")
     private String deviceId;
 
+
     /** 商户端设备号 */
-    @Excel(name = "排期的showId,由影院接口得来")
-    @TableField("show_id")
-    @ApiModelProperty(value = "排期的showId,由影院接口得来")
-    private String showId;
-
-    /** 用户所选的座位，例：1排1座,1排2座 以英文的逗号 “ , “隔开。 如果座位是情侣座，请传入 ： 1排1座(情侣座),1排2座(情侣座) */
-    @Excel(name = "用户所选的座位，例：1排1座,1排2座 以英文的逗号 “ , “隔开。 如果座位是情侣座，请传入 ： 1排1座(情侣座),1排2座(情侣座)")
-    @TableField("seat")
-    @ApiModelProperty(value = "用户所选的座位，例：1排1座,1排2座 以英文的逗号 “ , “隔开。 如果座位是情侣座，请传入 ： 1排1座(情侣座),1排2座(情侣座)")
-    private String seat;
-
-    /** 预留的手机号 */
-    @Excel(name = "预留的手机号")
-    @TableField("reserved_phone")
-    @ApiModelProperty(value = "预留的手机号")
-    private String reservedPhone;
-
-    /** 是否允许调座，1-允许，0-不允许 */
-    @Excel(name = "是否允许调座，1-允许，0-不允许")
-    @TableField("accept_change_seat")
-    @ApiModelProperty(value = "是否允许调座，1-允许，0-不允许")
-    private Integer acceptChangeSeat;
-
-    /** 座位接口的seatId字段， 如果有多个，则以竖线分割 */
-    @Excel(name = "座位接口的seatId字段， 如果有多个，则以竖线分割")
-    @TableField("seat_id")
-    @ApiModelProperty(value = "座位接口的seatId字段， 如果有多个，则以竖线分割")
-    private String seatId;
-
-    /** 座位接口的seatNo字段，如果有多个，则以竖线分割 */
-    @Excel(name = "座位接口的seatNo字段，如果有多个，则以竖线分割")
-    @TableField("seat_no")
-    @ApiModelProperty(value = "座位接口的seatNo字段，如果有多个，则以竖线分割")
-    private String seatNo;
-
-    /** 订单状态，枚举值:
-ORDER_CLOSE  关闭
-ORDER_FINISH  订单正常处理完毕
-WAIT_TICKET 订单竞价结束，正在等待出票
-TICKET_SUCCESS 订单出票成功
-TICKET_SYNC 取票码出现意外情况，需要修改时 */
-    @TableField("order_state")
-    @ApiModelProperty(value = "订单状态，枚举值: ORDER_CLOSE  关闭 ORDER_FINISH  订单正常处理完毕" +
-            " WAIT_TICKET 订单竞价结束，正在等待出票 TICKET_SUCCESS 订单出票成功 TICKET_SYNC 取票码出现意外情况，需要修改时")
-    private String orderState;
-
-    /** api下单成本价 */
-    @Excel(name = "api下单成本价")
-    @TableField("order_price")
-    @ApiModelProperty(value = "api下单成本价")
-    private Integer orderPrice;
-
-    /** 订单关闭原因 */
-    @Excel(name = "订单关闭原因")
-    @TableField("close_cause")
-    @ApiModelProperty(value = "订单关闭原因")
-    private String closeCause;
-
-    /** 实际出票位置 */
-    @Excel(name = "实际出票位置")
-    @TableField("real_seat")
-    @ApiModelProperty(value = "实际出票位置")
-    private String realSeat;
-
-    /** 取票字符串 */
-    @Excel(name = "取票字符串")
-    @TableField("ticket_code")
-    @ApiModelProperty(value = "取票字符串")
-    private String ticketCode;
-
-    /** 取票码原始截图 */
-    @Excel(name = "取票码原始截图")
-    @TableField("ticket_image")
-    @ApiModelProperty(value = "取票码原始截图")
-    private String ticketImage;
+    @Excel(name = "订单数据详情")
+    @TableField("order_data_json")
+    @ApiModelProperty(value = "订单数据详情")
+    private String orderDataJson;
+
+
 
 
 }

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

@@ -3,8 +3,24 @@ package com.miaxis.film.dto;
 
 import lombok.Data;
 
+
+/**
+ * 排期数据
+ */
 @Data
 public class CinemaData {
     Integer netPrice;
+    String planType;
+    String showTime;
+    String language;
+    Integer duration;
     String showId;
+    String stopSellTime;
+    Integer cinemaId;
+    Integer filmId;
+    String scheduleArea;
+    String filmName;
+    String hallName;
+    String showVersionType;
+
 }

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

@@ -15,12 +15,22 @@ public class FilmOrderCreateDTO {
     @ApiModelProperty(value = "排期的showId,由影院接口得来")
     private String showId;
 
+    /** 商品名称 */
+    @ApiModelProperty(value = "商品类型")
+    private String goodsType;
+
+    /** 商品名称 */
+    @ApiModelProperty(value = "商品图片地址")
+    private String goodsPictureUrl;
+
     @ApiModelProperty(value = "影院id")
     private String cinemaId;
 
     @ApiModelProperty(value = "用户所选的座位，例：1排1座,1排2座 以英文的逗号 “ , “隔开。 如果座位是情侣座，请传入 ： 1排1座(情侣座),1排2座(情侣座)")
     private String seat;
 
+    @ApiModelProperty(value = "商家订单id")
+    private String thirdOrderId;
 
     @ApiModelProperty(value = "预留的手机号")
     private String reservedPhone;

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

@@ -0,0 +1,28 @@
+package com.miaxis.film.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 微信支付回调 dto
+ */
+@Data
+public class FilmOrderJsonData {
+    private static final long serialVersionUID = 1L;
+
+    //下单字段
+    private  FilmOrderCreateDTO filmOrderCreateDTO;
+    //电影排场信息
+    private CinemaData cinemaData;
+    //电影订单回调信息
+    private FilmOrderNotifyDTO filmOrderNotifyDTO ;
+
+
+
+
+
+
+
+
+
+}

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

@@ -10,11 +10,7 @@ import lombok.Data;
 public class FilmOrderNotifyDTO {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "签名，接入方需校验签名是否有效。签名规则与下单相同。")
-    private String sign;
 
-    @ApiModelProperty(value = "接入方key （推广位）")
-    private String appKey;
 
     @ApiModelProperty(value = "时间戳")
     private String time;

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

@@ -1,53 +0,0 @@
-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;
-
-
-
-
-
-
-}