取消券码核销逻辑修改

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

@@ -405,13 +405,6 @@ 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;
@@ -577,10 +570,23 @@ public class OrderServiceImpl implements Orderservice {
         message.setPlatformMchId(newMessage.getPlatformMchId());
         message.setTerminalId(newMessage.getAppId());
         message.setRuleId(newMessage.getRuleId());
-        return orderAdapterService.paySuccessCallback(message);
+        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();
     }
 
-    private BaseResponse verificationCoupon(String transId){
+    private String verificationCoupon(String transId){
         String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(transId));
         if (StringUtils.isNotBlank(orderId)) {
             log.info("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(),transId, orderId);
@@ -588,7 +594,7 @@ public class OrderServiceImpl implements Orderservice {
         }
         QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(transId);
         if (queryOrderByIdResponseDto.getData() == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, queryOrderByIdResponseDto.getErrcode())) {
-            return ResponseUtil.error(String.valueOf(queryOrderByIdResponseDto.getErrcode()), queryOrderByIdResponseDto.getErrmsg());
+            return refundFaileMessage("order query fail" + queryOrderByIdResponseDto);
         }
         OrderBean orderBean = new OrderBean();
         if (1 == queryOrderByIdResponseDto.getData().size()) {
@@ -600,7 +606,8 @@ public class OrderServiceImpl implements Orderservice {
             }
         }
         //核销券
-        return couponActivityService.verificationCoupon(orderBean,CouponReqType.WRITEOFF);
+        BaseResponse baseResponse = couponActivityService.verificationCoupon(orderBean,CouponReqType.WRITEOFF);
+        return "核销券码返回结果" + baseResponse.getCode() + "," + baseResponse.getMessage();
     }
 
     @Override