diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/sync/ProductQuantityConsumption.java b/mall-common/src/main/java/com/suisung/mall/common/modules/sync/ProductQuantityConsumption.java new file mode 100644 index 00000000..ddfdc6a7 --- /dev/null +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/sync/ProductQuantityConsumption.java @@ -0,0 +1,52 @@ +package com.suisung.mall.common.modules.sync; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 同步消费中间表，同步数据时保存数据到这个表中，消费完更新已消费，证明数据已经同步给思迅客户端 + */ +@Data +@TableName("product_quantity_consumption") +@ApiModel("商品数量消费表") +public class ProductQuantityConsumption { + @TableId(value = "consume_id", type = IdType.INPUT) + @ApiModelProperty("自定义主键ID") + private String consumeId; + + @TableField(value = "order_id",updateStrategy = FieldStrategy.NOT_EMPTY) + @ApiModelProperty("订单编号") + private String orderId; + + @TableField(value = "product_number", updateStrategy = FieldStrategy.NOT_EMPTY) + @ApiModelProperty("商品编号") + private String productNumber; + + @ApiModelProperty("数量（正数表示入库/增加，负数表示出库/减少）") + @TableField(value = "quantity",updateStrategy = FieldStrategy.NOT_EMPTY) + private BigDecimal quantity; + + @ApiModelProperty("消费状态：0-未消费，1-已消费") + @TableField(value = "status",updateStrategy = FieldStrategy.NOT_EMPTY) + private Integer status; + + @TableField(value = "store_id",updateStrategy = FieldStrategy.NOT_EMPTY) + @ApiModelProperty("店铺ID") + private Integer storeId; + + @TableField(value = "update_time",updateStrategy = FieldStrategy.NOT_EMPTY) + @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @TableField(value = "update_time",updateStrategy = FieldStrategy.NOT_EMPTY) + @ApiModelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; +} diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java index d77a68ae..d31786eb 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java @@ -3303,7 +3303,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl stockDeltaMap = new HashMap<>(); - stockDeltaMap.put(item_src_id, -order_item_quantity); + stockDeltaMap.put(item_src_id+"_"+order_item_row.getOrder_id(), -order_item_quantity); syncThirdDataService.incrProductStockToRedis(stockDeltaMap); } } @@ -4226,7 +4226,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl stockDeltaMap = new HashMap<>(); - stockDeltaMap.put(Convert.toStr(shopProductItem.getItem_src_id()), order_item_quantity); + stockDeltaMap.put(shopProductItem.getItem_src_id()+"_"+order_item_row.getOrder_id(), order_item_quantity); syncThirdDataService.incrProductStockToRedis(stockDeltaMap); } } @@ -7244,7 +7244,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl stockDeltaMap = new HashMap<>(); - stockDeltaMap.put(Convert.toStr(item_src_id), -cart_quantity); + stockDeltaMap.put(item_src_id+"_"+order_id, -cart_quantity); syncThirdDataService.incrProductStockToRedis(stockDeltaMap); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/SyncThirdDataController.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/SyncThirdDataController.java index 86e26bb8..f5716fcc 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/SyncThirdDataController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/SyncThirdDataController.java @@ -137,6 +137,15 @@ public class SyncThirdDataController { return syncThirdDataService.getStoreDataRelease(appKey,sign); } + @ApiOperation(value = "扣完库存之后做确认", notes = "扣完库存之后做确认") + @RequestMapping(value = "/syncStoreDataReleaseResponse", method = RequestMethod.POST) + public ThirdApiRes syncStoreDataReleaseResponse(@RequestBody List consumIds, + @RequestParam String appKey, + @RequestParam String sign) { + syncThirdDataService.getStoreDataReleaseResponse(appKey,sign,consumIds); + return new ThirdApiRes().success("请求成功!"); + } + @ApiOperation(value = "通知上传商品文件到cos", notes = "通知上传商品文件到cos") @RequestMapping(value = "/uploudToCos", method = RequestMethod.POST) diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/keymanage/RedisKey.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/keymanage/RedisKey.java index d89a5068..64f746ef 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/keymanage/RedisKey.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/keymanage/RedisKey.java @@ -4,7 +4,7 @@ public class RedisKey { //public static final String SXCLIENTKEYVERSION="sxclientKey:version";//客户端版本 - public static final String STOREDATARELEASE="storedata:release"; + public static final String STOREDATARELEASE="shopQuality:release"; public static final String STOREDATAPRODUCTMAPING="storedata:productMaping"; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/mapper/ProductQuantityConsumptionMapper.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/mapper/ProductQuantityConsumptionMapper.java new file mode 100644 index 00000000..bf59ed3a --- /dev/null +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/mapper/ProductQuantityConsumptionMapper.java @@ -0,0 +1,11 @@ + + +package com.suisung.mall.shop.sync.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.suisung.mall.common.modules.sync.ProductQuantityConsumption; +import org.springframework.stereotype.Repository; + +@Repository +public interface ProductQuantityConsumptionMapper extends BaseMapper { +} diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/ProductQuantityConsumptionService.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/ProductQuantityConsumptionService.java new file mode 100644 index 00000000..0ba0e209 --- /dev/null +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/ProductQuantityConsumptionService.java @@ -0,0 +1,8 @@ +package com.suisung.mall.shop.sync.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.suisung.mall.common.modules.sync.ProductQuantityConsumption; + +public interface ProductQuantityConsumptionService extends IService { + +} diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/SyncThirdDataService.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/SyncThirdDataService.java index 878c0a0d..8857053c 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/SyncThirdDataService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/SyncThirdDataService.java @@ -12,6 +12,7 @@ import cn.hutool.json.JSONArray; import com.suisung.mall.common.api.CommonResult; import com.suisung.mall.common.modules.base.ShopBaseProductBrand; import com.suisung.mall.common.modules.base.ShopBaseProductCategory; +import com.suisung.mall.common.modules.sync.ProductQuantityConsumption; import com.suisung.mall.common.pojo.req.SyncThirdMemberReq; import com.suisung.mall.common.pojo.res.ThirdApiRes; import org.springframework.core.io.Resource; @@ -110,6 +111,14 @@ public interface SyncThirdDataService { */ ThirdApiRes getStoreDataRelease(String appKey, String sign); + /** + * 扣减完库存之后做确认，确认完成更新队列表为已消费 + * @param appKey + * @param sign + * @return + */ + ThirdApiRes getStoreDataReleaseResponse(String appKey, String sign,List consumIds); + /** * 保存一个或多个商品刚刚变化的库存到 redis hash 缓存 * @@ -122,7 +131,7 @@ public interface SyncThirdDataService { * * @return */ - Map getProductStockFromRedis(String storeId); + List getProductStockFromRedis(String storeId,Map redisHash); /** * 下单或支付后，批量累加减商品库存，使用 Redis Hash 的原子自增操作，保证并发安全 diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductQuantityConsumptionServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductQuantityConsumptionServiceImpl.java new file mode 100644 index 00000000..1b87dc10 --- /dev/null +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductQuantityConsumptionServiceImpl.java @@ -0,0 +1,18 @@ +package com.suisung.mall.shop.sync.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.suisung.mall.common.modules.sync.ProductQuantityConsumption; + +import com.suisung.mall.shop.sync.mapper.ProductQuantityConsumptionMapper; +import com.suisung.mall.shop.sync.service.ProductQuantityConsumptionService; +import org.springframework.stereotype.Service; + +import org.springframework.transaction.annotation.Transactional; + + +@Service +@lombok.extern.slf4j.Slf4j +@Transactional +public class ProductQuantityConsumptionServiceImpl extends ServiceImpl implements ProductQuantityConsumptionService { + +} diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java index 28d94b10..fa39feb8 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java @@ -13,10 +13,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.core.util.ZipUtil; +import cn.hutool.core.util.*; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; @@ -27,6 +24,7 @@ import com.google.gson.GsonBuilder; import com.qcloud.cos.model.COSObjectSummary; import com.suisung.mall.common.adapter.BigDecimalTypeAdapter; import com.suisung.mall.common.api.CommonResult; +import com.suisung.mall.common.api.ResultCode; import com.suisung.mall.common.api.StateCode; import com.suisung.mall.common.enums.DicEnum; import com.suisung.mall.common.exception.ApiException; @@ -42,10 +40,7 @@ import com.suisung.mall.common.modules.sixun.SxSyncGoods; import com.suisung.mall.common.modules.sixun.SxSyncVip; import com.suisung.mall.common.modules.store.ShopStoreActivityBase; import com.suisung.mall.common.modules.store.ShopStoreActivityItem; -import com.suisung.mall.common.modules.sync.StoreDbConfig; -import com.suisung.mall.common.modules.sync.SyncApp; -import com.suisung.mall.common.modules.sync.SyncConfig; -import com.suisung.mall.common.modules.sync.SyncFileLog; +import com.suisung.mall.common.modules.sync.*; import com.suisung.mall.common.pojo.req.SyncThirdMemberReq; import com.suisung.mall.common.pojo.res.ThirdApiRes; import com.suisung.mall.common.utils.I18nUtil; @@ -77,6 +72,7 @@ import com.suisung.mall.shop.sync.dto.BrandModel; import com.suisung.mall.shop.sync.keymanage.RedisKey; import com.suisung.mall.shop.sync.service.*; import io.seata.spring.annotation.GlobalTransactional; +import org.apache.commons.collections4.ListUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -180,10 +176,12 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements @Autowired private ProductMappingService productMappingService; - @Autowired private ShopProductIndexService shopProductIndexService; + @Autowired + private ProductQuantityConsumptionService productQuantityConsumptionService; + /** * 批量保存商品的分类 * @@ -780,18 +778,91 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements if (syncAppO == null) { return new ThirdApiRes().fail(1001, I18nUtil._("签名有误！")); } + //持久化保存数据到数据库队列 + String key=RedisKey.STOREDATARELEASE+":"+syncAppO.getStore_id(); + Map redisHash = redisTemplate.opsForHash().entries(key); + List productQuantityConsumptionList=getProductStockFromRedis(syncAppO.getStore_id(),redisHash); + List productQuantityConsumptions=new ArrayList<>(); + if (!productQuantityConsumptionList.isEmpty()) { + boolean result= productQuantityConsumptionService.saveBatch(productQuantityConsumptionList,productQuantityConsumptionList.size()); + if(result){ + Set fields = redisHash.keySet(); + redisTemplate.opsForHash().delete(key, fields.toArray());//清除持久化数据 + } + } + //查询未消费数据 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("store_id", syncAppO.getStore_id()); + queryWrapper.eq("status",0);//未消费数据 + productQuantityConsumptions=productQuantityConsumptionService.list(queryWrapper); + return new ThirdApiRes().success("success", productQuantityConsumptions); + } -// Object obRst = redisService.get(RedisKey.STOREDATARELEASE);//商品库存扣减 -// Map storeDataResultMap = new HashMap(); -// if (obRst != null) { -// Map resultMap = (Map) obRst; -// Set sme = resultMap.entrySet(); -// storeDataResultMap = sme.stream().filter(m -> !(m.getValue().equals((double) 0))).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); -// } + @Override + public ThirdApiRes getStoreDataReleaseResponse(String appKey, String sign,List consumIds) { + if (StrUtil.isBlank(appKey) || StrUtil.isBlank(sign)) { + logger.info("缺少必要参数!"); + } + Gson gson = new Gson(); + String jsonStr = gson.toJson(consumIds); + SyncApp syncApp = syncAppService.checkAppSign(appKey, sign, jsonStr); // 验签、appid，必要参数判断 + if (syncApp == null) { + logger.info("签名有误！"); + return new ThirdApiRes().fail(250,"签名有误"); + } + if(consumIds!=null){ + ExecutorService executor = Executors.newFixedThreadPool(6); + List> futures = new ArrayList<>(); + Integer pages=CommonUtil.getPagesCount(consumIds.size(),limitCnt); + List> pagesPatition = ListUtils.partition(consumIds, limitCnt); + AtomicInteger success = new AtomicInteger(); + AtomicInteger fails = new AtomicInteger(); + for (int i = 1; i <=pages ; i++) { + int finalI = i; + int finalI1 = i; + futures.add(executor.submit(() -> { + try { + List pageData = pagesPatition.get(finalI - 1); + productQuantityConsumptionPageSave(pageData); + success.getAndIncrement(); + return "成功执行"+ finalI1; + }catch (Exception e){ + fails.getAndIncrement(); + return "执行失败："+finalI+":"+e.getMessage(); + } + })); + } + // 等待所有任务完成 + for (Future future : futures) { + try { + logger.info("任务结果: {}", future.get()); + } catch (Exception e) { + logger.error("任务执行异常: {}", e.getMessage()); + } + } + executor.shutdown(); + logger.info("总任务数据：{}", pagesPatition.size()); + logger.info("成功数据：{}", success.get()); + logger.info("失败数据：{}", fails.get()); + } + return new ThirdApiRes().success("success"); + } - Map storeDataResultMap = getProductStockFromRedis(syncAppO.getStore_id()); - - return new ThirdApiRes().success("success", storeDataResultMap); + /** + * 更新消费状态 + * @param consumIds + */ + private void productQuantityConsumptionPageSave(List consumIds){ + List productQuantityConsumptionList=new ArrayList<>(); + for (String consumeId : consumIds) { + ProductQuantityConsumption productQuantityConsumption=new ProductQuantityConsumption(); + productQuantityConsumption.setConsumeId(consumeId); + productQuantityConsumption.setStatus(1); + productQuantityConsumptionList.add(productQuantityConsumption); + } + if(!productQuantityConsumptionList.isEmpty()){ + productQuantityConsumptionService.updateBatchById(productQuantityConsumptionList,productQuantityConsumptionList.size()); + } } // @Override @@ -813,23 +884,34 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements @Override - public Map getProductStockFromRedis(String storeId) { + public List getProductStockFromRedis(String storeId,Map redisHash) { try { // 从 Redis 获取 hash 结构的所有键值对 - String key=RedisKey.STOREDATARELEASE+":"+storeId; - Map redisHash = redisTemplate.opsForHash().entries(key); if (redisHash.isEmpty()) { - return Collections.emptyMap(); + return Collections.emptyList(); } - // 转换为 Map - return redisHash.entrySet().stream() - .collect(Collectors.toMap( - entry -> String.valueOf(entry.getKey()), - entry -> Convert.toDouble(entry.getValue(), 0.00) // 转换失败时默认为 0 - )); + // 转换为 list + List productQuantityConsumptionList=new ArrayList<>(); + redisHash.forEach((k, v)->{ + ProductQuantityConsumption productQuantityConsumption=new ProductQuantityConsumption(); + String[] productKeyArrys=k.split("_"); + if(productKeyArrys.length!=2){ + return; + } + String productNumber=productKeyArrys[0]; + String orderId=productKeyArrys[1]; + productQuantityConsumption.setConsumeId(IdUtil.getSnowflakeNextIdStr()); + productQuantityConsumption.setOrderId(orderId); + productQuantityConsumption.setProductNumber(productNumber); + productQuantityConsumption.setQuantity(Convert.toBigDecimal(v)); + productQuantityConsumption.setStoreId(Integer.valueOf(storeId)); + productQuantityConsumption.setStatus(0); + productQuantityConsumptionList.add(productQuantityConsumption); + }); + return productQuantityConsumptionList; } catch (Exception e) { logger.error("从 Redis 获取商品库存失败: {}", e.getMessage(), e); - return Collections.emptyMap(); + return Collections.emptyList(); } } @@ -847,9 +929,15 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements if (StrUtil.isBlank(productKey) || delta == null) { continue; } + String[] productKeyArrys=productKey.split("_"); + if(productKeyArrys.length!=2){ + continue; + } try { + String item_src_id=productKeyArrys[0]; + String orderId=productKeyArrys[1]; QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("item_src_id", productKey); + queryWrapper.eq("item_src_id", item_src_id); List shopProductItems=shopProductItemService.list(queryWrapper); if(shopProductItems==null || shopProductItems.isEmpty()){ continue; @@ -871,7 +959,7 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements String name = Convert.toStr(item.get("name")); BigDecimal itemQuaryty = getBigDecimal(delta, name); // 使用 Redis 的 HINCRBY 保证原子性和高性能 - redisTemplate.opsForHash().increment(key, itemId, itemQuaryty.doubleValue()); + redisTemplate.opsForHash().increment(key, itemId+"_"+orderId, itemQuaryty.doubleValue()); } catch (Exception e) { logger.error("库存累计失败，productKey={}, delta={}, error={}", productKey, delta, e.getMessage(), e); } diff --git a/sql/shop/dev/20250929_ddl.sql b/sql/shop/dev/20250929_ddl.sql new file mode 100644 index 00000000..5ec58add --- /dev/null +++ b/sql/shop/dev/20250929_ddl.sql @@ -0,0 +1,12 @@ +CREATE TABLE `product_quantity_consumption` ( + `consume_id` varchar(32) NOT NULL COMMENT '自定义主键ID', + `product_number` varchar(50) NOT NULL COMMENT '商品编号', + `order_id` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '' COMMENT '订单编号', + `quantity` decimal(15,3) NOT NULL COMMENT '数量（正数表示入库/增加，负数表示出库/减少）', + `status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '消费状态：0-未消费，1-已消费', + `store_id` int(20) NOT NULL COMMENT '店铺ID', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`consume_id`), + KEY `idx_shop_product` (`store_id`, `product_number`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品数量消费表';