Althars123 4 жил өмнө
parent
commit
74f7df666f

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

@@ -91,9 +91,7 @@ public class FilmController extends BaseController {
 
 
 
-    /**
-     * 查询题库列表
-     */
+
 
     @GetMapping("/order/list")
     @ApiOperation("查询订单列表")
@@ -140,6 +138,7 @@ public class FilmController extends BaseController {
         Integer price = getPrice(filmOrderCreateDTO.getCinemaId(),filmOrderCreateDTO.getShowId(),filmOrderJsonData);
         int number = filmOrderCreateDTO.getSeat().split(",").length;
         order.setOrderDataJson(JSONObject.toJSONString(filmOrderJsonData));
+        order.setTotal(price*number);
         filmOrderService.save(order);
 
 

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

@@ -168,7 +168,7 @@ public class NotifyController {
         filmOrder.setTotal(amount.getInteger("total"));
         filmOrder.setCurrency(amount.getString("currency"));
         filmOrder.setPayerCurrency(amount.getString("payer_currency"));
-        filmOrder.setTradeState(jsonObject.getString("SUCCESS"));
+        filmOrder.setTradeState(jsonObject.getString("trade_state"));
         filmOrder.setBankType(jsonObject.getString("bank_type"));
         DateTime dateTime  = new DateTime(jsonObject.getString("success_time"));
         filmOrder.setSuccessTime(dateTime.toDate());

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

@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOrderList" resultType="com.miaxis.film.domain.FilmOrder">
         select * from film_order
-         where openid=#{openid}
+         where openid=#{openid} and trade_state ='SUCCESS'
         <if test="days != null  and days != ''">
             and  DATE_SUB(CURDATE(), INTERVAL #{days} DAY) &lt;= date(create_time)
         </if>