From 77571ccea24fac91a608edbf9b1e8af4997d75e3 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Mon, 15 Sep 2025 20:20:33 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=8E=BB=E6=8E=89=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=B8=AD=E5=A4=A7=E5=B0=8F=E7=A0=81=E5=8A=A0=E4=BB=B7?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/StoreCustomerController.java | 11 -------- .../controller/xkt/StoreMemberController.java | 3 --- .../xkt/StoreRoleAccountController.java | 10 +++++++ .../controller/xkt/StoreRoleController.java | 10 +++++++ .../xkt/StoreRoleMenuController.java | 12 +++++++++ .../StoreCusProdDiscountVO.java | 6 ++--- .../storeCustomer/StoreCusAddOverPriceVO.java | 27 ------------------- .../xkt/vo/storeCustomer/StoreCusVO.java | 3 --- .../vo/storeHomepage/StoreHomeProdResVO.java | 2 -- .../xkt/vo/storeProd/StoreProdCreateVO.java | 2 -- .../xkt/vo/storeProd/StoreProdPCResVO.java | 2 -- .../xkt/vo/storeProd/StoreProdResVO.java | 2 -- .../xkt/vo/storeProd/StoreProdUpdateVO.java | 2 -- .../xkt/vo/storeProd/StoreProdVO.java | 2 -- .../StoreProdColorPriceVO.java | 2 -- .../storeProdColorSize/StoreSaleSnResVO.java | 2 -- .../xkt/vo/storeSale/StoreSaleResVO.java | 2 -- .../ShopCartEditDetailResVO.java | 2 -- .../ShopCartToOrderResVO.java | 2 -- sql/ry_20240629.sql | 2 -- .../com/ruoyi/xkt/domain/StoreCustomer.java | 5 ---- .../com/ruoyi/xkt/domain/StoreProduct.java | 6 ----- .../StoreCusProdDiscountDTO.java | 2 -- .../StoreCusAddOverPriceDTO.java | 2 -- .../xkt/dto/storeCustomer/StoreCusDTO.java | 2 -- .../dto/storeCustomer/StoreCusPageResDTO.java | 2 -- .../storeHomepage/StoreHomeProdResDTO.java | 2 -- .../StoreProdColorPriceResDTO.java | 2 -- .../storeProdColorSize/StoreSaleSnResDTO.java | 2 -- .../xkt/dto/storeProduct/StoreProdDTO.java | 2 -- .../dto/storeProduct/StoreProdPCResDTO.java | 2 -- .../xkt/dto/storeProduct/StoreProdResDTO.java | 2 -- .../dto/storeProduct/StoreProdUpdateDTO.java | 2 -- .../xkt/dto/storeSale/StoreSaleResDTO.java | 2 -- .../xkt/service/IStoreCustomerService.java | 7 ----- .../impl/StoreCertificateServiceImpl.java | 2 +- ...oreCustomerProductDiscountServiceImpl.java | 1 - .../impl/StoreCustomerServiceImpl.java | 17 ------------ .../service/impl/StoreSaleServiceImpl.java | 4 +-- 39 files changed, 36 insertions(+), 136 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusAddOverPriceVO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerController.java index 5b71eb6a9..828d87e2b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerController.java @@ -6,11 +6,9 @@ import com.ruoyi.common.core.controller.XktBaseController; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.Page; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.web.controller.xkt.vo.storeCustomer.StoreCusAddOverPriceVO; import com.ruoyi.web.controller.xkt.vo.storeCustomer.StoreCusFuzzyResVO; import com.ruoyi.web.controller.xkt.vo.storeCustomer.StoreCusPageVO; import com.ruoyi.web.controller.xkt.vo.storeCustomer.StoreCusVO; -import com.ruoyi.xkt.dto.storeCustomer.StoreCusAddOverPriceDTO; import com.ruoyi.xkt.dto.storeCustomer.StoreCusDTO; import com.ruoyi.xkt.dto.storeCustomer.StoreCusPageDTO; import com.ruoyi.xkt.dto.storeCustomer.StoreCusPageResDTO; @@ -83,13 +81,4 @@ public class StoreCustomerController extends XktBaseController { return R.ok(BeanUtil.toBean(storeCusService.selectByStoreCusId(storeCusId), StoreCusVO.class)); } - @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()") - @Log(title = "修改大小码加价", businessType = BusinessType.UPDATE) - @ApiOperation(value = "修改大小码加价", httpMethod = "PUT", response = R.class) - @PutMapping("/add-over-price") - public R updateAddOverPrice(@Validated @RequestBody StoreCusAddOverPriceVO addOverPriceVO) { - return R.ok(storeCusService.updateAddOverPrice(BeanUtil.toBean(addOverPriceVO, StoreCusAddOverPriceDTO.class))); - } - - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreMemberController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreMemberController.java index f09efde25..273f5de1a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreMemberController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreMemberController.java @@ -6,11 +6,8 @@ import com.ruoyi.common.core.controller.XktBaseController; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.Page; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.web.controller.xkt.vo.store.StorePageVO; import com.ruoyi.web.controller.xkt.vo.storeMember.StoreMemberCreateVO; import com.ruoyi.web.controller.xkt.vo.storeMember.StoreMemberPageVO; -import com.ruoyi.xkt.dto.store.StorePageDTO; -import com.ruoyi.xkt.dto.store.StorePageResDTO; import com.ruoyi.xkt.dto.storeMember.StoreMemberCreateDTO; import com.ruoyi.xkt.dto.storeMember.StoreMemberPageDTO; import com.ruoyi.xkt.dto.storeMember.StoreMemberPageResDTO; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleAccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleAccountController.java index 6e59208c4..bbcc3e9ef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleAccountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleAccountController.java @@ -37,6 +37,16 @@ import java.util.List; * 获取档口子账号详情 *

* 停用/启用档口子账号 + *

+ * 新增档口子账号 + *

+ * 修改档口子账号 + *

+ * 获取档口子账号列表 + *

+ * 获取档口子账号详情 + *

+ * 停用/启用档口子账号 *//* @Api(tags = "档口子账号") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleController.java index 55ba29562..bba6e9586 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleController.java @@ -39,6 +39,16 @@ import java.util.List; * 获取档口子角色列表 *

* 停用/启用档口子角色 + *

+ * 新增档口子角色 + *

+ * 编辑档口子角色 + *

+ * 获取档口子角色详细信息 + *

+ * 获取档口子角色列表 + *

+ * 停用/启用档口子角色 *//* @Api(tags = "档口子角色") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleMenuController.java index b9337bc44..7dd095d12 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleMenuController.java @@ -34,6 +34,18 @@ import java.util.List; * 修改档口子角色菜单 *

* 删除档口子角色菜单 + *

+ * 查询档口子角色菜单列表 + *

+ * 导出档口子角色菜单列表 + *

+ * 获取档口子角色菜单详细信息 + *

+ * 新增档口子角色菜单 + *

+ * 修改档口子角色菜单 + *

+ * 删除档口子角色菜单 *//* @RestController diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdDiscountVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdDiscountVO.java index 58c36a49b..c1a529d5f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdDiscountVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdDiscountVO.java @@ -20,7 +20,8 @@ public class StoreCusProdDiscountVO { @ApiModelProperty(value = "档口ID", required = true) @NotNull(message = "档口ID不能为空!") private Long storeId; - @ApiModelProperty(value = "档口客户ID") + @ApiModelProperty(value = "档口客户ID", required = true) + @NotNull(message = "档口客户ID不能为空!") private Long storeCusId; @NotBlank(message = "客户名称不能为空!") @ApiModelProperty(value = "客户名称", required = true) @@ -30,8 +31,5 @@ public class StoreCusProdDiscountVO { @NotNull(message = "所有商品优惠金额不能为空!") @ApiModelProperty(value = "所有商品优惠金额", required = true) private Integer allProductDiscount; - @NotNull(message = "大小码加价不能为空!") - @ApiModelProperty(value = "大小码加价 0 不加 1加价", required = true) - private Integer addOverPrice; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusAddOverPriceVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusAddOverPriceVO.java deleted file mode 100644 index 4c5c24a9b..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusAddOverPriceVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.ruoyi.web.controller.xkt.vo.storeCustomer; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** - * @author liujiang - * @version v1.0 - * @date 2025/3/27 15:12 - */ -@Data -@ApiModel -public class StoreCusAddOverPriceVO { - - @NotNull(message = "档口ID不能为空!") - @ApiModelProperty(value = "档口ID", required = true) - private Long storeId; - @NotNull(message = "档口客户ID不可为空!") - @ApiModelProperty(value = "档口客户ID", required = true) - private Long storeCusId; - @NotNull(message = "是否大小码加价不为空!") - @ApiModelProperty(value = "是否大小码加价", required = true) - private Integer addOverPrice; -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusVO.java index 74364aa6c..7001cd01c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusVO.java @@ -29,9 +29,6 @@ public class StoreCusVO { @ApiModelProperty(value = "客户联系电话") @Pattern(regexp = "^1[3-9]\\d{9}$", message = "联系电话格式不正确，请输入有效的中国大陆手机号") private String phone; - @NotNull(message = "大小码加价不能为空!") - @ApiModelProperty(value = "大小码加价 0 不加 1加价", required = true) - private Integer addOverPrice; @ApiModelProperty(value = "备注") private String remark; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeProdResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeProdResVO.java index 2b60b9ac6..4a35e5483 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeProdResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeProdResVO.java @@ -99,8 +99,6 @@ public class StoreHomeProdResVO { private Date createTime; @ApiModelProperty(value = "商品标题") private String prodTitle; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "详情内容") private StoreProdDetailVO detail; @ApiModelProperty(value = "档口商品尺码库存列表") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java index 3945f092a..8bda00fdd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java @@ -50,8 +50,6 @@ public class StoreProdCreateVO { private BigDecimal prodWeight; @ApiModelProperty(value = "生产价格") private Integer producePrice; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "发货时效") private Integer deliveryTime; @ApiModelProperty(value = "上架方式:1 立即上架 2 定时上架", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPCResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPCResVO.java index ff85c1436..61548cfca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPCResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPCResVO.java @@ -30,8 +30,6 @@ public class StoreProdPCResVO { private Date createTime; @ApiModelProperty(value = "是否已收藏商品") private Boolean collectProd; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "颜色列表") private List colorList; @ApiModelProperty(value = "档口类目属性map") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java index ac018cc2e..8b19d7c19 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java @@ -38,8 +38,6 @@ public class StoreProdResVO { private BigDecimal prodWeight; @ApiModelProperty(value = "生产价格") private Integer producePrice; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "发货时效") private Integer deliveryTime; @ApiModelProperty(value = "上架方式 1 立即上架 2 定时上架") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdUpdateVO.java index 47aba68bd..a30a42b9f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdUpdateVO.java @@ -50,8 +50,6 @@ public class StoreProdUpdateVO { private BigDecimal prodWeight; @ApiModelProperty(value = "生产价格") private Integer producePrice; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "发货时效") private Integer deliveryTime; @ApiModelProperty(value = "上架方式:1 立即上架 2 定时上架", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java index be10af571..86ccbebcd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java @@ -50,8 +50,6 @@ public class StoreProdVO { private BigDecimal prodWeight; @ApiModelProperty(value = "生产价格") private Integer producePrice; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "发货时效") private Integer deliveryTime; @ApiModelProperty(value = "上架方式:1 立即上架 2 定时上架", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorPrice/StoreProdColorPriceVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorPrice/StoreProdColorPriceVO.java index 24e56d6ac..87f97a167 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorPrice/StoreProdColorPriceVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorPrice/StoreProdColorPriceVO.java @@ -27,8 +27,6 @@ public class StoreProdColorPriceVO { private String colorName; @ApiModelProperty(value = "档口商品颜色定价") private BigDecimal price; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "排序") private Integer orderNum; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnResVO.java index 70a3be01f..e22e94020 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnResVO.java @@ -34,8 +34,6 @@ public class StoreSaleSnResVO { private BigDecimal price; @ApiModelProperty(value = "档口客户优惠金额") private BigDecimal discount; - @ApiModelProperty(value = "大小码加价") - private BigDecimal overPrice; @ApiModelProperty(value = "标准尺码") private Integer standard; @ApiModelProperty(value = "[退货扫码时才有]销售时间") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java index a29aaad8f..8c49c03bc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java @@ -64,8 +64,6 @@ public class StoreSaleResVO { private String colorName; @ApiModelProperty(value = "尺码") private Integer size; - @ApiModelProperty(value = "大小码加价 0 不加 1加价") - private Integer addOverPrice; @ApiModelProperty(value = "商品货号") private String prodArtNum; @ApiModelProperty(value = "销售条码") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartEditDetailResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartEditDetailResVO.java index ed3ddd7d3..ab3137a17 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartEditDetailResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartEditDetailResVO.java @@ -22,8 +22,6 @@ public class ShopCartEditDetailResVO { private Long storeProdId; @ApiModelProperty(value = "商品货号") private String prodArtNum; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "档口商品尺码库存列表") private List colorList; @ApiModelProperty(value = "标准尺码") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartToOrderResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartToOrderResVO.java index 3e6246f0f..482e589df 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartToOrderResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartToOrderResVO.java @@ -22,8 +22,6 @@ public class ShopCartToOrderResVO { private Long storeProdId; @ApiModelProperty(value = "商品货号") private String prodArtNum; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "档口商品尺码库存列表") private List colorList; @ApiModelProperty(value = "标准尺码") diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index e176a937f..c5f717d51 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -3256,7 +3256,6 @@ CREATE TABLE `store_customer` `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '档口客户ID', `store_id` bigint UNSIGNED NOT NULL COMMENT '档口ID', `cus_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户名称', - `add_over_price` int UNSIGNED NOT NULL COMMENT '大小码加价 0不加 1加价', `all_prod_discount` decimal(10, 2) NULL DEFAULT NULL COMMENT '所有商品优惠金额', `phone` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户联系电话', `remark` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户备注', @@ -3374,7 +3373,6 @@ CREATE TABLE `store_product` `prod_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', `prod_weight` decimal(10, 2) NULL DEFAULT NULL COMMENT '商品重量', `produce_price` int UNSIGNED NULL DEFAULT NULL COMMENT '生产价格', - `over_price` int UNSIGNED NULL DEFAULT NULL COMMENT '大小码加价', `delivery_time` int UNSIGNED NULL DEFAULT NULL COMMENT '发货时效', `listing_way_schedule` datetime NULL DEFAULT NULL COMMENT '定时发货时间(精确到小时)', `voucher_date` date NOT NULL COMMENT '单据日期', diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCustomer.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCustomer.java index c8cfa539c..5a4422482 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCustomer.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCustomer.java @@ -58,11 +58,6 @@ public class StoreCustomer extends XktBaseEntity { */ private Integer allProdDiscount; - /** - * 大小码加价 0 不加 1加价 - */ - private Integer addOverPrice; - @Override public String toString() { diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java index 699e86283..64ff663bd 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java @@ -72,12 +72,6 @@ public class StoreProduct extends XktBaseEntity { @Excel(name = "生产价格") private BigDecimal producePrice; - /** - * 大小码加价 - */ - @Excel(name = "大小码加价") - private Integer overPrice; - /** * 发货时效 */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscountDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscountDTO.java index b373cdb16..864a5510e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscountDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscountDTO.java @@ -27,7 +27,5 @@ public class StoreCusProdDiscountDTO { private String phone; @ApiModelProperty(value = "所有商品优惠金额") private Integer allProductDiscount; - @ApiModelProperty(value = "大小码加价 0 不加 1加价") - private Integer addOverPrice; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusAddOverPriceDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusAddOverPriceDTO.java index 2e628f0bf..c63a5452e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusAddOverPriceDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusAddOverPriceDTO.java @@ -15,6 +15,4 @@ public class StoreCusAddOverPriceDTO { private Long storeId; @ApiModelProperty(value = "档口客户ID") private Long storeCusId; - @ApiModelProperty(value = "是否大小码加价") - private Integer addOverPrice; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusDTO.java index a6e5c5bbe..655b6ec2e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusDTO.java @@ -22,8 +22,6 @@ public class StoreCusDTO { private String cusName; @ApiModelProperty(value = "客户联系电话") private String phone; - @ApiModelProperty(value = "大小码加价 0 不加 1加价") - private Integer addOverPrice; @ApiModelProperty("备注") private String remark; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusPageResDTO.java index b753e0a59..47b991452 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusPageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusPageResDTO.java @@ -25,8 +25,6 @@ public class StoreCusPageResDTO { private String cusName; @ApiModelProperty(value = "客户联系电话") private String phone; - @ApiModelProperty(value = "大小码加价 0 不加 1加价") - private Integer addOverPrice; @ApiModelProperty("备注") private String remark; @ApiModelProperty("创建时间") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeProdResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeProdResDTO.java index eeab5a337..78874047b 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeProdResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeProdResDTO.java @@ -96,8 +96,6 @@ public class StoreHomeProdResDTO { private Date createTime; @ApiModelProperty(value = "商品标题") private String prodTitle; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "详情内容") private StoreProdDetailDTO detail; @ApiModelProperty(value = "档口商品尺码库存列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorPrice/StoreProdColorPriceResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorPrice/StoreProdColorPriceResDTO.java index eed055833..b3a4fbcee 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorPrice/StoreProdColorPriceResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorPrice/StoreProdColorPriceResDTO.java @@ -31,8 +31,6 @@ public class StoreProdColorPriceResDTO { private String colorName; @ApiModelProperty(value = "档口商品颜色最低售价") private BigDecimal price; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "排序") private Integer orderNum; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreSaleSnResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreSaleSnResDTO.java index 3438aad54..341c7620f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreSaleSnResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreSaleSnResDTO.java @@ -33,8 +33,6 @@ public class StoreSaleSnResDTO { private BigDecimal price; @ApiModelProperty(value = "档口客户优惠金额") private BigDecimal discount; - @ApiModelProperty(value = "大小码加价") - private BigDecimal overPrice; @ApiModelProperty(value = "标准尺码") private Integer standard; @ApiModelProperty(value = "[退货扫码时才有]销售时间") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java index 07fb51f20..5e16c5f7a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java @@ -43,8 +43,6 @@ public class StoreProdDTO { private BigDecimal prodWeight; @ApiModelProperty(value = "生产价格") private Integer producePrice; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "发货时效") private Integer deliveryTime; @ApiModelProperty(value = "上架方式:1 立即上架 2 定时上架") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java index e33d3ef5c..b24e66a7f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java @@ -34,8 +34,6 @@ public class StoreProdPCResDTO { private Date createTime; @ApiModelProperty(value = "是否已收藏商品") private Boolean collectProd; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "颜色列表") private List colorList; @ApiModelProperty(value = "档口类目属性map") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java index ce42dd447..d4b8ac654 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java @@ -44,8 +44,6 @@ public class StoreProdResDTO { private BigDecimal prodWeight; @ApiModelProperty(value = "生产价格") private Integer producePrice; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "发货时效") private Integer deliveryTime; @ApiModelProperty(value = "上架方式") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdUpdateDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdUpdateDTO.java index 9b7e5b77b..bf2fa68d7 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdUpdateDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdUpdateDTO.java @@ -52,8 +52,6 @@ public class StoreProdUpdateDTO { private BigDecimal prodWeight; @ApiModelProperty(value = "生产价格") private Integer producePrice; - @ApiModelProperty(value = "大小码加价") - private Integer overPrice; @ApiModelProperty(value = "发货时效") private Integer deliveryTime; @ApiModelProperty(value = "上架方式:1 立即上架 2 定时上架", required = true) diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java index 49c5402f1..e2cd77766 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java @@ -63,8 +63,6 @@ public class StoreSaleResDTO { private String colorName; @ApiModelProperty(value = "尺码") private Integer size; - @ApiModelProperty(value = "大小码加价 0 不加 1加价") - private Integer addOverPrice; @ApiModelProperty(value = "商品货号") private String prodArtNum; @ApiModelProperty(value = "销售条码") diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreCustomerService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreCustomerService.java index 6e1f8e283..a55cf9945 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreCustomerService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreCustomerService.java @@ -60,11 +60,4 @@ public interface IStoreCustomerService { */ List fuzzyQueryList(Long storeId, String cusName); - /** - * 更改是否大小码加价 - * - * @param addOverPriceDTO 入参 - * @return Integer - */ - Integer updateAddOverPrice(StoreCusAddOverPriceDTO addOverPriceDTO); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java index 712b405d5..f886a94ee 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java @@ -86,7 +86,7 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { // 新增档口 “现金客户” StoreCustomer storeCus = new StoreCustomer().setStoreId(store.getId()).setPhone(store.getContactPhone()) // 默认创建现金客户 - .setCusName(Constants.STORE_CUS_CASH).setAddOverPrice(0); + .setCusName(Constants.STORE_CUS_CASH); this.storeCusMapper.insert(storeCus); return count; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java index 444e5405a..1f7625d25 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java @@ -240,7 +240,6 @@ public class StoreCustomerProductDiscountServiceImpl implements IStoreCustomerPr storeCus.setPhone(cusProdDisDTO.getPhone()); storeCus.setStoreId(cusProdDisDTO.getStoreId()); storeCus.setAllProdDiscount(cusProdDisDTO.getAllProductDiscount()); - storeCus.setAddOverPrice(cusProdDisDTO.getAddOverPrice()); this.storeCusMapper.insert(storeCus); return storeCus; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerServiceImpl.java index b0a965b71..5bcda2638 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerServiceImpl.java @@ -56,23 +56,6 @@ public class StoreCustomerServiceImpl implements IStoreCustomerService { .map(x -> BeanUtil.toBean(x, StoreCusFuzzyResDTO.class).setStoreCusId(x.getId())).collect(Collectors.toList()); } - /** - * 更改是否大小码加价 - * - * @param addOverPriceDTO 入参 - * @return Integer - */ - @Override - @Transactional - public Integer updateAddOverPrice(StoreCusAddOverPriceDTO addOverPriceDTO) { - StoreCustomer storeCus = Optional.ofNullable(this.storeCusMapper.selectOne(new LambdaQueryWrapper() - .eq(StoreCustomer::getStoreId, addOverPriceDTO.getStoreId()).eq(StoreCustomer::getId, addOverPriceDTO.getStoreCusId()) - .eq(StoreCustomer::getDelFlag, Constants.UNDELETED))) - .orElseThrow(() -> new ServiceException("档口客户不存在!", HttpStatus.ERROR)); - storeCus.setAddOverPrice(addOverPriceDTO.getAddOverPrice()); - return this.storeCusMapper.updateById(storeCus); - } - @Override @Transactional public int create(StoreCusDTO storeCusDTO) { diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleServiceImpl.java index 42661c636..1a403463d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleServiceImpl.java @@ -387,9 +387,7 @@ public class StoreSaleServiceImpl implements IStoreSaleService { .eq(StoreSaleDetail::getStoreSaleId, storeSaleId).eq(StoreSaleDetail::getDelFlag, Constants.UNDELETED)); List storeProdList = this.storeProdMapper.selectByIds(saleDetailList.stream().map(StoreSaleDetail::getStoreProdId).collect(Collectors.toList())); Map storeProdMap = storeProdList.stream().collect(Collectors.toMap(StoreProduct::getId, x -> x)); - storeSaleDTO.setDetailList(saleDetailList.stream().map(x -> BeanUtil.toBean(x, StoreSaleResDTO.SSDetailDTO.class) - .setAddOverPrice(ObjectUtils.isNotEmpty(storeProdMap.get(x.getStoreProdId())) ? storeProdMap.get(x.getStoreProdId()).getOverPrice() : 0)) - .collect(Collectors.toList())); + storeSaleDTO.setDetailList(saleDetailList.stream().map(x -> BeanUtil.toBean(x, StoreSaleResDTO.SSDetailDTO.class)).collect(Collectors.toList())); return storeSaleDTO; }