Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa

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

@@ -120,10 +120,7 @@ public class CocoOrderRelationServiceImpl implements OrderRelationService {
 
         if(null != masterProducts && !masterProducts.isEmpty()){
             masterProducts.forEach(product -> {
-                Integer giftQty = product.getQty();
-                if(giftQty == 0){
-                    return;
-                }
+                Integer giftQty = giftMap.get(product.getCid()) == null ? 0 : giftMap.get(product.getCid());
                 product.setQty(product.getQty() + giftQty);
             });
         }