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

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

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

@@ -1387,6 +1387,16 @@ public class OrderServiceImpl implements Orderservice {
             queryOrderResponseVo.setRedpacketsPicture(getRedpacketsPicture(activityId));
         }
 
+
+        // 支付有礼
+        // 目前只有coco在订单详情参加支付有礼，且不检查订单的状态
+        if(cocoPartnerId.contains(partnerId)){
+            joinPayGift(sessionId, queryOrderResponseVo);
+        }
+
+
+        buildQueryOrderResponseVo(queryOrderResponseVo,response);
+
         return ResponseUtil.success(queryOrderResponseVo);
     }