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

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

@@ -313,13 +313,17 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
         }
 
         // 统计商品
+        Integer price = pb.getPrice() == null ? 0 : pb.getPrice().intValue();
+        if(price.intValue() == 0){
+            return totalAmountOriFull;
+        }
+
         CouponCodeVerificationProductDto couponCodeVerificationProductFull = new CouponCodeVerificationProductDto();
         couponCodeVerificationProductFull.setConsume_num(remainNum);
         couponCodeVerificationProductFull.setPID(pb.getProductId());
         couponCodeVerificationProductFull.setSeq(pb.getSequence());
         couponCodeVerificationProductFull.setProductName(pb.getProductName());
 
-        Integer price = pb.getPrice() == null ? 0 : pb.getPrice().intValue();
         couponCodeVerificationProductFull.setInitPrice(price);
         couponCodeVerificationProductFull.setNowPrice(price);
         couponCodeVerificationProductFull.setPayMoney(price);