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,11 +260,15 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
         couponCodeVerificationDto.setTransactions(transactions);
 
         try {
+            for(CouponCodeVerificationTransDto  transaction : transactions){
+                List<CouponCodeVerificationTransDto> transactionsNew = new ArrayList<>();
+                transactionsNew.add(transaction);
+                couponCodeVerificationDto.setTransactions(transactionsNew);
                 //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));
@@ -276,6 +280,7 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
                         return ResponseUtil.error(ResponseResult.COUPON_VERIFICATION_FAIL);
                     }
                 }
+            }
 
         } catch (Exception ex) {
             emailAlertService.sendEmailAlert("coco核销券码异常", String.format("request:%s \r\nexception:%s", JSONObject.toJSONString(couponCodeVerificationDto), Throwables.getStackTraceAsString(ex)));
@@ -283,7 +288,6 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
             return ResponseUtil.error(ResponseResult.COUPON_VERIFICATION_FAIL);
         }
 
-
         return ResponseUtil.success();
     }