diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/AdvanceOrderBo.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/AdvanceOrderBo.java index bdd528e..68a7e69 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/AdvanceOrderBo.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/AdvanceOrderBo.java @@ -23,12 +23,6 @@ import java.util.List; @ApiModel(value = "商城预订单对象") public class AdvanceOrderBo implements Serializable { - /** - * 主键 - */ - @ApiModelProperty("主键") - private String id; - /** * 总金额 */ diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/controller/mini/MiniProductController.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/controller/mini/MiniProductController.java index 4548a40..02f3d28 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/controller/mini/MiniProductController.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/controller/mini/MiniProductController.java @@ -80,7 +80,7 @@ public class MiniProductController { * @param storeIds 校区id列表 * @return: com.cpop.core.base.R> */ - @PostMapping("/getStoreByIds") + @GetMapping("/getStoreByIds") @ApiOperation("根据校区ids获取校区信息") public R> getMiniProductPage(@RequestParam("storeIds") String storeIds) { List stores = SpringUtils.getBean(StoreService.class).listByIds(Arrays.asList(storeIds.split(","))); diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/entity/ShoppingCart.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/entity/ShoppingCart.java index 7c653d8..d2d44bf 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/entity/ShoppingCart.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/entity/ShoppingCart.java @@ -48,7 +48,7 @@ public class ShoppingCart extends BaseEntity implements Serializable { /** * 店铺/校区id */ - private byte[] storeId; + private String storeId; /** * 金额 diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java index 8df2307..242c49f 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java @@ -5,6 +5,7 @@ import com.cpop.common.utils.StringUtils; import com.cpop.common.utils.bean.BeanUtils; import com.cpop.core.base.entity.PageDomain; import com.cpop.core.base.enums.SourceType; +import com.cpop.core.service.RedisService; import com.cpop.core.utils.SecurityUtils; import com.cpop.core.utils.SpringUtils; import com.cpop.core.utils.sql.SqlUtils; @@ -22,6 +23,7 @@ import com.cpop.mall.business.service.ProductRecordService; import com.cpop.mall.business.service.ProductService; import com.cpop.mall.business.service.ProductSpecificationService; import com.cpop.mall.business.vo.*; +import com.cpop.mall.framework.constant.MallRedisConstant; import com.cpop.system.business.service.StoreService; import com.mybatisflex.core.datasource.DataSourceKey; import com.mybatisflex.core.paginate.Page; @@ -250,10 +252,14 @@ public class ProductServiceImpl extends ServiceImpl impl //存商品记录详情 List recordList = BeanUtils.mapToList(bo.getRecordList(), ProductRecord.class); ProductRecordService specificationRecordService = SpringUtils.getBean(ProductRecordService.class); + RedisService redisService = SpringUtils.getBean(RedisService.class); recordList.forEach(item -> { item.setProductId(product.getId()); + //更新库存 + redisService.setCacheObject(MallRedisConstant.STOCK_RECORD_NUM + item.getId(), item.getRecordNum()); }); specificationRecordService.updateBatch(recordList); + } /** diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ShoppingCartServiceImpl.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ShoppingCartServiceImpl.java index 7a4c418..6d1b092 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ShoppingCartServiceImpl.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ShoppingCartServiceImpl.java @@ -52,7 +52,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl