From 28f5ead83ac3323dd9793cf9e2ae52929a59618b Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 21 Apr 2026 18:13:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/ProductController.java | 11 -- .../admin/ShopProdCategoryController.java | 16 +- .../java/com/czg/account/dto/ProductDTO.java | 186 ------------------ .../java/com/czg/product/dto/ProductDTO.java | 5 +- .../czg/product/dto/ShopProdCategoryDTO.java | 4 - .../java/com/czg/product/entity/Product.java | 4 - .../czg/product/entity/ShopProdCategory.java | 4 - .../czg/product/service/ProductService.java | 8 - .../service/ShopProdCategoryService.java | 4 - .../impl/OrderInfoCustomServiceImpl.java | 11 +- .../service/impl/ProductServiceImpl.java | 11 -- .../impl/ShopProdCategoryServiceImpl.java | 11 -- .../service/impl/ShopSyncServiceImpl.java | 4 - 13 files changed, 5 insertions(+), 274 deletions(-) delete mode 100644 cash-common/cash-common-service/src/main/java/com/czg/account/dto/ProductDTO.java diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java index 9acba8923..d87cce137 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java @@ -226,17 +226,6 @@ public class ProductController { return CzgResult.success(); } - /** - * 商品-退款退至库存 开关 - */ - @PostMapping("refundToStock") - @OperationLog("商品-退款退至库存") - //@SaAdminCheckPermission("product:update") - public CzgResult refundToStock(@RequestBody @Validated({DefaultGroup.class}) ProdRefundToStockParam param) { - productService.refundToStock(param); - asyncProductToShop(param.getId()); - return CzgResult.success(); - } /** * 商品-报损 diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdCategoryController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdCategoryController.java index 7bd283cfc..b72ef5602 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdCategoryController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdCategoryController.java @@ -143,25 +143,11 @@ public class ShopProdCategoryController { return CzgResult.success(); } - /** - * 启用 - */ - @PostMapping("upRefundStock") - @OperationLog("商品分类-退菜退库存") - public CzgResult enableShopProdCategory(ShopProdCategoryDTO dto) { - //效验数据 - AssertUtil.isNull(dto, "{}不能为空", "id"); - shopProdCategoryService.upRefundStock(dto.getId(),dto.getIsRefundStock()); - asyncToBranchShop(dto.getId()); - return CzgResult.success(); - } private void asyncToBranchShop(Long id) { long shopId = StpKit.USER.getShopId(0L); long sysUserId = StpKit.USER.getLoginIdAsLong(); - ThreadUtil.execAsync(() -> { - shopSyncService.syncCategoryBySourceShop(shopId, id, sysUserId); - }); + ThreadUtil.execAsync(() -> shopSyncService.syncCategoryBySourceShop(shopId, id, sysUserId)); } } \ No newline at end of file diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ProductDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ProductDTO.java deleted file mode 100644 index 319c67f4b..000000000 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ProductDTO.java +++ /dev/null @@ -1,186 +0,0 @@ - -package com.czg.account.dto; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.sql.Time; -import java.time.LocalDateTime; -import com.alibaba.fastjson2.annotation.JSONField; -import java.io.Serial; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 商品 实体类。 - * - * @author zs - * @since 2025-02-20 - */ -@Data - -@NoArgsConstructor -@AllArgsConstructor -public class ProductDTO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * id - */ - private Long id; - - /** - * 商品分类 - */ - private Long categoryId; - - /** - * 商品规格 - */ - private Long specId; - - /** - * 单位id - */ - private Long unitId; - - /** - * 店铺id - */ - private Long shopId; - - /** - * 商品名称 - */ - private String name; - - /** - * 短标题--促销语 - */ - private String shortTitle; - - /** - * 商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券 - */ - private String type; - - /** - * 0 固定套餐 1可选套餐 - */ - private Integer groupType; - - /** - * 包装费 - */ - private BigDecimal packFee; - - /** - * 商品封面图 - */ - private String coverImg; - - /** - * 商品图片（第一张为缩略图，其他为详情） - */ - private String images; - - /** - * 套餐内容 - */ - private String groupSnap; - - /** - * 库存警戒线 - */ - private Integer warnLine; - - /** - * 称重 价格/千克 - */ - private BigDecimal weight; - - /** - * 是否允许临时改价 - */ - private Integer isAllowTempModifyPrice; - - /** - * 周 数组 'Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday' - */ - private String days; - - /** - * 可用开始时间 - */ - private Time startTime; - - /** - * 可用结束时间 - */ - private Time endTime; - - /** - * 规格选详情 - */ - private String selectSpecInfo; - - /** - * 排序 - */ - private Integer sort; - - /** - * 是否热销 - */ - private Integer isHot; - - /** - * 是否开启库存 - */ - private Integer isStock; - - /** - * 是否售罄 - */ - private Integer isSoldStock; - - /** - * 团购卷分类，可有多个分类 - */ - private String groupCategoryId; - - /** - * 商品级库存数量 - */ - private Integer stockNumber; - - /** - * 是否上架 - */ - private Boolean isSale; - - /** - * 退款是否退回库存 - */ - private Boolean isRefundStock; - - /** - * 创建时间 - */ - @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; - - /** - * 更新时间 - */ - @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; - - /** - * 逻辑删除 - */ - private Integer isDel; - -} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java index 97d6b0aa2..defc4f704 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java @@ -172,10 +172,7 @@ public class ProductDTO implements Serializable { */ @NotNull(message = "是否上架不能为空", groups = DefaultGroup.class) private Integer isSale; - /** - * 退款是否退回库存 - */ - private Integer isRefundStock; + /** * 创建时间 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopProdCategoryDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopProdCategoryDTO.java index 1f01f3bb0..0163dd734 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopProdCategoryDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopProdCategoryDTO.java @@ -84,8 +84,4 @@ public class ShopProdCategoryDTO implements Serializable { * 退菜是否退库存 1退菜退库存 2仅退菜不退库存 3每次询问-退菜后弹窗提示 */ private Integer refundMode; - /** - * 退菜是否退回库存 - */ - private Integer isRefundStock; } \ No newline at end of file diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java index 2d4b60630..e1151bd88 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java @@ -134,10 +134,6 @@ public class Product implements Serializable { * 是否上架 */ private Integer isSale; - /** - * 退款是否退回库存 - */ - private Integer isRefundStock; /** * 相关推荐 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdCategory.java b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdCategory.java index 2258b7511..53817ea95 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdCategory.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdCategory.java @@ -68,10 +68,6 @@ public class ShopProdCategory implements Serializable { * 状态 0-禁用 1-启用 */ private Integer status; - /** - * 退菜是否退回库存 - */ - private Integer isRefundStock; /** * 退菜是否退库存 1退菜退库存 2仅退菜不退库存 3每次询问-退菜后弹窗提示 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java index 7d798f769..8aeb99ee5 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java @@ -104,14 +104,6 @@ public interface ProductService extends IService { */ void markProductIsAutoSoldOut(Long shopId, ProductIsAutoSaleParam param); - /** - * 退货到库存 - * - * @param param 退货到库存参数 - */ - void refundToStock(ProdRefundToStockParam param); - - /** * 商品报损 * diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ShopProdCategoryService.java b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ShopProdCategoryService.java index c46101573..f1ca58709 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ShopProdCategoryService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ShopProdCategoryService.java @@ -83,8 +83,4 @@ public interface ShopProdCategoryService extends IService { */ void enableShopProdCategory(Long id); - /** - * 编辑店铺商品分类的退款库存开关 - */ - void upRefundStock(Long id,Integer isRefundStock); } \ No newline at end of file diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java index ab42bc563..0678fbef0 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java @@ -21,7 +21,6 @@ import com.czg.config.RedisCst; import com.czg.constant.MarketConstants; import com.czg.constant.TableValueConstant; import com.czg.constants.PayTypeConstants; -import com.czg.constants.SystemConstants; import com.czg.entity.notify.CzgRefundNotifyDTO; import com.czg.enums.ShopTableStatusEnum; import com.czg.enums.ShopUserFlowBizEnum; @@ -1841,7 +1840,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { */ @Override public void refundStock(ShopInfo shopInfo, Long orderId, Map products, boolean refundStock) { - List list = productService.list(new QueryWrapper().select(Product::getId, Product::getCategoryId, Product::getRefundMode, Product::getIsRefundStock) + List list = productService.list(new QueryWrapper().select(Product::getId, Product::getCategoryId, Product::getRefundMode) .eq(Product::getShopId, shopInfo.getId()) .in(Product::getId, products.keySet())); if (CollUtil.isEmpty(list)) { @@ -1855,7 +1854,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { //分类 if (!categoryMap.containsKey(product.getCategoryId())) { refundMode = shopProdCategoryService.getOneAs(new QueryWrapper().select(ShopProdCategory::getRefundMode) - .eq(ShopProdCategory::getShopId, shopInfo.getId()).eq(ShopProdCategory::getIsRefundStock, SystemConstants.OneZero.ONE) + .eq(ShopProdCategory::getShopId, shopInfo.getId()) .eq(ShopProdCategory::getId, product.getCategoryId()), Integer.class); if (refundMode == null) { refundMode = 2; @@ -1866,11 +1865,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { } } else if (shopInfo.getRefundMode().equals(2)) { //单商品 - if (product.getIsRefundStock().equals(SystemConstants.OneZero.ONE)) { - refundMode = product.getRefundMode(); - } else { - refundMode = 2; - } + refundMode = 2; } else { log.error("退菜模式错误 店铺{},退款模式{},商品Id{}分类Id{}", shopInfo.getShopName(), shopInfo.getRefundMode(), product.getId(), product.getCategoryId()); throw new CzgException("退菜模式错误"); diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java index 4a93a2d9a..14f5c0f4f 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java @@ -714,17 +714,6 @@ public class ProductServiceImpl extends ServiceImpl impl update(update, query().eq(Product::getId, param.getId()).eq(Product::getShopId, shopId)); } - @Override - public void refundToStock(ProdRefundToStockParam param) { - Long shopId = StpKit.USER.getShopId(0L); - Product entity = super.getOne(query().eq(Product::getId, param.getId()).eq(Product::getShopId, shopId)); - if (entity == null) { - throw new CzgException("商品不存在"); - } - entity.setIsRefundStock(param.getIsReturn()); - super.updateById(entity); - } - @Override @Transactional(rollbackFor = Exception.class) diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java index 958c5ce3b..067d830d2 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java @@ -148,15 +148,4 @@ public class ShopProdCategoryServiceImpl extends ServiceImpl