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

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

@@ -265,9 +265,9 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
         try {
             //71.券核销
             for (int i = 2; i >= 0; i--) {
-                log.info("coco核销券码开始==", JSON.toJSONString(couponCodeVerificationDto), null);
+                log.info("coco核销券码开始,orderCode:{}", orderBean.getOid());
                 CouponCodeResponseDto couponCodeResponseDto = couponOfflineClient.verification(couponCodeVerificationDto);
-                log.info("coco核销券码返回==", JSON.toJSONString(couponCodeResponseDto), null);
+                log.info("coco核销券码返回,orderCode:{}", orderBean.getOid());
                 ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(), "/api", couponCodeVerificationDto, couponCodeResponseDto);
                 if (Objects.equals(couponCodeResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())) {
                     LogUtil.info("coco 核销券码返回成功，couponCodeVerificationDto：{},couponCodeResponseDto，", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));
@@ -304,7 +304,7 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
                                         QueryOrdersResponseDto.DataBean.OrderBean.ProductBean pb,
                                         List<CouponCodeVerificationProductDto> productsFull,
                                         Integer totalAmountOriFull){
-        Long alreadyNum = collect.get(pb.getProductId()) == null ? 0L : collect.get(pb.getProductId()).getSum();
+        Long alreadyNum = collect.get(pb.getSpecification()) == null ? 0L : collect.get(pb.getSpecification()).getSum();
         Integer num = pb.getNumber();
         Integer remainNum = num - alreadyNum.intValue();
         if(Objects.equals(remainNum,0)){