提交代码

hai-cweb/src/main/java/com/cweb/controller/QzOrderController.java

@@ -3,6 +3,7 @@ package com.cweb.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.hai.common.security.AESEncodeUtil;
 import com.hai.config.CommonSysConst;
+import com.hai.config.QianZhuConfig;
 import com.hai.config.WxOrderConfig;
 import com.hai.dao.HighGasOrderRefundMapper;
 import com.hai.entity.HighChildOrder;
@@ -92,6 +93,13 @@ public class QzOrderController {
                             childOrder.setChildOrderStatus(OrderChildStatus.STATUS3.getNumber());
                             order.setOrderStatus(OrderStatus.STATUS3.getNumber());
                             order.setFinishTime(new Date());
+
+                            // 订单详情
+                            JSONObject cinemaOrderDetail = QianZhuConfig.getCinemaOrderByOrderNo(order.getOrderNo());
+                            if (cinemaOrderDetail != null) {
+                                JSONObject cinemaOrderData = cinemaOrderDetail.getJSONObject("data");
+                                childOrder.setExt4(cinemaOrderData.getJSONArray("coupons").toJSONString());
+                            }
                         }
 
                         // 交易成功：开场后两小时，订单状态从已出票自动变成交易成功

hai-service/src/main/java/com/hai/order/service/impl/OrderPayBeforeServiceImpl.java

@@ -16,6 +16,7 @@ import com.hai.order.type.OrderProductType;
 import com.hai.service.HighGasChannelConfigService;
 import com.hai.service.HighGasService;
 import com.hai.service.HighMerchantStoreService;
+import com.hai.service.SecConfigService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -34,6 +35,8 @@ public class OrderPayBeforeServiceImpl implements OrderPayBeforeService {
     private HighGasService gasService;
     @Resource
     private HighGasChannelConfigService gasChannelConfigService;
+    @Resource
+    private SecConfigService secConfigService;
 
     @Override
     public void payOrderCheck(HighOrder order) {
@@ -93,6 +96,11 @@ public class OrderPayBeforeServiceImpl implements OrderPayBeforeService {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！");
             }
 
+        } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE16.getNumber())) {
+            SecConfig type = secConfigService.findByCodeType("OIL_CARD_RECHARGE");
+            if (type != null && type.getCodeValue().equals("false")) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时进行无法充值！");
+            }
         }
     }
 }

hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java

@@ -626,7 +626,7 @@ public class OrderServiceImpl implements OrderService {
         if (orderData.getOrderStatus().equals(OrderStatus.STATUS1.getNumber())) {
             // 10分钟内未支付，自动取消订单
             Message<HighOrder> rocketMsg = MessageBuilder.withPayload(order).build();
-            // rocketMQTemplate.syncSend(OrderTopic.ORDER_TOPIC_CANCEL.getTopic(), rocketMsg,1000,14);
+            rocketMQTemplate.syncSend(OrderTopic.ORDER_TOPIC_CANCEL.getTopic(), rocketMsg,1000,14);
 
         } else if (orderData.getOrderStatus().equals(OrderStatus.STATUS2.getNumber())) {
             // 支付校验

hai-service/src/main/java/com/hai/service/pay/impl/CinemaOrderService.java

@@ -62,6 +62,14 @@ public class CinemaOrderService implements PayService {
                 highGasOrderPush.setRequestContent(order.getOrderNo());
                 highGasOrderPush.setReturnContent(object.toJSONString());
                 highGasOrderPushMapper.insert(highGasOrderPush);
+
+                // 电影票订单详情
+                JSONObject cinemaOrderDetail = QianZhuConfig.getCinemaOrderByOrderNo(order.getOrderNo());
+                if (cinemaOrderDetail != null) {
+                    JSONObject cinemaOrderData = cinemaOrderDetail.getJSONObject("data");
+                    order.getHighChildOrderList().get(0).setExt4(cinemaOrderData.getJSONArray("coupons").toJSONString());
+                    highOrderService.updateOrder(order);
+                }
             }
 
         }

hai-service/src/main/resources/dev/commonConfig.properties

@@ -36,13 +36,13 @@ jzPrivateKeyUrl=/home/project/hsg/fileKey/JzPrivateKey.key
 jzPublicKeyUrl=/home/project/hsg/fileKey/JzPublicKey.key
 
 # ????
-qinzhuUrl=https://live.qianzhu8.com
+qinzhuUrl=https://live-test.qianzhu8.com
-qinzhuUrlToken=https://live.qianzhu8.com/gateway
+qinzhuUrlToken=https://live-test.qianzhu8.com/gateway
-qinzhuHtmlUrl=https://qz.dctpay.com
+qinzhuHtmlUrl=https://m-test.qianzhu8.com
-qianzhuH5url=https://nf.qianzhu8.com/gateway
+qianzhuH5url=https://nf-test.qianzhu8.com/gateway
-qinzhuPlatformId=10458
+qinzhuPlatformId=10376
-qinzhuSecret=nnl3gg4ss0pka11t
+qinzhuSecret=ktxb49sh2jfhgn8g
-qianzhuOrderNotify=https://hsg.dctpay.com/crest/qianzhu/orderNotify
+qianzhuOrderNotify=https://hsgcs.dctpay.com/crest/qianzhu/orderNotify
 
 thirdAppKey=211394653
 thirdAppSecret=cyQpQKMaGUG186iEZRt1uQ==