Merge remote-tracking branch 'origin/qa' into qa

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

@@ -229,13 +229,13 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
         if(!orderSettlementRemain.isEmpty()){
 
             Map<String, IntSummaryStatistics> collect = orderSettlementAlready.stream().collect(Collectors.groupingBy(OrderSettlementResp::getProductId, Collectors.summarizingInt(OrderSettlementResp::getNumber)));
-
+            log.info("coco订单核销优惠券,orderCode:{},collect:{}",orderBean.getOid(),JSONObject.toJSONString(collect));
             for(OrderSettlementResp osr: orderSettlementRemain){
                 CouponCodeVerificationTransDto couponCodeVerificationTransFull = new CouponCodeVerificationTransDto();
                 // 券号
                 couponCodeVerificationTransFull.setCode(osr.getExternalObjectId());
                 // 总优惠金额单位：分
-                couponCodeVerificationTransFull.setTotalAmount(osr.getSettlementAmount().intValue());
+                couponCodeVerificationTransFull.setTotalAmount(0 - osr.getSettlementAmount().intValue());
                 // 订单号
                 couponCodeVerificationTransFull.setOrderNumber(orderBean.getOid());
                 List<CouponCodeVerificationProductDto> productsFull = new ArrayList<>();
@@ -265,16 +265,17 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
         try {
             //71.券核销
             for (int i = 2; i >= 0; i--) {
-                LogUtil.info("coco核销券码开始==", JSON.toJSONString(couponCodeVerificationDto), null);
+                log.info("coco核销券码开始==", JSON.toJSONString(couponCodeVerificationDto), null);
                 CouponCodeResponseDto couponCodeResponseDto = couponOfflineClient.verification(couponCodeVerificationDto);
-                LogUtil.info("coco核销券码返回==", JSON.toJSONString(couponCodeVerificationDto), null);
+                log.info("coco核销券码返回==", JSON.toJSONString(couponCodeResponseDto), null);
                 ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(), "/api", couponCodeVerificationDto, couponCodeResponseDto);
                 if (Objects.equals(couponCodeResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())) {
-                    LogUtil.info("coco CocoCouponRelationServiceImpl", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));
+                    LogUtil.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)));
+                    LogUtil.info("coco 核销券码返回失败，couponCodeVerificationDto：{},couponCodeResponseDto，", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));
                     return ResponseUtil.error(ResponseResult.COUPON_VERIFICATION_FAIL);
                 }
             }