From 19f64a6b35be610cb027638880ef2f4002962f3e Mon Sep 17 00:00:00 2001
From: DB <2502523450@qq.com>
Date: Tue, 7 Nov 2023 09:25:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cpop/mall/business/bo/AdvanceOrderBo.java |  6 -----
 .../mini/MiniProductController.java           |  2 +-
 .../mall/business/entity/ShoppingCart.java    |  2 +-
 .../service/impl/ProductServiceImpl.java      |  6 +++++
 .../service/impl/ShoppingCartServiceImpl.java |  2 +-
 .../business/vo/MiniShoppingCartPageVo.java   | 26 ++++++++++++++++++-
 6 files changed, 34 insertions(+), 10 deletions(-)

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<java.util.List<com.cpop.mall.business.vo.StoreListVo>>
      */
-    @PostMapping("/getStoreByIds")
+    @GetMapping("/getStoreByIds")
     @ApiOperation("根据校区ids获取校区信息")
     public R<List<StoreListVo>> getMiniProductPage(@RequestParam("storeIds") String storeIds) {
         List<Store> 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<ProductMapper, Product> impl
         //存商品记录详情
         List<ProductRecord> 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<ShoppingCartMapper, Sho
                         //记录
                         .select(PRODUCT_RECORD.RECORD_NAMES)
                         //商品
-                        .select(PRODUCT.PRODUCT_NAME)
+                        .select(PRODUCT.PRODUCT_NAME,PRODUCT.ID.as(MiniShoppingCartPageVo::getProductId),PRODUCT.PIC_URL,PRODUCT.PIC_DETAIL_URL,PRODUCT.PAY_TYPE)
                         //校区
                         .select(STORE.STORE_NAME)
                         .from(SHOPPING_CART)
diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/vo/MiniShoppingCartPageVo.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/vo/MiniShoppingCartPageVo.java
index e113a6d..03bd902 100644
--- a/Cpop-Mall/src/main/java/com/cpop/mall/business/vo/MiniShoppingCartPageVo.java
+++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/vo/MiniShoppingCartPageVo.java
@@ -42,7 +42,6 @@ public class MiniShoppingCartPageVo implements Serializable {
     /**
      * 规格名
      */
-    @StringArrayConvert
     @ApiModelProperty("规格名")
     private String recordNames;
 
@@ -88,4 +87,29 @@ public class MiniShoppingCartPageVo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     @ApiModelProperty("创建时间")
     private LocalDateTime createTime;
+
+    /**
+     * 支付类型
+     */
+    @ApiModelProperty("支付类型")
+    private Integer payType;
+
+    /**
+     *商品id
+     */
+    @ApiModelProperty("商品id")
+    private String productId;
+
+
+    /**
+     * 商品图地址
+     */
+    @ApiModelProperty("商品图地址")
+    private String picUrl;
+
+    /**
+     * 商品详情图地址
+     */
+    @ApiModelProperty("商品详情图地址")
+    private String picDetailUrl;
 }