Merge branch 'gaohu_0727_GoblinMix' into pre

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

@@ -89,7 +89,7 @@ public class GoblinMixAppDetailsVo implements Serializable, Cloneable {
         this.setStoreName(storeName);
         this.setPrice(source.getPrice());
         this.setSellPrice(source.getSellPrice());
-        this.setShelvesTime(source.getShelvesTime());
+        this.setShelvesTime(source.getShelvesTime() != null && !"".equals(source.getShelvesTime()) ? source.getShelvesTime() : source.getTimeStart());
         this.setReserve(source.getReserve());
         this.setSysTime(DateUtil.getNowTime());
         return this;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinMixServiceImpl.java

@@ -9,14 +9,13 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.param.GoblinMixDetailsItemParam;
 import com.liquidnet.service.goblin.param.GoblinMixDetailsParam;
 import com.liquidnet.service.goblin.param.GoblinMixUpdateParam;
+import com.liquidnet.service.goblin.service.IGoblinGoodsAnticipateService;
 import com.liquidnet.service.goblin.service.manage.IGoblinMixService;
 import com.liquidnet.service.goblin.util.*;
-import io.github.classgraph.json.JSONUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -142,6 +141,10 @@ public class GoblinMixServiceImpl implements IGoblinMixService {
                 item.setSkuSurplusStock(redisUtils.getSkuStock(null, item.getSkuId()));
             }
         }
+        //旧数据支持
+        //上架时间
+        vo.setShelvesTime(vo.getShelvesTime() != null && !"".equals(vo.getShelvesTime()) ? vo.getShelvesTime() : vo.getTimeStart());
+
         return ResponseDto.success(vo);
     }