Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/coupon/impl/CocoCouponRelationServiceImpl.java

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

@@ -260,20 +260,25 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
         couponCodeVerificationDto.setTransactions(transactions);
 
         try {
-            //71.券核销
-            for (int i = 2; i >= 0; i--) {
-                log.info("coco核销券码开始,orderCode:{}，couponCodeVerificationDto：{}", orderBean.getOid(),JSON.toJSONString(couponCodeVerificationDto));
-                CouponCodeResponseDto couponCodeResponseDto = couponOfflineClient.verification(couponCodeVerificationDto);
-                log.info("coco核销券码返回结果,orderCode:{}，couponCodeVerificationDto：{}，couponCodeResponseDto:{}", orderBean.getOid(),JSON.toJSONString(couponCodeVerificationDto),JSON.toJSONString(couponCodeResponseDto));
-                ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(), "/api", couponCodeVerificationDto, couponCodeResponseDto);
-                if (Objects.equals(couponCodeResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())) {
-                    log.info("coco 核销券码返回成功，couponCodeVerificationDto：{},couponCodeResponseDto:{}，", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));
-                    break;
-                }
-                if (!Objects.equals(couponCodeResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())) {
-                    emailAlertService.sendEmailAlert("cooc核销券码失败", String.format("request:%s \r\nresponse:%s", JSONObject.toJSONString(couponCodeVerificationDto), JSONObject.toJSONString(couponCodeResponseDto)));
-                    log.info("coco 核销券码返回失败，couponCodeVerificationDto：{},couponCodeResponseDto:{}，", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));
-                    return ResponseUtil.error(ResponseResult.COUPON_VERIFICATION_FAIL);
+            for(CouponCodeVerificationTransDto  transaction : transactions){
+                List<CouponCodeVerificationTransDto> transactionsNew = new ArrayList<>();
+                transactionsNew.add(transaction);
+                couponCodeVerificationDto.setTransactions(transactionsNew);
+                //71.券核销
+                for (int i = 2; i >= 0; i--) {
+
+                    CouponCodeResponseDto couponCodeResponseDto = couponOfflineClient.verification(couponCodeVerificationDto);
+
+                    ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(), "/api", couponCodeVerificationDto, couponCodeResponseDto);
+                    if (Objects.equals(couponCodeResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())) {
+                        log.info("coco 核销券码返回成功，couponCodeVerificationDto：{},couponCodeResponseDto:{}，", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));
+                        break;
+                    }
+                    if (!Objects.equals(couponCodeResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())) {
+                        emailAlertService.sendEmailAlert("cooc核销券码失败", String.format("request:%s \r\nresponse:%s", JSONObject.toJSONString(couponCodeVerificationDto), JSONObject.toJSONString(couponCodeResponseDto)));
+                        log.info("coco 核销券码返回失败，couponCodeVerificationDto：{},couponCodeResponseDto:{}，", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));
+                        return ResponseUtil.error(ResponseResult.COUPON_VERIFICATION_FAIL);
+                    }
                 }
             }
 
@@ -283,7 +288,6 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
             return ResponseUtil.error(ResponseResult.COUPON_VERIFICATION_FAIL);
         }
 
-
         return ResponseUtil.success();
     }