update: 修改购物车显示

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java

@@ -20,7 +20,7 @@ import java.util.List;
 @Valid
 public class AppTradeOrderSettlementReqVO {
 
-    @Schema(description = "店铺ID")
+    //店铺ID
     private Long shopId;
 
     @Schema(description = "商品项数组", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -68,12 +68,13 @@ public class AppTradeOrderSettlementReqVO {
     @AssertTrue(message = "活动商品每次只能购买一种规格")
     @JsonIgnore
     public boolean isValidActivityItems() {
-        // 校验是否是活动订单
-        if (ObjUtil.isAllEmpty(seckillActivityId, combinationActivityId, combinationHeadId, bargainRecordId)) {
-            return true;
-        }
-        // 校验订单项是否超出
-        return items.size() == 1;
+//        // 校验是否是活动订单
+//        if (ObjUtil.isAllEmpty(seckillActivityId, combinationActivityId, combinationHeadId, bargainRecordId)) {
+//            return true;
+//        }
+//        // 校验订单项是否超出
+//        return items.size() == 1;
+        return true;//update by Ben 不用原来活动商品逻辑
     }
 
     @Data

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -163,7 +163,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         for (Long shopid : shopSkuIds.keySet()) {
             shopIds.add(shopid);
         }
-        List<ShopDO> shopDOList = shopMapper.selectList(new LambdaQueryWrapper<ShopDO>().eq(ShopDO::getId,shopIds));
+
+//        List<ShopDO> shopDOList = shopMapper.selectList(new LambdaQueryWrapper<ShopDO>().eq(ShopDO::getId,shopIds));
+        List<ShopDO> shopDOList = shopMapper.selectList("id",shopIds);
         Map<Long, String> shopNameMap = new HashMap<Long, String>();//key为店铺id，value为店铺名
         for (ShopDO shopDO : shopDOList) {
             shopNameMap.put(shopDO.getId(), shopDO.getName());

feifan-server/src/main/resources/application-dev.yaml

@@ -43,17 +43,16 @@ spring:
       primary: master
       datasource:
         master:
-          name: ruoyi-vue-pro
-          url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
-          driver-class-name: com.mysql.jdbc.Driver
-          username: root
-          password: 3WLiVUBEwTbvAfsh
-        slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
-          name: ruoyi-vue-pro
-          url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
-          driver-class-name: com.mysql.jdbc.Driver
-          username: root
-          password: 3WLiVUBEwTbvAfsh
+          name: mall-feifan-dev
+          url: jdbc:mysql://10.0.5.229:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          username: wendao9t
+          password: PA55W0RD
+        slave: # 模拟从库，可根据自己需要修改
+          name: mall-feifan-dev
+          lazy: true # 开启懒加载，保证启动速度
+          url: jdbc:mysql://10.0.5.229:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          username: wendao9t
+          password: PA55W0RD
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis: