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

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

@@ -170,9 +170,12 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
                     Integer num = osr.getNumber();
                     String productId = osr.getProductId();
                     QueryOrdersResponseDto.DataBean.OrderBean.ProductBean pb = productMap.get(productId);
-                    if(pb != null){
-                        oriAmount = oriAmount + (pb.getPrice() == null ? 0 : pb.getPrice().intValue()) * (num == null ? 0 : num);
+                    if(pb == null){
+                        continue;
                     }
+
+                    oriAmount = oriAmount + (pb.getPrice() == null ? 0 : pb.getPrice().intValue()) * (num == null ? 0 : num);
+
                     orderSettlementAlready.add(osr);
                     // 统计商品
                     CouponCodeVerificationProductDto couponCodeVerificationProductDto = new CouponCodeVerificationProductDto();