Merge branch 'feature/1.9.37-核销券码逻辑修改' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

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

@@ -203,19 +203,19 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())){
                 return orderAdapter.sendPaySuccessNoticeMessage();
             }
-            /**
+            /*
              * 围餐处理
              */
             if ("meals".equals(orderBean.getSource())) {
                 return orderCommonService.paySuccessCallback(message, confirmOrderDto, orderBeans);
             }
-            /**
+            /*
              * 微商城处理
              */
             if(OrderSourceType.SAASMALL.getCode().equals(orderBean.getSource())) {
                 return mallOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
             }
-            /**
+            /*
              * app订单处理
              */
             if(OrderSourceType.APP.getCode().equals(orderBean.getSource())) {
@@ -229,7 +229,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             if(mcCafePartnerId.equals(orderBean.getOid())) {
                 return mcCafeOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
             }
-            /**
+            /*
              * 默认点餐处理
              */
             return orderService.paySuccessCallback(message, confirmOrderDto, orderBeans);

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

@@ -402,6 +402,13 @@ public class OrderServiceImpl implements Orderservice {
         }
         //若该订单使用了优惠券，则移除卡包,移除失败也不退款，现在支付成功个调用核销，无需调用此功能
 //        couponActivityService.callbackNotify(orderBean);
+        // 核销券码成功才能支付成功
+        BaseResponse baseResponse = verificationCoupon(message.getTrans_id());
+        if (!Objects.equals(ResponseResult.SUCCESS.getCode(), baseResponse.getCode())) {
+            // 核销失败
+            log.error("核销券码失败transId:{},message:{}", message.getTrans_id(), baseResponse.getMessage());
+            return newSendPayFaileMessage();
+        }
         // 订单失败后 发消息重试 待实现
         String takeCode;
         String daySeq;
@@ -567,26 +574,18 @@ public class OrderServiceImpl implements Orderservice {
         message.setPlatformMchId(newMessage.getPlatformMchId());
         message.setTerminalId(newMessage.getAppId());
         message.setRuleId(newMessage.getRuleId());
-        String res = orderAdapterService.paySuccessCallback(message);
-        JSONObject jsonObject = JSONObject.parseObject(res);
-        if (jsonObject.containsKey("code")) {
-            Integer code = (Integer) jsonObject.get("code");
-            if (Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_0, code) || Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, code)) {
-                log.info("调用券码核销=="+newMessage.getTransId());
-                verificationCoupon(newMessage.getTransId());
-                log.info("调用券码结束=="+newMessage.getTransId());
-                return newSendPaySuccessNoticeMessage();
-            } else {
-                return newSendPayFaileMessage();
-            }
-        }
-        return newSendPayFaileMessage();
+        return orderAdapterService.paySuccessCallback(message);
     }
 
-    private String verificationCoupon(String transId){
+    private BaseResponse verificationCoupon(String transId){
+        String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(transId));
+        if (StringUtils.isNotBlank(orderId)) {
+            log.info("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(),transId, orderId);
+            transId=orderId;
+        }
         QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(transId);
         if (queryOrderByIdResponseDto.getData() == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, queryOrderByIdResponseDto.getErrcode())) {
-            return refundFaileMessage("order query fail" + queryOrderByIdResponseDto);
+            return ResponseUtil.error(String.valueOf(queryOrderByIdResponseDto.getErrcode()), queryOrderByIdResponseDto.getErrmsg());
         }
         OrderBean orderBean = new OrderBean();
         if (1 == queryOrderByIdResponseDto.getData().size()) {
@@ -598,8 +597,7 @@ public class OrderServiceImpl implements Orderservice {
             }
         }
         //核销券
-        BaseResponse baseResponse = couponActivityService.verificationCoupon(orderBean,CouponReqType.WRITEOFF);
-        return "核销券码返回结果" + baseResponse.getCode() + "," + baseResponse.getMessage();
+        return couponActivityService.verificationCoupon(orderBean,CouponReqType.WRITEOFF);
     }
 
     @Override