微信视频号订单上报判断修改

order-application-service/src/main/java/cn/freemud/handler/WeChatLiveMsgHandle.java

@@ -64,7 +64,7 @@ public class WeChatLiveMsgHandle {
      */
     public void reportOrderStatus(OrderBeanV1 orderBean, int flag) {
         if (Objects.nonNull(orderBean)
-                && Objects.equals(orderBean.getMarketingType(), MarketTypeEnum.WE_CHAT_LIVE_SELL.getIndex())) {
+                && Objects.equals(MarketTypeEnum.WE_CHAT_LIVE_SELL.getIndex().byteValue(),orderBean.getMarketingType())) {
             OrderSycnPayRequestVO request = new OrderSycnPayRequestVO();
             String orderId = orderBean.getOid();
 

order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

@@ -274,7 +274,7 @@ public class OrderAdapterServiceImpl {
         if (!LockUtils.lockAfter(redisCache.getRedisTemplate(), paySuccessKey)) {
             return orderAdapter.paySuccessLockedMessage();
         }
-        OrderBeanV1 orderBeanSass = null;
+        OrderBeanV1 orderBean = null;
         try {
             ConfirmOrderDto confirmOrderDto = orderAdapter.convent2ConfirmOrderDto(message);
             // 蜜雪+混合支付专用：通过交易号从缓存中拿订单号，如果有数据则实际订单号为其value值
@@ -286,7 +286,7 @@ public class OrderAdapterServiceImpl {
             if (MapUtils.isEmpty(orderBeans)) {
                 return gson.toJson(message);
             }
-            OrderBeanV1 orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
+            orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
             // 注意，支付状态判断优先级最高
             if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())) {
                 return orderAdapter.sendPaySuccessNoticeMessage();
@@ -298,10 +298,6 @@ public class OrderAdapterServiceImpl {
                 orderServiceImpl.timeOutRefund(orderBean);
                 return orderAdapter.sendPaySuccessNoticeMessage();
             }
-            //紧急开关时  判断订单bean是否存在
-            orderBeanSass = orderBean;
-
-            OrderClientType.SAAS.getIndex();
             // 支付成功处理
             String result = "";
             switch (client) {
@@ -309,42 +305,36 @@ public class OrderAdapterServiceImpl {
                     result = orderCommonService.paySuccessCallback(message, confirmOrderDto, orderBeans);
                     break;
                 case 27: //抖音卖券订单处理 OrderClientType.TIKTOKPAY.getIndex()
-                    if (orderBean.getBizType() == BizTypeEnum.SALE_COUPON.getBizType()) {
+                    if (Objects.equals(BizTypeEnum.SALE_COUPON.getBizType(),orderBean.getBizType())) {
                         result = sellCouponOrderService.paySuccessCallbackForTiktok(message, confirmOrderDto, orderBeans);
                         break;
                     }
                     break;
                     // bizType不等于4的，非积分商城订单，继续往下走
                 case 12: //app订单 OrderClientType.APP.getIndex()
-                    if (orderBean.getBizType() != 6) {
+                    if (!Objects.equals(BizTypeEnum.SALE_COUPON.getBizType(),orderBean.getBizType())) {
                         // bizType为卖券的订单，不走app订单逻辑
                         result = appOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
                         break;
                     }
-                    // 默认点餐处理
-                    if (orderBean.getBizType() == BizTypeEnum.ORDINARY.getBizType()) {
-                        result = orderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
-                        break;
-                    }
-                    break;
-                default:
+                default://微信，支付宝渠道
                     // 积分商城订单
-                    if (orderBean.getBizType() == BizTypeEnum.INTEGRAL_MALL.getBizType()) {
+                    if (Objects.equals(BizTypeEnum.INTEGRAL_MALL.getBizType(),orderBean.getBizType())) {
                         result = pointsMallOrderService.paySuccessCallback(message,orderBeans);
                         break;
                     }
                     // 买券虚拟订单
-                    if (orderBean.getBizType() == BizTypeEnum.SALE_COUPON.getBizType()) {
+                    if (Objects.equals(BizTypeEnum.SALE_COUPON.getBizType(),orderBean.getBizType())) {
                         result = sellCouponOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
                         break;
                     }
                     // 微商城订单处理
-                    if (orderBean.getBizType() == BizTypeEnum.MALL.getBizType()) {
+                    if (Objects.equals(BizTypeEnum.MALL.getBizType(),orderBean.getBizType())){
                         result = mallOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
                         break;
                     }
                     // 收银单处理
-                    if (orderBean.getMarketingType().intValue() == MarketTypeEnum.CASHIER.getIndex()) {
+                    if (Objects.equals(MarketTypeEnum.CASHIER.getIndex(),orderBean.getMarketingType().intValue())) {
                         result = cashierOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
                         break;
                     }
@@ -353,8 +343,9 @@ public class OrderAdapterServiceImpl {
                         result = mcCafeOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
                         break;
                     }
-                    // 默认点餐处理
-                    if (orderBean.getBizType() == BizTypeEnum.ORDINARY.getBizType() || orderBean.getBizType() == BizTypeEnum.ADVANCE_ORDER.getBizType() ) {
+                    // 默认点餐处理(点餐业务和预定业务)
+                    if (Objects.equals(BizTypeEnum.ORDINARY.getBizType(),orderBean.getBizType())
+                            || Objects.equals(BizTypeEnum.ADVANCE_ORDER.getBizType(),orderBean.getBizType())) {
                         result = orderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
                         break;
                     }
@@ -366,9 +357,9 @@ public class OrderAdapterServiceImpl {
             //删除分布式锁
             redisCache.delete("saas:lockAfter:" + paySuccessKey);
             // 增加全局开关，当紧急方案打开时进行直接处理callBack消息
-            if (orderBeanSass != null && orderCenterProperties.isUrgentCallbackOpen()) {
+            if (orderBean != null && orderCenterProperties.isUrgentCallbackOpen()) {
                 // 查询
-                OrderCallBackRequestVo requestVo = saasOrderHandle.convert2CallbackReq(orderBeanSass.getOid(),2,null,null);
+                OrderCallBackRequestVo requestVo = saasOrderHandle.convert2CallbackReq(orderBean.getOid(),2,null,null);
                 ApiLog.infoMessage("紧急方案 支付成功直接调用callback,orderCode:{},requestId:{}",requestVo.getOrderCode(),requestVo.getRequestId());
                 orderCallbackClient.callbackOrder(requestVo);
             }