记得上下班打卡 | git大法好,push需谨慎

Commit 33fe4a5a authored by 胡佳晨's avatar 胡佳晨

修改 pos banner

parent 90ca54a5
...@@ -6,6 +6,7 @@ import com.liquidnet.commons.lang.util.DateUtil; ...@@ -6,6 +6,7 @@ import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst; import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.goblin.constant.GoblinRedisConst;
import com.liquidnet.service.goblin.constant.GoblinStatusConst; import com.liquidnet.service.goblin.constant.GoblinStatusConst;
import com.liquidnet.service.goblin.dto.vo.*; import com.liquidnet.service.goblin.dto.vo.*;
import com.liquidnet.service.goblin.param.GoblinNowOrderListParam; import com.liquidnet.service.goblin.param.GoblinNowOrderListParam;
...@@ -103,6 +104,7 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi ...@@ -103,6 +104,7 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
GoblinGoodsInfoVo vo = !toSearchFlg || hitSpuIdList.contains(spuId) ? redisUtils.getGoodsInfoVo(spuId) : null; GoblinGoodsInfoVo vo = !toSearchFlg || hitSpuIdList.contains(spuId) ? redisUtils.getGoodsInfoVo(spuId) : null;
if (null != vo && vo.getShelvesStatus().equals("3") && vo.getStoreId().equals(storeId)) { if (null != vo && vo.getShelvesStatus().equals("3") && vo.getStoreId().equals(storeId)) {
GoblinZhengzaiGoodVo returnVo = GoblinZhengzaiGoodVo.getNew(); GoblinZhengzaiGoodVo returnVo = GoblinZhengzaiGoodVo.getNew();
vo.setMarketId(vo.getMarketId().replace(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), ""));
BeanUtils.copyProperties(vo, returnVo); BeanUtils.copyProperties(vo, returnVo);
voList.add(returnVo); voList.add(returnVo);
} }
...@@ -139,6 +141,7 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi ...@@ -139,6 +141,7 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
GoblinGoodsInfoVo vo = hitSpuIdList.contains(spuId) ? redisUtils.getGoodsInfoVo(spuId) : null; GoblinGoodsInfoVo vo = hitSpuIdList.contains(spuId) ? redisUtils.getGoodsInfoVo(spuId) : null;
if (null != vo && vo.getShelvesStatus().equals("3")) { if (null != vo && vo.getShelvesStatus().equals("3")) {
GoblinZhengzaiGoodVo returnVo = GoblinZhengzaiGoodVo.getNew(); GoblinZhengzaiGoodVo returnVo = GoblinZhengzaiGoodVo.getNew();
vo.setMarketId(vo.getMarketId().replace(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), ""));
BeanUtils.copyProperties(vo, returnVo); BeanUtils.copyProperties(vo, returnVo);
voList.add(returnVo); voList.add(returnVo);
} }
...@@ -213,7 +216,7 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi ...@@ -213,7 +216,7 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
String marketId = param.getMarketId(); String marketId = param.getMarketId();
String orderCode = param.getOrderCode(); String orderCode = param.getOrderCode();
GoblinNowOrderListVo data = mongoUtils.getGoblinNowOrderDetailsVo(orderCode, storeId, marketId); GoblinNowOrderListVo data = mongoUtils.getGoblinNowOrderDetailsVo(orderCode, storeId, marketId);
if(data==null){ if (data == null) {
return ResponseDto.failure("订单不存在"); return ResponseDto.failure("订单不存在");
} }
ResponseDto<GoblinAppOrderDetailsVo> responseVo = goblinOrderAppService.orderDetails(data.getOrderId(), data.getUserId()); ResponseDto<GoblinAppOrderDetailsVo> responseVo = goblinOrderAppService.orderDetails(data.getOrderId(), data.getUserId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment