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

Commit 1b42b4d0 authored by 胡佳晨's avatar 胡佳晨

修改 正在下单逻辑

parent 089ad2e5
...@@ -182,7 +182,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService { ...@@ -182,7 +182,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
skuVo.setBuyRoster(bean.getBuyRoster()); skuVo.setBuyRoster(bean.getBuyRoster());
skuVo.setBuyFactor(bean.getBuyFactor().toString()); skuVo.setBuyFactor(bean.getBuyFactor().toString());
skuVo.setMarketId(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().concat(params.getSelfMarketId())); skuVo.setMarketId(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().concat(params.getSelfMarketId()));
mongoUtils.setGoodsSkuInfoVo(skuVo); mongoUtils.upsertGoodsSkuInfoVo(skuVo);
//redis //redis
redisUtils.setGoodsSkuInfoVo(skuVo); redisUtils.setGoodsSkuInfoVo(skuVo);
//mysql //mysql
...@@ -208,7 +208,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService { ...@@ -208,7 +208,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
spuVo.setSpecMode("2"); spuVo.setSpecMode("2");
spuVo.setPriceLe(priceList.get(priceList.size() - 1)); spuVo.setPriceLe(priceList.get(priceList.size() - 1));
spuVo.setMarketId(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().concat(params.getSelfMarketId())); spuVo.setMarketId(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().concat(params.getSelfMarketId()));
mongoUtils.setGoodsInfoVo(spuVo); mongoUtils.upsertGoodsInfoVo(spuVo);
//redis //redis
redisUtils.setGoodsInfoVo(spuVo); redisUtils.setGoodsInfoVo(spuVo);
relationVo.setSkuList(skuList); relationVo.setSkuList(skuList);
......
...@@ -306,6 +306,12 @@ public class GoblinMongoUtils { ...@@ -306,6 +306,12 @@ public class GoblinMongoUtils {
return mongoTemplate.insert(vo, GoblinGoodsInfoVo.class.getSimpleName()); return mongoTemplate.insert(vo, GoblinGoodsInfoVo.class.getSimpleName());
} }
public void upsertGoodsInfoVo(GoblinGoodsInfoVo vo) {
Document document = (Document) mongoConverter.convertToMongoType(vo);
Update update = Update.fromDocument(document);
mongoTemplate.upsert(Query.query(Criteria.where("storeId").is(vo.getStoreId()).and("spuId").is(vo.getSpuId())), update, GoblinGoodsInfoVo.class.getSimpleName());
}
public boolean delGoodsInfoVo(String spuId) { public boolean delGoodsInfoVo(String spuId) {
return mongoTemplate.getCollection(GoblinGoodsInfoVo.class.getSimpleName()).updateOne( return mongoTemplate.getCollection(GoblinGoodsInfoVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("spuId").is(spuId).and("delFlg").is("0")).getQueryObject(), Query.query(Criteria.where("spuId").is(spuId).and("delFlg").is("0")).getQueryObject(),
...@@ -505,6 +511,12 @@ public class GoblinMongoUtils { ...@@ -505,6 +511,12 @@ public class GoblinMongoUtils {
return mongoTemplate.insert(vo, GoblinGoodsSkuInfoVo.class.getSimpleName()); return mongoTemplate.insert(vo, GoblinGoodsSkuInfoVo.class.getSimpleName());
} }
public void upsertGoodsSkuInfoVo(GoblinGoodsSkuInfoVo vo) {
Document document = (Document) mongoConverter.convertToMongoType(vo);
Update update = Update.fromDocument(document);
mongoTemplate.upsert(Query.query(Criteria.where("storeId").is(vo.getStoreId()).and("skuId").is(vo.getSkuId())), update, GoblinGoodsInfoVo.class.getSimpleName());
}
// SKU信息 // SKU信息
public List<GoblinGoodsSkuInfoVo> setGoodsSkuInfoVos(List<GoblinGoodsSkuInfoVo> vos) { public List<GoblinGoodsSkuInfoVo> setGoodsSkuInfoVos(List<GoblinGoodsSkuInfoVo> vos) {
return (List<GoblinGoodsSkuInfoVo>) mongoTemplate.insert(vos, GoblinGoodsSkuInfoVo.class.getSimpleName()); return (List<GoblinGoodsSkuInfoVo>) mongoTemplate.insert(vos, GoblinGoodsSkuInfoVo.class.getSimpleName());
...@@ -971,7 +983,8 @@ public class GoblinMongoUtils { ...@@ -971,7 +983,8 @@ public class GoblinMongoUtils {
criteria = criteria.and("backOrderSkuVos.spuName").regex(".*?\\" + spuName); criteria = criteria.and("backOrderSkuVos.spuName").regex(".*?\\" + spuName);
} }
Query query = Query.query(criteria); Query query = Query.query(criteria);
query.skip(skipCount).limit(size).with(Sort.by(Sort.Order.desc("createdAt")));; query.skip(skipCount).limit(size).with(Sort.by(Sort.Order.desc("createdAt")));
;
query.fields().include("backCode").include("orderCode").include("backOrderId").include("type").include("status").include("realBackPrice").include("createdAt") query.fields().include("backCode").include("orderCode").include("backOrderId").include("type").include("status").include("realBackPrice").include("createdAt")
.include("backOrderSkuVos.spuName").include("backOrderSkuVos.skuName").include("backOrderSkuVos.spuPic").include("backOrderSkuVos.skuPic") .include("backOrderSkuVos.spuName").include("backOrderSkuVos.skuName").include("backOrderSkuVos.spuPic").include("backOrderSkuVos.skuPic")
.include("backOrderSkuVos.skuSpecs").include("backOrderSkuVos.skuId").include("backOrderSkuVos.spuId").include("backOrderSkuVos.orderSkuId") .include("backOrderSkuVos.skuSpecs").include("backOrderSkuVos.skuId").include("backOrderSkuVos.spuId").include("backOrderSkuVos.orderSkuId")
......
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