商城库存问题优化

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductAttrValueScrmMapper.java

@@ -79,8 +79,8 @@ public interface FsStoreProductAttrValueScrmMapper
     //@DataSource(DataSourceType.SLAVE)
     List<FsStoreProductAttrValueScrm> selectFsStoreProductAttrValueByProductId(Long productId);
     @Select("select ifnull(stock,0) from fs_store_product_attr_value_scrm where  id=#{productAttrValueId}")
-    int selectFsStoreProductStockById(Long productAttrValueId);
-    
+    Integer selectFsStoreProductStockById(Long productAttrValueId);
+
     /**
      * 使用行锁查询规格库存
      */

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreCartScrmServiceImpl.java

@@ -160,7 +160,7 @@ public class FsStoreCartScrmServiceImpl implements IFsStoreCartScrmService
         // 检查并调整限购数量
         Integer adjustedNum = adjustPurchaseLimit(uid, cartParam.getProductId(), cartParam.getCartNum());
         cartParam.setCartNum(adjustedNum);
-        
+
         //如果是直接购买，直接写入记录
         if(cartParam.getIsBuy()==1){
             FsStoreCartScrm storeCart = FsStoreCartScrm.builder()
@@ -254,19 +254,19 @@ public class FsStoreCartScrmServiceImpl implements IFsStoreCartScrmService
         if (product == null) {
             return;
         }
-        
+
         // 如果商品没有设置限购，直接返回
         if (product.getPurchaseLimit() == null || product.getPurchaseLimit() <= 0) {
             return;
         }
-        
+
         // 查询用户已购买的数量
         FsStoreProductPurchaseLimitScrm purchaseLimit = purchaseLimitService.selectByProductIdAndUserId(productId, userId);
         int purchasedNum = 0;
         if (purchaseLimit != null) {
             purchasedNum = purchaseLimit.getNum();
         }
-        
+
         // 检查是否超过限购数量
         if (purchasedNum + num > product.getPurchaseLimit()) {
             int productTotalNum = purchasedNum + num;
@@ -291,19 +291,19 @@ public class FsStoreCartScrmServiceImpl implements IFsStoreCartScrmService
         if (product == null) {
             return num;
         }
-        
+
         // 如果商品没有设置限购，直接返回原数量
         if (product.getPurchaseLimit() == null || product.getPurchaseLimit() <= 0) {
             return num;
         }
-        
+
         // 查询用户已购买的数量
         FsStoreProductPurchaseLimitScrm purchaseLimit = purchaseLimitService.selectByProductIdAndUserId(productId, userId);
         int purchasedNum = 0;
         if (purchaseLimit != null) {
             purchasedNum = purchaseLimit.getNum();
         }
-        
+
         // 检查是否超过限购数量
         if (purchasedNum + num > product.getPurchaseLimit()) {
             // 如果超过限购，设置数量为限购的最大数量
@@ -313,7 +313,7 @@ public class FsStoreCartScrmServiceImpl implements IFsStoreCartScrmService
             }
             return maxAllowed; // 返回最大可购买数量
         }
-        
+
         return num; // 未超过限购，返回原数量
     }
 
@@ -393,8 +393,8 @@ public class FsStoreCartScrmServiceImpl implements IFsStoreCartScrmService
 
             }
         }
-        int stock=valueMapper.selectFsStoreProductStockById(productAttrValueId);
-        if (stock < 1) {
+        Integer stock=valueMapper.selectFsStoreProductStockById(productAttrValueId);
+        if (stock ==null||stock < 1) {
             throw new CustomException("库存不足");
         }
     }

fs-service/src/main/resources/db/tenant-initData.sql

@@ -1761,16 +1761,22 @@ INSERT INTO `sys_config` VALUES (1, '主框架页-默认皮肤样式名称', 'sy
 INSERT INTO `sys_config` VALUES (2, '用户管理-账号初始密码', 'sys.user.initPassword', 'Admin@123456', 'Y', 'admin', '2018-03-16 11:33:00', 'admin', '2018-03-16 11:33:00', '初始化密码 Admin@123456');
 INSERT INTO `sys_config` VALUES (3, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-light', 'Y', 'admin', '2018-03-16 11:33:00', 'admin', '2022-01-02 23:41:31', '深色主题theme-dark，浅色主题theme-light');
 INSERT INTO `sys_config` VALUES (4, 'oss存储配置', 'sys.oss.cloudStorage', null, 'N', '', NULL, '', '2025-12-26 15:01:11', NULL);
-INSERT INTO `sys_config` VALUES (5, '商城配置', 'his.store', null, 'N', '', NULL, '', '2025-10-14 11:16:34', NULL);
+INSERT INTO sys_config
+(config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark)
+VALUES(5, '商城配置', 'his.store', '{"payPostage":0,"unPayTime":30,"isUpdateOrder":0,"isIdVerification":0,"API_URL":null,"HASHCODE":null,"SECRET_KEY":null,"payRate":0}', 'N', '', NULL, '', '2026-06-08 15:55:14', NULL);
 INSERT INTO `sys_config` VALUES (6, '积分配置', 'his.integral', null, 'N', '', NULL, '', '2025-12-10 18:46:02', NULL);
-INSERT INTO `sys_config` VALUES (7, '签到配置', 'his.sign', null, 'N', '', NULL, '', NULL, NULL);
+INSERT INTO sys_config
+(config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark)
+VALUES(7, '签到配置', 'his.sign', '[{"signNum":10,"sort":1,"day":"第1天"},{"signNum":20,"sort":2,"day":"第2天"},{"signNum":30,"sort":3,"day":"第3天"},{"signNum":40,"sort":4,"day":"第4天"},{"signNum":50,"sort":5,"day":"第5天"},{"signNum":60,"sort":6,"day":"第6天"},{"signNum":70,"sort":7,"day":"第7天"}]', 'N', '', NULL, '', '2026-06-08 14:00:09', NULL);
 INSERT INTO `sys_config` VALUES (8, '用户协议', 'store.agreement', null, 'N', '', NULL, '', '2024-10-09 17:06:05', NULL);
 INSERT INTO `sys_config` VALUES (9, '支付配置', 'his.pay', null, 'N', '', NULL, '', '2025-09-08 17:13:32', NULL);
 INSERT INTO `sys_config` VALUES (10, '课堂配置', 'course.config', null, 'N', 'admin', '2024-09-10 15:46:49', 'admin', '2025-12-04 14:56:46', NULL);
 INSERT INTO `sys_config` VALUES (11, '红包配置', 'redPacket.config', null, 'N', '', NULL, '', '2025-08-13 13:46:53', NULL);
 INSERT INTO `sys_config` VALUES (12, '企业理念配置', 'store.concept', null, 'N', '', NULL, '', '2025-09-08 10:49:28', NULL);
 INSERT INTO `sys_config` VALUES (13, '布局配置', 'his.appShow', null, 'N', '', NULL, '', '2025-02-25 16:23:16', NULL);
-INSERT INTO `sys_config` VALUES (20, '系统配置', 'his.config', null, 'N', '', NULL, '', '2025-09-15 17:26:34', '(NULL)');
+INSERT INTO sys_config
+(config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark)
+VALUES(20, '系统配置', 'his.config', '{"dfAccounts":[],"erpOpen":"0","noErpCompany":[]}', 'N', '', NULL, '', '2026-06-04 10:50:59', '(NULL)');
 INSERT INTO `sys_config` VALUES (27, '企微配置', 'qw.config', null, 'N', '', NULL, '', '2025-04-02 16:50:05', NULL);
 INSERT INTO `sys_config` VALUES (28, '链接配置', 'qw.link', null, 'N', '', NULL, '', NULL, NULL);
 INSERT INTO `sys_config` VALUES (30, '会员看课配置', 'h5.course.config', null, 'N', 'admin', '2024-09-10 15:46:49', 'admin', '2025-04-10 17:06:27', NULL);