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 index 108ca004..97d9c6b6 100644 --- 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 @@ -36,6 +36,10 @@ public class ProductQuantityConsumption { @TableField(value = "quantity",updateStrategy = FieldStrategy.NOT_EMPTY) private BigDecimal quantity; + @ApiModelProperty("订单总额") + @TableField(value = "sale_amount",updateStrategy = FieldStrategy.NOT_EMPTY) + private BigDecimal saleAmount; + @ApiModelProperty("消费状态:0-未消费,1-已消费") @TableField(value = "status",updateStrategy = FieldStrategy.NOT_EMPTY) private Integer status; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java index 00e6234b..1c004054 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java @@ -1526,7 +1526,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl stockDeltaMap = new HashMap<>(); String item_src_id = productItem.getItem_src_id(); stockDeltaMap.put(item_src_id + "-" + shopOrderItem.getOrder_id()+"-"+shopOrderItem.getItem_unit_price(), returnNum); - syncThirdDataService.incrProductStockToRedis(stockDeltaMap); + syncThirdDataService.incrProductStockToRedis(stockDeltaMap,shopOrderReturn.getReturn_refund_amount()); logger.info("退货返回给思迅,存入redis成功,item_src_id:{},订单号:{},数量:{}", item_src_id, shopOrderReturn.getOrder_id(), returnNum); } else { logger.warn("退货数量为空,无法增加库存,订单项ID: {}", orderItemId); diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java index 154f917d..25160b6c 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java @@ -1179,7 +1179,7 @@ public class SFExpressApiServiceImpl implements SFExpressApiService { String item_src_id = shopOrderItem.getItem_src_id(); Integer order_item_quantity = shopOrderItem.getOrder_item_quantity(); stockDeltaMap.put(item_src_id + "-" + shopStoreSfOrder.getShop_order_id()+"-"+shopOrderItem.getItem_unit_price(), -order_item_quantity); - syncThirdDataService.incrProductStockToRedis(stockDeltaMap); + syncThirdDataService.incrProductStockToRedis(stockDeltaMap,null); } } //出库扣减思迅库存end @@ -1348,7 +1348,7 @@ public class SFExpressApiServiceImpl implements SFExpressApiService { String item_src_id = shopOrderItem.getItem_src_id(); Integer order_item_quantity = shopOrderItem.getOrder_item_quantity(); stockDeltaMap.put(item_src_id + "-" + shopOrderItem.getOrder_id()+"-"+shopOrderItem.getItem_unit_price(), -order_item_quantity); - syncThirdDataService.incrProductStockToRedis(stockDeltaMap); + syncThirdDataService.incrProductStockToRedis(stockDeltaMap,null); } } return CommonResult.success("操作成功");