'1'

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

@@ -86,10 +86,15 @@ public class NotifyController {
         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());
         filmOrderService.updateById(filmOrder);
 

zzjs-admin/src/main/resources/application-dev.yml

@@ -75,3 +75,44 @@ spring:
                 max-active: 8
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
+
+# 短信验证
+sms_user_name: "jsjp"
+sms_password: "t7nwh7"
+
+
+
+# 调用外部接口
+feign:
+    jgpt_ipport: http://localhost:8080/
+    qgpt_ipport: http://114.55.58.112:8085/
+
+# 微信小程序
+app:
+    appid: wx8f43db501343feab
+    secret: 3509a81880669ffa6fa554b2aa050351
+
+# 腾讯cos
+cos:
+    secretId: AKIDwISNOFsJXYGjy89FJI9UnzuZFgTtRgFe
+    secretKey: IK5af8MJzPoKbdQxDCtKWR5T5PSEkyDB
+    bucket: ap-shanghai
+    bucketName: t1-1305573081
+    path: https://t1-1305573081.cos.ap-shanghai.myqcloud.com
+    preffix: t1
+
+
+# 微信支付
+wxpay:
+    v3url: https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi
+    merchantId: 1608699504
+    serialNumber: 487159E168001CDBA0EFE2C988249A84023AD6CC
+    v3key: qqwweerrttyyuuiioopp123456789000
+    notifyUrl: http://218.85.55.253:65535/zzjs-admin/open-api/film/notify/wxpay
+
+
+# 电影
+film:
+    appKey: 10000000000
+    appSecret: 25f9e794323b453885f5181f1b624d0b
+    notifyUrl: http://218.85.55.253:65535/zzjs-admin/open-api/film/notify/filmOrder

zzjs-admin/src/main/resources/application-prod.yml

@@ -75,3 +75,44 @@ spring:
                 max-active: 8
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
+
+# 短信验证
+sms_user_name: "jsjp"
+sms_password: "t7nwh7"
+
+
+
+# 调用外部接口
+feign:
+    jgpt_ipport: http://localhost:8080/
+    qgpt_ipport: http://114.55.58.112:8085/
+
+# 微信小程序
+app:
+    appid: wx8f43db501343feab
+    secret: 3509a81880669ffa6fa554b2aa050351
+
+# 腾讯cos
+cos:
+    secretId: AKIDwISNOFsJXYGjy89FJI9UnzuZFgTtRgFe
+    secretKey: IK5af8MJzPoKbdQxDCtKWR5T5PSEkyDB
+    bucket: ap-shanghai
+    bucketName: t1-1305573081
+    path: https://t1-1305573081.cos.ap-shanghai.myqcloud.com
+    preffix: t1
+
+
+# 微信支付
+wxpay:
+    v3url: https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi
+    merchantId: 1608699504
+    serialNumber: 487159E168001CDBA0EFE2C988249A84023AD6CC
+    v3key: qqwweerrttyyuuiioopp123456789000
+    notifyUrl: http://admin.zzxcx.net/prod-api/open-api/film/notify/wxpay
+
+
+# 电影
+film:
+    appKey: 10294472736
+    appSecret: n8qV2tsBKN6JQ4nMtycPa8e7
+    notifyUrl: http://admin.zzxcx.net/prod-api/open-api/film/notify/filmOrder

zzjs-admin/src/main/resources/application.yml

@@ -199,46 +199,7 @@ xss:
   urlPatterns: /system/*,/monitor/*,/tool/*
 
 
-# --------------------------------------------短信验证-------------------------------------
-sms_user_name: "jsjp"
-sms_password: "t7nwh7"
-
-
-
-# 调用外部接口
-feign:
-  jgpt_ipport: http://localhost:8080/
-  qgpt_ipport: http://114.55.58.112:8085/
-
-# 微信小程序
-app:
-  appid: wx8f43db501343feab
-  secret: 3509a81880669ffa6fa554b2aa050351
-
-# 腾讯cos
-cos:
-  secretId: AKIDwISNOFsJXYGjy89FJI9UnzuZFgTtRgFe
-  secretKey: IK5af8MJzPoKbdQxDCtKWR5T5PSEkyDB
-  bucket: ap-shanghai
-  bucketName: t1-1305573081
-  path: https://t1-1305573081.cos.ap-shanghai.myqcloud.com
-  preffix: t1
-
-
-# 微信支付
-wxpay:
-  v3url: https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi
-  merchantId: 1608699504
-  serialNumber: 487159E168001CDBA0EFE2C988249A84023AD6CC
-  v3key: qqwweerrttyyuuiioopp123456789000
-  notifyUrl: http://218.85.55.253:65535/zzjs-admin/open-api/film/notify/wxpay
-
-
-# 电影
-film:
-  appKey: 10000000000
-  appSecret: 25f9e794323b453885f5181f1b624d0b
-  notifyUrl: http://218.85.55.253:65535/zzjs-admin/open-api/film/notify/filmOrder
+