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

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

@@ -141,7 +141,7 @@ public class CocoOrderRelationServiceImpl implements OrderRelationService {
                 boolean halfFlag = false;
                 List<QueryOrdersResponse.DataBean.OrderBean.ProductBean.ProductDiscount> discountList = productBean.getDiscountList();
                 for(QueryOrdersResponse.DataBean.OrderBean.ProductBean.ProductDiscount productDiscount : discountList){
-                    if(ObjectUtils.equals(productDiscount.getDiscountType(), OldOrderAccountType.SECOND_DISCOUNT.getCode())){
+                    if(ObjectUtils.equals(productDiscount.getDiscountType(), 20)){
                         halfFlag = true;
                         break;
                     }
@@ -161,5 +161,4 @@ public class CocoOrderRelationServiceImpl implements OrderRelationService {
 
         queryOrderResponseVo.setProducts(masterProducts);
     }
-
 }