修改组合购bug

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/GoblinMixAppDetailsVo.java

@@ -48,6 +48,8 @@ public class GoblinMixAppDetailsVo implements Serializable, Cloneable {
     private BigDecimal sellPrice;
     @ApiModelProperty(position = 23, value = "原价")
     private BigDecimal price;
+    @ApiModelProperty(position = 22, value = "上架时间")
+    private String shelvesTime;
 
     private static final GoblinMixAppDetailsVo obj = new GoblinMixAppDetailsVo();
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinRecommendActiveServiceImpl.java

@@ -103,7 +103,7 @@ public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveSer
                         if (null != goblinMixAppDetailsVo) {
                             com.liquidnet.service.kylin.dto.vo.GoblinMixAppDetailsVo aNew = com.liquidnet.service.kylin.dto.vo.GoblinMixAppDetailsVo.getNew();
                             BeanUtils.copyProperties(goblinMixAppDetailsVo, aNew);
-                            if(goblinMixAppDetailsVo.getStatus()!=7&&comparTime(aNew.getTimeStart(),aNew.getTimeEnd())){
+                            if(goblinMixAppDetailsVo.getStatus()!=7&&comparTime(aNew.getShelvesTime(),aNew.getTimeEnd())){
                                 kylinRecommendActiveRelationVo.setGoblinMixAppDetailsVo(aNew);
                                 kylinRecommendActiveRelationVo.setCount(true);
                             }else{