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

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

@@ -165,7 +165,7 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
                 }
 
                 // 商品code不为0,此时取得是具体的商品
-                if(!Objects.equals(osr.getProductId(),0)){
+                if(!"0".equals(osr.getProductId())){
                     // 计算商品原价
                     Integer num = osr.getNumber();
                     String productId = osr.getProductId();