master:更改model的主键名称;

pull/1121/head
liujiang 2025-03-29 17:18:03 +08:00
parent 6e80cc3880
commit 9046a31afc
173 changed files with 1219 additions and 1074 deletions

View File

@ -1,15 +1,20 @@
package com.ruoyi.web.controller.xkt;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.web.controller.xkt.vo.storeProdBarcodeMatch.BarcodeMatchVO;
import com.ruoyi.xkt.domain.StoreProductBarcodeMatch;
import com.ruoyi.xkt.dto.storeProdBarcodeMatch.BarcodeMatchDTO;
import com.ruoyi.xkt.service.IStoreProductBarcodeMatchService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@ -22,10 +27,23 @@ import java.util.List;
* @date 2025-03-26
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/rest/v1/barcode-matches")
public class StoreProductBarcodeMatchController extends XktBaseController {
@Autowired
private IStoreProductBarcodeMatchService storeProductBarcodeMatchService;
final IStoreProductBarcodeMatchService barcodeMatchService;
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:match:edit')")
@Log(title = "档口条形码和第三方系统条形码匹配结果", businessType = BusinessType.UPDATE)
@PutMapping
public R updateBarcodeMatch(@Validated @RequestBody BarcodeMatchVO barcodeMatchVO) {
return success(barcodeMatchService.updateBarcodeMatch(BeanUtil.toBean(barcodeMatchVO, BarcodeMatchDTO.class)));
}
/**
*
@ -34,7 +52,7 @@ public class StoreProductBarcodeMatchController extends XktBaseController {
@GetMapping("/list")
public TableDataInfo list(StoreProductBarcodeMatch storeProductBarcodeMatch) {
startPage();
List<StoreProductBarcodeMatch> list = storeProductBarcodeMatchService.selectStoreProductBarcodeMatchList(storeProductBarcodeMatch);
List<StoreProductBarcodeMatch> list = barcodeMatchService.selectStoreProductBarcodeMatchList(storeProductBarcodeMatch);
return getDataTable(list);
}
@ -45,7 +63,7 @@ public class StoreProductBarcodeMatchController extends XktBaseController {
@Log(title = "档口条形码和第三方系统条形码匹配结果", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, StoreProductBarcodeMatch storeProductBarcodeMatch) {
List<StoreProductBarcodeMatch> list = storeProductBarcodeMatchService.selectStoreProductBarcodeMatchList(storeProductBarcodeMatch);
List<StoreProductBarcodeMatch> list = barcodeMatchService.selectStoreProductBarcodeMatchList(storeProductBarcodeMatch);
ExcelUtil<StoreProductBarcodeMatch> util = new ExcelUtil<StoreProductBarcodeMatch>(StoreProductBarcodeMatch.class);
util.exportExcel(response, list, "档口条形码和第三方系统条形码匹配结果数据");
}
@ -56,7 +74,7 @@ public class StoreProductBarcodeMatchController extends XktBaseController {
@PreAuthorize("@ss.hasPermi('system:match:query')")
@GetMapping(value = "/{storeProdBarcodeMatchId}")
public R getInfo(@PathVariable("storeProdBarcodeMatchId") Long storeProdBarcodeMatchId) {
return success(storeProductBarcodeMatchService.selectStoreProductBarcodeMatchByStoreProdBarcodeMatchId(storeProdBarcodeMatchId));
return success(barcodeMatchService.selectStoreProductBarcodeMatchByStoreProdBarcodeMatchId(storeProdBarcodeMatchId));
}
/**
@ -66,17 +84,7 @@ public class StoreProductBarcodeMatchController extends XktBaseController {
@Log(title = "档口条形码和第三方系统条形码匹配结果", businessType = BusinessType.INSERT)
@PostMapping
public R add(@RequestBody StoreProductBarcodeMatch storeProductBarcodeMatch) {
return success(storeProductBarcodeMatchService.insertStoreProductBarcodeMatch(storeProductBarcodeMatch));
}
/**
*
*/
@PreAuthorize("@ss.hasPermi('system:match:edit')")
@Log(title = "档口条形码和第三方系统条形码匹配结果", businessType = BusinessType.UPDATE)
@PutMapping
public R edit(@RequestBody StoreProductBarcodeMatch storeProductBarcodeMatch) {
return success(storeProductBarcodeMatchService.updateStoreProductBarcodeMatch(storeProductBarcodeMatch));
return success(barcodeMatchService.insertStoreProductBarcodeMatch(storeProductBarcodeMatch));
}
/**
@ -86,6 +94,6 @@ public class StoreProductBarcodeMatchController extends XktBaseController {
@Log(title = "档口条形码和第三方系统条形码匹配结果", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdBarcodeMatchIds}")
public R remove(@PathVariable Long[] storeProdBarcodeMatchIds) {
return success(storeProductBarcodeMatchService.deleteStoreProductBarcodeMatchByStoreProdBarcodeMatchIds(storeProdBarcodeMatchIds));
return success(barcodeMatchService.deleteStoreProductBarcodeMatchByStoreProdBarcodeMatchIds(storeProdBarcodeMatchIds));
}
}

View File

@ -10,10 +10,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.web.controller.xkt.vo.storePordColor.StoreProdColorResVO;
import com.ruoyi.web.controller.xkt.vo.storeProd.*;
import com.ruoyi.xkt.domain.StoreProduct;
import com.ruoyi.xkt.dto.storeProduct.StoreProdDTO;
import com.ruoyi.xkt.dto.storeProduct.StoreProdPageDTO;
import com.ruoyi.xkt.dto.storeProduct.StoreProdPageResDTO;
import com.ruoyi.xkt.dto.storeProduct.StoreProdStatusDTO;
import com.ruoyi.xkt.dto.storeProduct.*;
import com.ruoyi.xkt.service.IStoreProductService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -47,7 +44,7 @@ public class StoreProductController extends XktBaseController {
@GetMapping(value = "/fuzzy")
public R fuzzyQueryColorList(@RequestParam(value = "prodArtNum", required = false) String prodArtNum,
@RequestParam("storeId") Long storeId) {
return success(BeanUtil.copyToList(storeProdService.fuzzyQueryList(storeId, prodArtNum), String.class));
return success(BeanUtil.copyToList(storeProdService.fuzzyQueryList(storeId, prodArtNum), StoreProdFuzzyResVO.class));
}
/**

View File

@ -1,29 +0,0 @@
package com.ruoyi.web.controller.xkt.vo.storePordColor;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("档口商品当前颜色")
@Data
public class StoreProdColorVO {
@NotNull(message = "档口颜色ID不能为空!")
@ApiModelProperty(name = "档口颜色ID")
private Long storeColorId;
@NotBlank(message = "颜色名称不能为空!")
@ApiModelProperty(name = "颜色名称")
private String colorName;
@NotNull(message = "排序不能为空!")
@ApiModelProperty(name = "排序")
private Integer orderNum;
}

View File

@ -0,0 +1,41 @@
package com.ruoyi.web.controller.xkt.vo.storeProd;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.util.List;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("一键迁移条码时输入货号查询列表")
@Data
@Builder
@Accessors(chain = true)
public class StoreProdFuzzyResVO {
@ApiModelProperty("档口商品ID")
private Long storeProdId;
@ApiModelProperty("档口ID")
private Long storeId;
@ApiModelProperty(name = "商品货号")
private String prodArtNum;
@ApiModelProperty("商品下颜色列表")
private List<StoreProdFuzzyColorResVO> colorList;
@Data
public static class StoreProdFuzzyColorResVO {
@ApiModelProperty("档口颜色ID")
private Long storeColorId;
@ApiModelProperty("颜色名称")
private String colorName;
}
}

View File

@ -2,20 +2,11 @@ package com.ruoyi.web.controller.xkt.vo.storeProd;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.web.controller.xkt.vo.storeColor.StoreColorVO;
import com.ruoyi.web.controller.xkt.vo.storePordColor.StoreProdColorVO;
import com.ruoyi.web.controller.xkt.vo.storeProdCateAttr.StoreProdCateAttrVO;
import com.ruoyi.web.controller.xkt.vo.storeProdColorPrice.StoreProdColorPriceVO;
import com.ruoyi.web.controller.xkt.vo.storeProdDetail.StoreProdDetailVO;
import com.ruoyi.web.controller.xkt.vo.storeProdProcess.StoreProdProcessVO;
import com.ruoyi.web.controller.xkt.vo.storeProdSvc.StoreProdSvcVO;
import com.ruoyi.web.controller.xkt.vo.storeProductFile.StoreProdFileResVO;
import com.ruoyi.web.controller.xkt.vo.storeProductFile.StoreProdFileVO;
import com.ruoyi.xkt.dto.storeColor.StoreColorDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
@ -58,7 +49,7 @@ public class StoreProdResVO {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date listingWaySchedule;
@ApiModelProperty(name = "档口文件列表")
private List<StoreProdFileResVO> fileList;
private List<StoreProdFileVO> fileList;
@ApiModelProperty(name = "档口类目属性列表")
private List<StoreProdCateAttrVO> cateAttrList;
@ApiModelProperty(name = "档口宿友颜色列表")
@ -74,4 +65,133 @@ public class StoreProdResVO {
@ApiModelProperty(name = "档口商品生产工艺")
private StoreProdProcessVO process;
@Data
public static class StoreProdFileVO {
@NotBlank(message = "文件名称不能为空!")
@ApiModelProperty(name = "文件名称")
private String fileName;
@NotBlank(message = "文件路径不能为空!")
@ApiModelProperty(name = "文件路径")
private String fileUrl;
@NotNull(message = "文件大小不能为空!")
@ApiModelProperty(name = "文件大小")
private BigDecimal fileSize;
@NotBlank(message = "文件类型不能为空!")
@ApiModelProperty(name = "文件类型")
private String fileType;
@ApiModelProperty(name = "排序")
@NotNull(message = "排序不能为空!")
private Integer orderNum;
}
@Data
public static class StoreProdCateAttrVO {
@ApiModelProperty(name = "系统设置类目")
private String dictType;
@ApiModelProperty(name = "系统设置类目值")
private String dictValue;
}
@Data
public static class StoreProdColorVO {
@NotNull(message = "档口颜色ID不能为空!")
@ApiModelProperty(name = "档口颜色ID")
private Long storeColorId;
@NotBlank(message = "颜色名称不能为空!")
@ApiModelProperty(name = "颜色名称")
private String colorName;
@NotNull(message = "排序不能为空!")
@ApiModelProperty(name = "排序")
private Integer orderNum;
}
@Data
public static class StoreProdColorSizeVO {
@NotNull(message = "档口颜色ID不能为空!")
@ApiModelProperty(name = "档口颜色ID")
private Long storeColorId;
@ApiModelProperty(name = "商品尺码")
@NotNull(message = "档口商品定价不能为空!")
private Integer size;
@NotBlank(message = "是否是标准尺码不能为空!")
@ApiModelProperty(name = "是否是标准尺码")
private String standard;
}
@Data
public static class StoreProdColorPriceVO {
@NotNull(message = "档口商品颜色ID不能为空!")
@ApiModelProperty(name = "档口商品颜色ID")
private Long storeColorId;
@NotNull(message = "档口商品定价不能为空!")
@ApiModelProperty(name = "档口商品定价")
private BigDecimal price;
}
@Data
public static class StoreProdSvcVO {
@ApiModelProperty(name = "大小码及定制款可退")
private String customRefund;
@ApiModelProperty(name = "30天包退")
private String thirtyDayRefund;
@ApiModelProperty(name = "一件起批")
private String oneBatchSale;
@ApiModelProperty(name = "退款72小时到账")
private String refundWithinThreeDay;
}
@Data
public static class StoreProdDetailVO {
@NotBlank(message = "详情内容不能为空!")
@ApiModelProperty(name = "详情内容")
private String detail;
}
@Data
public static class StoreProdProcessVO {
@ApiModelProperty(name = "鞋型")
private String shoeType;
@ApiModelProperty(name = "楦号")
private String shoeSize;
@ApiModelProperty(name = "主皮")
private String mainSkin;
@ApiModelProperty(name = "主皮用量")
private String mainSkinUsage;
@ApiModelProperty(name = "配皮")
private String matchSkin;
@ApiModelProperty(name = "配皮用量")
private String matchSkinUsage;
@ApiModelProperty(name = "领口")
private String neckline;
@ApiModelProperty(name = "膛底")
private String insole;
@ApiModelProperty(name = "扣件/拉头")
private String fastener;
@ApiModelProperty(name = "辅料")
private String shoeAccessories;
@ApiModelProperty(name = "包头")
private String toeCap;
@ApiModelProperty(name = "包边")
private String edgeBinding;
@ApiModelProperty(name = "中大底")
private String midOutsole;
@ApiModelProperty(name = "防水台")
private String platformSole;
@ApiModelProperty(name = "中底厂家编码")
private String midsoleFactoryCode;
@ApiModelProperty(name = "外底厂家编码")
private String outsoleFactoryCode;
@ApiModelProperty(name = "跟厂编码")
private String heelFactoryCode;
@ApiModelProperty(name = "配料")
private String components;
@ApiModelProperty(name = "第二底料")
private String secondSoleMaterial;
@ApiModelProperty(name = "第二配料")
private String secondUpperMaterial;
@ApiModelProperty(name = "自定义")
private String customAttr;
}
}

View File

@ -2,14 +2,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProd;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.web.controller.xkt.vo.storePordColor.StoreProdColorVO;
import com.ruoyi.web.controller.xkt.vo.storeProdCateAttr.StoreProdCateAttrVO;
import com.ruoyi.web.controller.xkt.vo.storeProdColorPrice.StoreProdColorPriceVO;
import com.ruoyi.web.controller.xkt.vo.storeProdColorSize.StoreProdColorSizeVO;
import com.ruoyi.web.controller.xkt.vo.storeProdDetail.StoreProdDetailVO;
import com.ruoyi.web.controller.xkt.vo.storeProdProcess.StoreProdProcessVO;
import com.ruoyi.web.controller.xkt.vo.storeProdSvc.StoreProdSvcVO;
import com.ruoyi.web.controller.xkt.vo.storeProductFile.StoreProdFileVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -96,4 +88,132 @@ public class StoreProdVO {
@ApiModelProperty(name = "档口生产工艺")
private StoreProdProcessVO process;
@Data
public static class StoreProdFileVO {
@NotBlank(message = "文件名称不能为空!")
@ApiModelProperty(name = "文件名称")
private String fileName;
@NotBlank(message = "文件路径不能为空!")
@ApiModelProperty(name = "文件路径")
private String fileUrl;
@NotNull(message = "文件大小不能为空!")
@ApiModelProperty(name = "文件大小")
private BigDecimal fileSize;
@NotBlank(message = "文件类型不能为空!")
@ApiModelProperty(name = "文件类型")
private String fileType;
@ApiModelProperty(name = "排序")
@NotNull(message = "排序不能为空!")
private Integer orderNum;
}
@Data
public static class StoreProdCateAttrVO {
@ApiModelProperty(name = "系统设置类目")
private String dictType;
@ApiModelProperty(name = "系统设置类目值")
private String dictValue;
}
@Data
public static class StoreProdColorVO {
@NotNull(message = "档口颜色ID不能为空!")
@ApiModelProperty(name = "档口颜色ID")
private Long storeColorId;
@NotBlank(message = "颜色名称不能为空!")
@ApiModelProperty(name = "颜色名称")
private String colorName;
@NotNull(message = "排序不能为空!")
@ApiModelProperty(name = "排序")
private Integer orderNum;
}
@Data
public static class StoreProdColorSizeVO {
@NotNull(message = "档口颜色ID不能为空!")
@ApiModelProperty(name = "档口颜色ID")
private Long storeColorId;
@ApiModelProperty(name = "商品尺码")
@NotNull(message = "档口商品定价不能为空!")
private Integer size;
@NotBlank(message = "是否是标准尺码不能为空!")
@ApiModelProperty(name = "是否是标准尺码")
private String standard;
}
@Data
public static class StoreProdColorPriceVO {
@NotNull(message = "档口商品颜色ID不能为空!")
@ApiModelProperty(name = "档口商品颜色ID")
private Long storeColorId;
@NotNull(message = "档口商品定价不能为空!")
@ApiModelProperty(name = "档口商品定价")
private BigDecimal price;
}
@Data
public static class StoreProdSvcVO {
@ApiModelProperty(name = "大小码及定制款可退")
private String customRefund;
@ApiModelProperty(name = "30天包退")
private String thirtyDayRefund;
@ApiModelProperty(name = "一件起批")
private String oneBatchSale;
@ApiModelProperty(name = "退款72小时到账")
private String refundWithinThreeDay;
}
@Data
public static class StoreProdDetailVO {
@NotBlank(message = "详情内容不能为空!")
@ApiModelProperty(name = "详情内容")
private String detail;
}
@Data
public static class StoreProdProcessVO {
@ApiModelProperty(name = "鞋型")
private String shoeType;
@ApiModelProperty(name = "楦号")
private String shoeSize;
@ApiModelProperty(name = "主皮")
private String mainSkin;
@ApiModelProperty(name = "主皮用量")
private String mainSkinUsage;
@ApiModelProperty(name = "配皮")
private String matchSkin;
@ApiModelProperty(name = "配皮用量")
private String matchSkinUsage;
@ApiModelProperty(name = "领口")
private String neckline;
@ApiModelProperty(name = "膛底")
private String insole;
@ApiModelProperty(name = "扣件/拉头")
private String fastener;
@ApiModelProperty(name = "辅料")
private String shoeAccessories;
@ApiModelProperty(name = "包头")
private String toeCap;
@ApiModelProperty(name = "包边")
private String edgeBinding;
@ApiModelProperty(name = "中大底")
private String midOutsole;
@ApiModelProperty(name = "防水台")
private String platformSole;
@ApiModelProperty(name = "中底厂家编码")
private String midsoleFactoryCode;
@ApiModelProperty(name = "外底厂家编码")
private String outsoleFactoryCode;
@ApiModelProperty(name = "跟厂编码")
private String heelFactoryCode;
@ApiModelProperty(name = "配料")
private String components;
@ApiModelProperty(name = "第二底料")
private String secondSoleMaterial;
@ApiModelProperty(name = "第二配料")
private String secondUpperMaterial;
@ApiModelProperty(name = "自定义")
private String customAttr;
}
}

View File

@ -0,0 +1,53 @@
package com.ruoyi.web.controller.xkt.vo.storeProdBarcodeMatch;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("档口商品条码匹配")
@Data
public class BarcodeMatchVO {
@NotNull(message = "档口商品ID不能为空")
@ApiModelProperty("档口商品ID")
private Long storeProdId;
@ApiModelProperty("档口ID")
@NotNull(message = "档口ID不能为空")
private Long storeId;
@ApiModelProperty("与第三方系统匹配规则")
@NotNull(message = "与第三方系统匹配规则不能为空")
@Valid
List<BarcodeMatchColorVO> colorList;
@Data
public static class BarcodeMatchColorVO {
@NotNull(message = "颜色ID不能为空")
@ApiModelProperty("档口颜色ID")
private Long storeColorId;
@ApiModelProperty("颜色尺码ID列表")
@NotNull(message = "颜色尺码ID列表不能为空")
@Valid
List<BarcodeMatchSizeVO> sizeList;
}
@Data
public static class BarcodeMatchSizeVO {
@NotNull(message = "尺码不能为空")
@ApiModelProperty("尺码")
private Integer size;
@NotBlank(message = "条码不能为空")
@ApiModelProperty("条码")
private String barcode;
}
}

View File

@ -1,23 +0,0 @@
package com.ruoyi.web.controller.xkt.vo.storeProdCateAttr;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("档口商品类目属性")
@Data
public class StoreProdCateAttrVO {
@ApiModelProperty(name = "系统设置类目")
private String dictType;
@ApiModelProperty(name = "系统设置类目值")
private String dictValue;
}

View File

@ -1,27 +0,0 @@
package com.ruoyi.web.controller.xkt.vo.storeProdColorPrice;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("档口商品当前颜色")
@Data
public class StoreProdColorPriceVO {
@NotNull(message = "档口商品颜色ID不能为空!")
@ApiModelProperty(name = "档口商品颜色ID")
private Long storeColorId;
@NotNull(message = "档口商品定价不能为空!")
@ApiModelProperty(name = "档口商品定价")
private BigDecimal price;
}

View File

@ -1,30 +0,0 @@
package com.ruoyi.web.controller.xkt.vo.storeProdColorSize;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("档口商品当前尺码")
@Data
public class StoreProdColorSizeVO {
@NotNull(message = "档口颜色ID不能为空!")
@ApiModelProperty(name = "档口颜色ID")
private Long storeColorId;
@ApiModelProperty(name = "商品尺码")
@NotNull(message = "档口商品定价不能为空!")
private Integer size;
@NotBlank(message = "是否是标准尺码不能为空!")
@ApiModelProperty(name = "是否是标准尺码")
private String standard;
}

View File

@ -1,22 +0,0 @@
package com.ruoyi.web.controller.xkt.vo.storeProdDetail;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("档口商品当前颜色")
@Data
public class StoreProdDetailVO {
@NotBlank(message = "详情内容不能为空!")
@ApiModelProperty(name = "详情内容")
private String detail;
}

View File

@ -1,61 +0,0 @@
package com.ruoyi.web.controller.xkt.vo.storeProdProcess;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("档口商品工艺信息")
@Data
public class StoreProdProcessVO {
@ApiModelProperty(name = "档口商品ID")
private Long storeProdId;
@ApiModelProperty(name = "鞋型")
private String shoeType;
@ApiModelProperty(name = "楦号")
private String shoeSize;
@ApiModelProperty(name = "主皮")
private String mainSkin;
@ApiModelProperty(name = "主皮用量")
private String mainSkinUsage;
@ApiModelProperty(name = "配皮")
private String matchSkin;
@ApiModelProperty(name = "配皮用量")
private String matchSkinUsage;
@ApiModelProperty(name = "领口")
private String neckline;
@ApiModelProperty(name = "膛底")
private String insole;
@ApiModelProperty(name = "扣件/拉头")
private String fastener;
@ApiModelProperty(name = "辅料")
private String shoeAccessories;
@ApiModelProperty(name = "包头")
private String toeCap;
@ApiModelProperty(name = "包边")
private String edgeBinding;
@ApiModelProperty(name = "中大底")
private String midOutsole;
@ApiModelProperty(name = "防水台")
private String platformSole;
@ApiModelProperty(name = "中底厂家编码")
private String midsoleFactoryCode;
@ApiModelProperty(name = "外底厂家编码")
private String outsoleFactoryCode;
@ApiModelProperty(name = "跟厂编码")
private String heelFactoryCode;
@ApiModelProperty(name = "配料")
private String components;
@ApiModelProperty(name = "第二底料")
private String secondSoleMaterial;
@ApiModelProperty(name = "第二配料")
private String secondUpperMaterial;
@ApiModelProperty(name = "自定义")
private String customAttr;
}

View File

@ -1,26 +0,0 @@
package com.ruoyi.web.controller.xkt.vo.storeProdSvc;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("档口商品当前颜色")
@Data
public class StoreProdSvcVO {
@ApiModelProperty(name = "大小码及定制款可退")
private String customRefund;
@ApiModelProperty(name = "30天包退")
private String thirtyDayRefund;
@ApiModelProperty(name = "一件起批")
private String oneBatchSale;
@ApiModelProperty(name = "退款72小时到账")
private String refundWithinThreeDay;
}

View File

@ -1,35 +0,0 @@
package com.ruoyi.web.controller.xkt.vo.storeProductFile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("档口商品文件")
@Data
public class StoreProdFileResVO {
@ApiModelProperty("档口商品名称")
private Long storeProdId;
@ApiModelProperty(name = "系统文件ID")
private Long fileId;
@ApiModelProperty(name = "文件路径")
private String fileUrl;
@ApiModelProperty(name = "文件类型")
private String fileType;
@ApiModelProperty(name = "文件名称")
private String fileName;
@ApiModelProperty(name = "文件大小")
private BigDecimal fileSize;
@ApiModelProperty(name = "排序")
private Integer orderNum;
}

View File

@ -1,36 +0,0 @@
package com.ruoyi.web.controller.xkt.vo.storeProductFile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("档口商品文件")
@Data
public class StoreProdFileVO {
@NotBlank(message = "文件名称不能为空!")
@ApiModelProperty(name = "文件名称")
private String fileName;
@NotBlank(message = "文件路径不能为空!")
@ApiModelProperty(name = "文件路径")
private String fileUrl;
@NotNull(message = "文件大小不能为空!")
@ApiModelProperty(name = "文件大小")
private BigDecimal fileSize;
@NotBlank(message = "文件类型不能为空!")
@ApiModelProperty(name = "文件类型")
private String fileType;
@ApiModelProperty(name = "排序")
@NotNull(message = "排序不能为空!")
private Integer orderNum;
}

View File

@ -26,7 +26,7 @@ public class PictureSearch extends XktBaseEntity {
* ID
*/
@TableId
private Long picSearchId;
private Long id;
/**
* ID
@ -51,7 +51,7 @@ public class PictureSearch extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("picSearchId", getPicSearchId())
.append("id", getId())
.append("searchFileId", getSearchFileId())
.append("userId", getUserId())
.append("voucherDate", getVoucherDate())

View File

@ -23,7 +23,7 @@ public class PictureSearchHot extends XktBaseEntity {
* ID
*/
@TableId
private Long picSearchHotId;
private Long id;
/**
* store_prod_file.id
@ -53,7 +53,7 @@ public class PictureSearchHot extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("picSearchHotId", getPicSearchHotId())
.append("id", getId())
.append("storeProdFileId", getStoreProdFileId())
.append("fileId", getFileId())
.append("storeId", getStoreId())

View File

@ -25,7 +25,7 @@ public class PictureSearchResult extends XktBaseEntity {
* ID
*/
@TableId
private Long picSearchResId;
private Long id;
/**
* ID
@ -61,7 +61,7 @@ public class PictureSearchResult extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("picSearchResId", getPicSearchResId())
.append("id", getId())
.append("picSearchId", getPicSearchId())
.append("fileId", getFileId())
.append("categoryId", getCategoryId())

View File

@ -27,7 +27,7 @@ public class Store extends XktBaseEntity {
* ID
*/
@TableId
private Long storeId;
private Long id;
/**
* ID
@ -148,7 +148,7 @@ public class Store extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeId", getStoreId())
.append("id", getId())
.append("userId", getUserId())
.append("storeName", getStoreName())
.append("brandName", getBrandName())

View File

@ -26,7 +26,7 @@ public class StoreCertificate extends XktBaseEntity {
* ID
*/
@TableId
private Long storeCertId;
private Long id;
/**
* store.id
@ -168,7 +168,7 @@ public class StoreCertificate extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeCertId", getStoreCertId())
.append("id", getId())
.append("storeId", getStoreId())
.append("realName", getRealName())
.append("phone", getPhone())

View File

@ -23,7 +23,7 @@ public class StoreColor extends XktBaseEntity {
* ID
*/
@TableId
private Long storeColorId;
private Long id;
/**
* ID
@ -47,7 +47,7 @@ public class StoreColor extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeColorId", getStoreColorId())
.append("id", getId())
.append("storeId", getStoreId())
.append("colorName", getColorName())
.append("orderNum", getOrderNum())

View File

@ -23,7 +23,7 @@ public class StoreCustomer extends XktBaseEntity {
* ID
*/
@TableId
private Long storeCusId;
private Long id;
/**
* ID
@ -47,7 +47,7 @@ public class StoreCustomer extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeCusId", getStoreCusId())
.append("id", getId())
.append("storeId", getStoreId())
.append("cusName", getCusName())
.append("phone", getPhone())

View File

@ -25,7 +25,7 @@ public class StoreCustomerProductDiscount extends XktBaseEntity {
* ID
*/
@TableId
private Long storeCusProdDiscId;
private Long id;
/**
* ID
@ -55,7 +55,7 @@ public class StoreCustomerProductDiscount extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeCusProdDiscId", getStoreCusProdDiscId())
.append("id", getId())
.append("storeProdId", getStoreProdId())
.append("storeCusId", getStoreCusId())
.append("storeProdColorId", getStoreProdColorId())

View File

@ -23,7 +23,7 @@ public class StoreFactory extends XktBaseEntity {
* ID
*/
@TableId
private Long storeFacId;
private Long id;
/**
* store.id
@ -59,7 +59,7 @@ public class StoreFactory extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeFacId", getStoreFacId())
.append("id", getId())
.append("storeId", getStoreId())
.append("facName", getFacName())
.append("facAddress", getFacAddress())

View File

@ -23,7 +23,7 @@ public class StoreHomepage extends XktBaseEntity {
* ID
*/
@TableId
private Long storeHomeId;
private Long id;
/**
* ID
@ -53,7 +53,7 @@ public class StoreHomepage extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeHomeId", getStoreHomeId())
.append("id", getId())
.append("storeId", getStoreId())
.append("type", getType())
.append("fileId", getFileId())

View File

@ -27,7 +27,7 @@ public class StoreOrder extends XktBaseEntity {
* ID
*/
@TableId
private Long storeOrderId;
private Long id;
/**
* id
@ -124,7 +124,7 @@ public class StoreOrder extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeOrderId", getStoreOrderId())
.append("id", getId())
.append("storeId", getStoreId())
.append("userId", getUserId())
.append("code", getCode())

View File

@ -25,7 +25,7 @@ public class StoreOrderDetail extends XktBaseEntity {
* ID
*/
@TableId
private Long storeOrderDetailId;
private Long id;
/**
* ID
@ -85,7 +85,7 @@ public class StoreOrderDetail extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeOrderDetailId", getStoreOrderDetailId())
.append("id", getId())
.append("storeOrderId", getStoreOrderId())
.append("storeOrderDetailRefundId", getStoreOrderDetailRefundId())
.append("storeProdColorSizeId", getStoreProdColorSizeId())

View File

@ -25,7 +25,7 @@ public class StoreOrderExpress extends XktBaseEntity {
* ID
*/
@TableId
private Long storeOrderExprId;
private Long id;
/**
* ID
@ -79,7 +79,7 @@ public class StoreOrderExpress extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeOrderExprId", getStoreOrderExprId())
.append("id", getId())
.append("storeOrderDetailId", getStoreOrderDetailId())
.append("storeOrderId", getStoreOrderId())
.append("storeId", getStoreId())

View File

@ -23,7 +23,7 @@ public class StoreOrderReceive extends XktBaseEntity {
*
*/
@TableId
private Long storeOrderRcvId;
private Long id;
/**
* ID
@ -77,7 +77,7 @@ public class StoreOrderReceive extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeOrderRcvId", getStoreOrderRcvId())
.append("id", getId())
.append("storeOrderId", getStoreOrderId())
.append("sysUserAddressId", getSysUserAddressId())
.append("receiveName", getReceiveName())

View File

@ -29,7 +29,7 @@ public class StoreProduct extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdId;
private Long id;
/**
* ID
@ -125,7 +125,7 @@ public class StoreProduct extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdId", getStoreProdId())
.append("id", getId())
.append("prodName", getProdName())
.append("prodCateId", getProdCateId())
.append("factoryArtNum", getFactoryArtNum())

View File

@ -23,7 +23,7 @@ public class StoreProductBarcodeMatch extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdBarcodeMatchId;
private Long id;
/**
* ID
@ -31,6 +31,12 @@ public class StoreProductBarcodeMatch extends XktBaseEntity {
@Excel(name = "档口商品ID")
private Long storeProdId;
/**
* ID
*/
@Excel(name = "档口ID")
private Long storeId;
/**
* ID
*/
@ -53,7 +59,7 @@ public class StoreProductBarcodeMatch extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdBarcodeMatchId", getStoreProdBarcodeMatchId())
.append("id", getId())
.append("storeProdId", getStoreProdId())
.append("storeProdColorSizeId", getStoreProdColorSizeId())
.append("otherSysBarcodePrefix", getOtherSysBarcodePrefix())

View File

@ -23,7 +23,7 @@ public class StoreProductBarcodeRecord extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdBarcodeRecordId;
private Long id;
/**
* ID
@ -47,7 +47,7 @@ public class StoreProductBarcodeRecord extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdBarcodeRecordId", getStoreProdBarcodeRecordId())
.append("id", getId())
.append("storeProdId", getStoreProdId())
.append("storeProdColorSizeId", getStoreProdColorSizeId())
.append("barcode", getBarcode())

View File

@ -25,7 +25,7 @@ public class StoreProductCategoryAttribute extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdAttrId;
private Long id;
/**
* ID
@ -49,7 +49,7 @@ public class StoreProductCategoryAttribute extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdAttrId", getStoreProdAttrId())
.append("id", getId())
.append("storeProdId", getStoreProdId())
.append("dictType", getDictType())
.append("version", getVersion())

View File

@ -25,7 +25,7 @@ public class StoreProductColor extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdColorId;
private Long id;
/**
* ID
@ -61,7 +61,7 @@ public class StoreProductColor extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdColorId", getStoreProdColorId())
.append("id", getId())
.append("storeColorId", getStoreColorId())
.append("storeProdId", getStoreProdId())
.append("colorName", getColorName())

View File

@ -27,7 +27,7 @@ public class StoreProductColorPrice extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdColorPriceId;
private Long id;
/**
* ID
@ -51,7 +51,7 @@ public class StoreProductColorPrice extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdColorPriceId", getStoreProdColorPriceId())
.append("id", getId())
.append("storeProdId", getStoreProdId())
.append("price", getPrice())
.append("version", getVersion())

View File

@ -25,7 +25,7 @@ public class StoreProductColorSize extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdColorSizeId;
private Long id;
/**
* ID
@ -60,7 +60,7 @@ public class StoreProductColorSize extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdColorSizeId", getStoreProdColorSizeId())
.append("id", getId())
.append("storeColorId", getStoreColorId())
.append("storeProdId", getStoreProdId())
.append("size", getSize())

View File

@ -23,7 +23,7 @@ public class StoreProductDemand extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdDemandId;
private Long id;
/**
* code
@ -41,7 +41,7 @@ public class StoreProductDemand extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdDemandId", getStoreProdDemandId())
.append("id", getId())
.append("code", getCode())
.append("demandStatus", getDemandStatus())
.append("version", getVersion())

View File

@ -23,7 +23,7 @@ public class StoreProductDemandDetail extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdDemaDetailId;
private Long id;
/**
* ID
@ -143,7 +143,7 @@ public class StoreProductDemandDetail extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdDemaDetailId", getStoreProdDemaDetailId())
.append("id", getId())
.append("storeProdDemandId", getStoreProdDemandId())
.append("storeProdColorId", getStoreProdColorId())
.append("storeProdId", getStoreProdId())

View File

@ -25,7 +25,7 @@ public class StoreProductDetail extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdDetailId;
private Long id;
/**
* ID
@ -43,7 +43,7 @@ public class StoreProductDetail extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdDetailId", getStoreProdDetailId())
.append("id", getId())
.append("storeProdId", getStoreProdId())
.append("detail", getDetail())
.append("version", getVersion())

View File

@ -27,7 +27,7 @@ public class StoreProductFile extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdFileId;
private Long id;
/**
* ID
@ -68,7 +68,7 @@ public class StoreProductFile extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdFileId", getStoreProdFileId())
.append("id", getId())
.append("storeProdId", getStoreProdId())
.append("fileId", getFileId())
.append("fileType", getFileType())

View File

@ -23,7 +23,7 @@ public class StoreProductProcess extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdProcessId;
private Long id;
/**
* ID

View File

@ -25,7 +25,7 @@ public class StoreProductService extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdSvcId;
private Long id;
/**
* ID
@ -61,7 +61,7 @@ public class StoreProductService extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdSvcId", getStoreProdSvcId())
.append("id", getId())
.append("storeProdId", getStoreProdId())
.append("customRefund", getCustomRefund())
.append("thirtyDayRefund", getThirtyDayRefund())

View File

@ -23,7 +23,7 @@ public class StoreProductStock extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdStockId;
private Long id;
/**
* ID
@ -125,7 +125,7 @@ public class StoreProductStock extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdStockId", getStoreProdStockId())
.append("id", getId())
.append("storeProdId", getStoreProdId())
.append("storeProdColorId", getStoreProdColorId())
.append("size30", getSize30())

View File

@ -25,7 +25,7 @@ public class StoreProductStorage extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdStorId;
private Long id;
/**
* CODE
@ -61,7 +61,7 @@ public class StoreProductStorage extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdStorId", getStoreProdStorId())
.append("id", getId())
.append("code", getCode())
.append("storageType", getStorageType())
.append("totalNum", getTotalNum())

View File

@ -23,7 +23,7 @@ public class StoreProductStorageDemandDeducte extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdStorDemaDeducteId;
private Long id;
/**
* ID
@ -149,7 +149,7 @@ public class StoreProductStorageDemandDeducte extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdStorDemaDeducteId", getStoreProdStorDemaDeducteId())
.append("id", getId())
.append("storeProdStorDetailId", getStoreProdStorDetailId())
.append("storeProdDemandId", getStoreProdDemandId())
.append("storeProdColorId", getStoreProdColorId())

View File

@ -25,7 +25,7 @@ public class StoreProductStorageDetail extends XktBaseEntity {
* ID
*/
@TableId
private Long storeProdStorDetailId;
private Long id;
/**
* ID
@ -151,7 +151,7 @@ public class StoreProductStorageDetail extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeProdStorDetailId", getStoreProdStorDetailId())
.append("id", getId())
.append("storeProdStorId", getStoreProdStorId())
.append("storeProdColorId", getStoreProdColorId())
.append("storeProdId", getStoreProdId())

View File

@ -23,7 +23,7 @@ public class StoreQuickFunction extends XktBaseEntity {
* ID
*/
@TableId
private Long storeQuickFuncId;
private Long id;
/**
* store.id
@ -59,7 +59,7 @@ public class StoreQuickFunction extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeQuickFuncId", getStoreQuickFuncId())
.append("id", getId())
.append("storeId", getStoreId())
.append("funcName", getFuncName())
.append("funcIcon", getFuncIcon())

View File

@ -23,7 +23,7 @@ public class StoreRole extends XktBaseEntity {
* ID
*/
@TableId
private Long storeRoleId;
private Long id;
/**
* store.id
@ -41,7 +41,7 @@ public class StoreRole extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeRoleId", getStoreRoleId())
.append("id", getId())
.append("storeId", getStoreId())
.append("roleStatus", getRoleStatus())
.append("version", getVersion())

View File

@ -23,7 +23,7 @@ public class StoreRoleAccount extends XktBaseEntity {
* ID
*/
@TableId
private Long storeRoleAccId;
private Long id;
/**
* ID
@ -53,7 +53,7 @@ public class StoreRoleAccount extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeRoleAccId", getStoreRoleAccId())
.append("id", getId())
.append("storeRoleId", getStoreRoleId())
.append("storeId", getStoreId())
.append("userId", getUserId())

View File

@ -23,7 +23,7 @@ public class StoreRoleMenu extends XktBaseEntity {
* ID
*/
@TableId
private Long storeRoleMenuId;
private Long id;
/**
* ID
@ -53,7 +53,7 @@ public class StoreRoleMenu extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeRoleMenuId", getStoreRoleMenuId())
.append("id", getId())
.append("storeRoleId", getStoreRoleId())
.append("storeId", getStoreId())
.append("menuName", getMenuName())

View File

@ -27,7 +27,7 @@ public class StoreSale extends XktBaseEntity {
* ID
*/
@TableId
private Long storeSaleId;
private Long id;
/**
* ID
@ -82,7 +82,7 @@ public class StoreSale extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeSaleId", getStoreSaleId())
.append("id", getId())
.append("storeId", getStoreId())
.append("storeCusId", getStoreCusId())
.append("saleType", getSaleType())

View File

@ -25,7 +25,7 @@ public class StoreSaleDetail extends XktBaseEntity {
* ID
*/
@TableId
private Long storeSaleDetailId;
private Long id;
/**
* ID
@ -85,7 +85,7 @@ public class StoreSaleDetail extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeSaleDetailId", getStoreSaleDetailId())
.append("id", getId())
.append("storeSaleId", getStoreSaleId())
.append("storeProdId", getStoreProdId())
.append("storeProdColorSizeId", getStoreProdColorSizeId())

View File

@ -25,7 +25,7 @@ public class StoreSaleRefundRecord extends XktBaseEntity {
* ID
*/
@TableId
private Long storeSaleRefundRecordId;
private Long id;
/**
* ID
@ -85,7 +85,7 @@ public class StoreSaleRefundRecord extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("storeSaleRefundRecordId", getStoreSaleRefundRecordId())
.append("id", getId())
.append("storeSaleId", getStoreSaleId())
.append("storeId", getStoreId())
.append("storeCusId", getStoreCusId())

View File

@ -25,7 +25,7 @@ public class SysFile extends XktBaseEntity {
* ID
*/
@TableId
private Long fileId;
private Long id;
/**
*
@ -49,7 +49,7 @@ public class SysFile extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("fileId", getFileId())
.append("id", getId())
.append("fileName", getFileName())
.append("fileUrl", getFileUrl())
.append("fileSize", getFileSize())

View File

@ -25,7 +25,7 @@ public class UserAccount extends XktBaseEntity {
* ID
*/
@TableId
private Long userAccId;
private Long id;
/**
* sys_user.id
@ -61,7 +61,7 @@ public class UserAccount extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userAccId", getUserAccId())
.append("id", getId())
.append("userId", getUserId())
.append("accountType", getAccountType())
.append("accountPhone", getAccountPhone())

View File

@ -23,7 +23,7 @@ public class UserAddress extends XktBaseEntity {
* ID
*/
@TableId
private Long userAddrId;
private Long id;
/**
* sys_user.id
@ -71,7 +71,7 @@ public class UserAddress extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userAddrId", getUserAddrId())
.append("id", getId())
.append("userId", getUserId())
.append("receiveName", getReceiveName())
.append("receivePhone", getReceivePhone())

View File

@ -23,7 +23,7 @@ public class UserAuthentication extends XktBaseEntity {
* ID
*/
@TableId
private Long userAuthId;
private Long id;
/**
* sys_user.id
@ -70,7 +70,7 @@ public class UserAuthentication extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userAuthId", getUserAuthId())
.append("id", getId())
.append("userId", getUserId())
.append("realName", getRealName())
.append("phone", getPhone())

View File

@ -25,7 +25,7 @@ public class UserBillingStatement extends XktBaseEntity {
* ID
*/
@TableId
private Long userBillStatId;
private Long id;
/**
* sys_user.id
@ -85,7 +85,7 @@ public class UserBillingStatement extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userBillStatId", getUserBillStatId())
.append("id", getId())
.append("userId", getUserId())
.append("userAccId", getUserAccId())
.append("code", getCode())

View File

@ -27,7 +27,7 @@ public class UserBrowsingHistory extends XktBaseEntity {
* ID
*/
@TableId
private Long userBrowHisId;
private Long id;
/**
* sys_user.id
@ -88,7 +88,7 @@ public class UserBrowsingHistory extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userBrowHisId", getUserBrowHisId())
.append("id", getId())
.append("userId", getUserId())
.append("fileId", getFileId())
.append("storeProdFileId", getStoreProdFileId())

View File

@ -23,7 +23,7 @@ public class UserFavorites extends XktBaseEntity {
* ID
*/
@TableId
private Long userFavoId;
private Long id;
/**
* sys_user.id
@ -47,7 +47,7 @@ public class UserFavorites extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userFavoId", getUserFavoId())
.append("id", getId())
.append("userId", getUserId())
.append("storeId", getStoreId())
.append("storeProdId", getStoreProdId())

View File

@ -26,7 +26,7 @@ public class UserNotice extends XktBaseEntity {
* ID
*/
@TableId
private Long userNoticeId;
private Long id;
/**
* sys_notice.id
@ -57,7 +57,7 @@ public class UserNotice extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userNoticeId", getUserNoticeId())
.append("id", getId())
.append("noticeId", getNoticeId())
.append("userId", getUserId())
.append("read", getRead())

View File

@ -23,7 +23,7 @@ public class UserNoticeSetting extends XktBaseEntity {
* ID
*/
@TableId
private Long userNoticeSetId;
private Long id;
/**
* sys_user.id
@ -47,7 +47,7 @@ public class UserNoticeSetting extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userNoticeSetId", getUserNoticeSetId())
.append("id", getId())
.append("userId", getUserId())
.append("noticeType", getNoticeType())
.append("allow", getAllow())

View File

@ -23,7 +23,7 @@ public class UserQuickFunction extends XktBaseEntity {
* ID
*/
@TableId
private Long userQuickFuncId;
private Long id;
/**
* sys_user.id
@ -59,7 +59,7 @@ public class UserQuickFunction extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userQuickFuncId", getUserQuickFuncId())
.append("id", getId())
.append("userId", getUserId())
.append("funcName", getFuncName())
.append("funcIcon", getFuncIcon())

View File

@ -23,7 +23,7 @@ public class UserShoppingCart extends XktBaseEntity {
* ID
*/
@TableId
private Long userShopCartId;
private Long id;
/**
* sys_user.id
@ -59,7 +59,7 @@ public class UserShoppingCart extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userShopCartId", getUserShopCartId())
.append("id", getId())
.append("userId", getUserId())
.append("storeId", getStoreId())
.append("storeProdColorSizeId", getStoreProdColorSizeId())

View File

@ -23,7 +23,7 @@ public class UserSubscriptions extends XktBaseEntity {
* ID
*/
@TableId
private Long userSubsId;
private Long id;
/**
* sys_user.id
@ -41,7 +41,7 @@ public class UserSubscriptions extends XktBaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userSubsId", getUserSubsId())
.append("id", getId())
.append("userId", getUserId())
.append("storeId", getStoreId())
.append("version", getVersion())

View File

@ -0,0 +1,53 @@
package com.ruoyi.xkt.dto.storeProdBarcodeMatch;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("档口商品条码匹配")
@Data
public class BarcodeMatchDTO {
@NotNull(message = "档口商品ID不能为空")
@ApiModelProperty("档口商品ID")
private Long storeProdId;
@ApiModelProperty("档口ID")
@NotNull(message = "档口ID不能为空")
private Long storeId;
@ApiModelProperty("与第三方系统匹配规则")
@NotNull(message = "与第三方系统匹配规则不能为空")
@Valid
List<BarcodeMatchColorDTO> colorList;
@Data
public static class BarcodeMatchColorDTO {
@NotNull(message = "颜色ID不能为空")
@ApiModelProperty("档口颜色ID")
private Long storeColorId;
@ApiModelProperty("颜色尺码ID列表")
@NotNull(message = "颜色尺码ID列表不能为空")
@Valid
List<BarcodeMatchSizeDTO> sizeList;
}
@Data
public static class BarcodeMatchSizeDTO {
@NotNull(message = "尺码不能为空")
@ApiModelProperty("尺码")
private Integer size;
@NotBlank(message = "条码不能为空")
@ApiModelProperty("条码")
private String barcode;
}
}

View File

@ -0,0 +1,38 @@
package com.ruoyi.xkt.dto.storeProduct;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("一键迁移条码时输入货号查询列表")
@Data
@Builder
@Accessors(chain = true)
public class StoreProdFuzzyResDTO {
@ApiModelProperty("档口商品ID")
private Long storeProdId;
@ApiModelProperty("档口ID")
private Long storeId;
@ApiModelProperty(name = "商品货号")
private String prodArtNum;
@ApiModelProperty("商品下颜色列表")
private List<StoreProdFuzzyColorResVO> colorList;
@Data
public static class StoreProdFuzzyColorResVO {
@ApiModelProperty("档口颜色ID")
private Long storeColorId;
@ApiModelProperty("颜色名称")
private String colorName;
}
}

View File

@ -1,5 +1,6 @@
package com.ruoyi.xkt.dto.storeProduct;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -41,6 +42,7 @@ public class StoreProdPageResDTO {
@ApiModelProperty(name = "状态")
private String prodStatus;
@ApiModelProperty(name = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
}

View File

@ -12,6 +12,7 @@ import com.ruoyi.xkt.dto.storeProductFile.StoreProdFileResDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.util.Date;
@ -24,6 +25,7 @@ import java.util.List;
*/
@ApiModel("创建档口商品")
@Data
@Accessors(chain = true)
public class StoreProdResDTO {
@ApiModelProperty("档口商品ID")

View File

@ -15,10 +15,10 @@ public interface PictureSearchHotMapper extends BaseMapper<PictureSearchHot> {
/**
*
*
* @param picSearchHotId
* @param id
* @return
*/
public PictureSearchHot selectPictureSearchHotByPicSearchHotId(Long picSearchHotId);
public PictureSearchHot selectPictureSearchHotByPicSearchHotId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface PictureSearchHotMapper extends BaseMapper<PictureSearchHot> {
/**
*
*
* @param picSearchHotId
* @param id
* @return
*/
public int deletePictureSearchHotByPicSearchHotId(Long picSearchHotId);
public int deletePictureSearchHotByPicSearchHotId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface PictureSearchMapper extends BaseMapper<PictureSearch> {
/**
*
*
* @param picSearchId
* @param id
* @return
*/
public PictureSearch selectPictureSearchByPicSearchId(Long picSearchId);
public PictureSearch selectPictureSearchByPicSearchId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface PictureSearchMapper extends BaseMapper<PictureSearch> {
/**
*
*
* @param picSearchId
* @param id
* @return
*/
public int deletePictureSearchByPicSearchId(Long picSearchId);
public int deletePictureSearchByPicSearchId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface PictureSearchResultMapper extends BaseMapper<PictureSearchResul
/**
*
*
* @param picSearchResId
* @param id
* @return
*/
public PictureSearchResult selectPictureSearchResultByPicSearchResId(Long picSearchResId);
public PictureSearchResult selectPictureSearchResultByPicSearchResId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface PictureSearchResultMapper extends BaseMapper<PictureSearchResul
/**
*
*
* @param picSearchResId
* @param id
* @return
*/
public int deletePictureSearchResultByPicSearchResId(Long picSearchResId);
public int deletePictureSearchResultByPicSearchResId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreCertificateMapper extends BaseMapper<StoreCertificate> {
/**
*
*
* @param storeCertId
* @param id
* @return
*/
public StoreCertificate selectStoreCertificateByStoreCertId(Long storeCertId);
public StoreCertificate selectStoreCertificateByStoreCertId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreCertificateMapper extends BaseMapper<StoreCertificate> {
/**
*
*
* @param storeCertId
* @param id
* @return
*/
public int deleteStoreCertificateByStoreCertId(Long storeCertId);
public int deleteStoreCertificateByStoreCertId(Long id);
/**
*

View File

@ -16,10 +16,10 @@ public interface StoreColorMapper extends BaseMapper<StoreColor> {
/**
*
*
* @param storeColorId
* @param id
* @return
*/
public StoreColor selectStoreColorByStoreColorId(Long storeColorId);
public StoreColor selectStoreColorByStoreColorId(Long id);
/**
*
@ -48,10 +48,10 @@ public interface StoreColorMapper extends BaseMapper<StoreColor> {
/**
*
*
* @param storeColorId
* @param id
* @return
*/
public int deleteStoreColorByStoreColorId(Long storeColorId);
public int deleteStoreColorByStoreColorId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreCustomerMapper extends BaseMapper<StoreCustomer> {
/**
*
*
* @param storeCusId
* @param id
* @return
*/
public StoreCustomer selectStoreCustomerByStoreCusId(Long storeCusId);
public StoreCustomer selectStoreCustomerByStoreCusId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreCustomerMapper extends BaseMapper<StoreCustomer> {
/**
*
*
* @param storeCusId
* @param id
* @return
*/
public int deleteStoreCustomerByStoreCusId(Long storeCusId);
public int deleteStoreCustomerByStoreCusId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreCustomerProductDiscountMapper extends BaseMapper<StoreCust
/**
*
*
* @param storeCusProdDiscId
* @param id
* @return
*/
public StoreCustomerProductDiscount selectStoreCustomerProductDiscountByStoreCusProdDiscId(Long storeCusProdDiscId);
public StoreCustomerProductDiscount selectStoreCustomerProductDiscountByStoreCusProdDiscId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreCustomerProductDiscountMapper extends BaseMapper<StoreCust
/**
*
*
* @param storeCusProdDiscId
* @param id
* @return
*/
public int deleteStoreCustomerProductDiscountByStoreCusProdDiscId(Long storeCusProdDiscId);
public int deleteStoreCustomerProductDiscountByStoreCusProdDiscId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreFactoryMapper extends BaseMapper<StoreFactory> {
/**
*
*
* @param storeFacId
* @param id
* @return
*/
public StoreFactory selectStoreFactoryByStoreFacId(Long storeFacId);
public StoreFactory selectStoreFactoryByStoreFacId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreFactoryMapper extends BaseMapper<StoreFactory> {
/**
*
*
* @param storeFacId
* @param id
* @return
*/
public int deleteStoreFactoryByStoreFacId(Long storeFacId);
public int deleteStoreFactoryByStoreFacId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreHomepageMapper extends BaseMapper<StoreHomepage> {
/**
*
*
* @param storeHomeId
* @param id
* @return
*/
public StoreHomepage selectStoreHomepageByStoreHomeId(Long storeHomeId);
public StoreHomepage selectStoreHomepageByStoreHomeId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreHomepageMapper extends BaseMapper<StoreHomepage> {
/**
*
*
* @param storeHomeId
* @param id
* @return
*/
public int deleteStoreHomepageByStoreHomeId(Long storeHomeId);
public int deleteStoreHomepageByStoreHomeId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreMapper extends BaseMapper<Store> {
/**
*
*
* @param storeId
* @param id
* @return
*/
public Store selectStoreByStoreId(Long storeId);
public Store selectStoreByStoreId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreMapper extends BaseMapper<Store> {
/**
*
*
* @param storeId
* @param id
* @return
*/
public int deleteStoreByStoreId(Long storeId);
public int deleteStoreByStoreId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreOrderDetailMapper extends BaseMapper<StoreOrderDetail> {
/**
*
*
* @param storeOrderDetailId
* @param id
* @return
*/
public StoreOrderDetail selectStoreOrderDetailByStoreOrderDetailId(Long storeOrderDetailId);
public StoreOrderDetail selectStoreOrderDetailByStoreOrderDetailId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreOrderDetailMapper extends BaseMapper<StoreOrderDetail> {
/**
*
*
* @param storeOrderDetailId
* @param id
* @return
*/
public int deleteStoreOrderDetailByStoreOrderDetailId(Long storeOrderDetailId);
public int deleteStoreOrderDetailByStoreOrderDetailId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreOrderExpressMapper extends BaseMapper<StoreOrderExpress> {
/**
*
*
* @param storeOrderExprId
* @param id
* @return
*/
public StoreOrderExpress selectStoreOrderExpressByStoreOrderExprId(Long storeOrderExprId);
public StoreOrderExpress selectStoreOrderExpressByStoreOrderExprId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreOrderExpressMapper extends BaseMapper<StoreOrderExpress> {
/**
*
*
* @param storeOrderExprId
* @param id
* @return
*/
public int deleteStoreOrderExpressByStoreOrderExprId(Long storeOrderExprId);
public int deleteStoreOrderExpressByStoreOrderExprId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreOrderMapper extends BaseMapper<StoreOrder> {
/**
*
*
* @param storeOrderId
* @param id
* @return
*/
public StoreOrder selectStoreOrderByStoreOrderId(Long storeOrderId);
public StoreOrder selectStoreOrderByStoreOrderId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreOrderMapper extends BaseMapper<StoreOrder> {
/**
*
*
* @param storeOrderId
* @param id
* @return
*/
public int deleteStoreOrderByStoreOrderId(Long storeOrderId);
public int deleteStoreOrderByStoreOrderId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreOrderReceiveMapper extends BaseMapper<StoreOrderReceive> {
/**
*
*
* @param storeOrderRcvId
* @param id
* @return
*/
public StoreOrderReceive selectStoreOrderReceiveByStoreOrderRcvId(Long storeOrderRcvId);
public StoreOrderReceive selectStoreOrderReceiveByStoreOrderRcvId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreOrderReceiveMapper extends BaseMapper<StoreOrderReceive> {
/**
*
*
* @param storeOrderRcvId
* @param id
* @return
*/
public int deleteStoreOrderReceiveByStoreOrderRcvId(Long storeOrderRcvId);
public int deleteStoreOrderReceiveByStoreOrderRcvId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreProductBarcodeMatchMapper extends BaseMapper<StoreProductB
/**
*
*
* @param storeProdBarcodeMatchId
* @param id
* @return
*/
public StoreProductBarcodeMatch selectStoreProductBarcodeMatchByStoreProdBarcodeMatchId(Long storeProdBarcodeMatchId);
public StoreProductBarcodeMatch selectStoreProductBarcodeMatchByStoreProdBarcodeMatchId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreProductBarcodeMatchMapper extends BaseMapper<StoreProductB
/**
*
*
* @param storeProdBarcodeMatchId
* @param id
* @return
*/
public int deleteStoreProductBarcodeMatchByStoreProdBarcodeMatchId(Long storeProdBarcodeMatchId);
public int deleteStoreProductBarcodeMatchByStoreProdBarcodeMatchId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreProductBarcodeRecordMapper extends BaseMapper<StoreProduct
/**
*
*
* @param storeProdBarcodeRecordId
* @param id
* @return
*/
public StoreProductBarcodeRecord selectStoreProductBarcodeRecordByStoreProdBarcodeRecordId(Long storeProdBarcodeRecordId);
public StoreProductBarcodeRecord selectStoreProductBarcodeRecordByStoreProdBarcodeRecordId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreProductBarcodeRecordMapper extends BaseMapper<StoreProduct
/**
*
*
* @param storeProdBarcodeRecordId
* @param id
* @return
*/
public int deleteStoreProductBarcodeRecordByStoreProdBarcodeRecordId(Long storeProdBarcodeRecordId);
public int deleteStoreProductBarcodeRecordByStoreProdBarcodeRecordId(Long id);
/**
*

View File

@ -16,10 +16,10 @@ public interface StoreProductCategoryAttributeMapper extends BaseMapper<StorePro
/**
*
*
* @param storeProdAttrId
* @param id
* @return
*/
public StoreProductCategoryAttribute selectStoreProductCategoryAttributeByStoreProdAttrId(Long storeProdAttrId);
public StoreProductCategoryAttribute selectStoreProductCategoryAttributeByStoreProdAttrId(Long id);
/**
*
@ -48,10 +48,10 @@ public interface StoreProductCategoryAttributeMapper extends BaseMapper<StorePro
/**
*
*
* @param storeProdAttrId
* @param id
* @return
*/
public int deleteStoreProductCategoryAttributeByStoreProdAttrId(Long storeProdAttrId);
public int deleteStoreProductCategoryAttributeByStoreProdAttrId(Long id);
/**
*

View File

@ -20,10 +20,10 @@ public interface StoreProductColorMapper extends BaseMapper<StoreProductColor> {
/**
*
*
* @param storeProdColorId
* @param id
* @return
*/
public StoreProductColor selectStoreProductColorByStoreProdColorId(Long storeProdColorId);
public StoreProductColor selectStoreProductColorByStoreProdColorId(Long id);
/**
*
@ -52,10 +52,10 @@ public interface StoreProductColorMapper extends BaseMapper<StoreProductColor> {
/**
*
*
* @param storeProdColorId
* @param id
* @return
*/
public int deleteStoreProductColorByStoreProdColorId(Long storeProdColorId);
public int deleteStoreProductColorByStoreProdColorId(Long id);
/**
*

View File

@ -16,10 +16,10 @@ public interface StoreProductColorPriceMapper extends BaseMapper<StoreProductCol
/**
*
*
* @param storeProdColorPriceId
* @param id
* @return
*/
public StoreProductColorPrice selectStoreProductColorPriceByStoreProdColorPriceId(Long storeProdColorPriceId);
public StoreProductColorPrice selectStoreProductColorPriceByStoreProdColorPriceId(Long id);
/**
*
@ -48,10 +48,10 @@ public interface StoreProductColorPriceMapper extends BaseMapper<StoreProductCol
/**
*
*
* @param storeProdColorPriceId
* @param id
* @return
*/
public int deleteStoreProductColorPriceByStoreProdColorPriceId(Long storeProdColorPriceId);
public int deleteStoreProductColorPriceByStoreProdColorPriceId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreProductColorSizeMapper extends BaseMapper<StoreProductColo
/**
*
*
* @param storeProdColorSizeId
* @param id
* @return
*/
public StoreProductColorSize selectStoreProductColorSizeByStoreProdColorSizeId(Long storeProdColorSizeId);
public StoreProductColorSize selectStoreProductColorSizeByStoreProdColorSizeId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreProductColorSizeMapper extends BaseMapper<StoreProductColo
/**
*
*
* @param storeProdColorSizeId
* @param id
* @return
*/
public int deleteStoreProductColorSizeByStoreProdColorSizeId(Long storeProdColorSizeId);
public int deleteStoreProductColorSizeByStoreProdColorSizeId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreProductDemandDetailMapper extends BaseMapper<StoreProductD
/**
*
*
* @param storeProdDemaDetailId
* @param id
* @return
*/
public StoreProductDemandDetail selectStoreProductDemandDetailByStoreProdDemaDetailId(Long storeProdDemaDetailId);
public StoreProductDemandDetail selectStoreProductDemandDetailByStoreProdDemaDetailId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreProductDemandDetailMapper extends BaseMapper<StoreProductD
/**
*
*
* @param storeProdDemaDetailId
* @param id
* @return
*/
public int deleteStoreProductDemandDetailByStoreProdDemaDetailId(Long storeProdDemaDetailId);
public int deleteStoreProductDemandDetailByStoreProdDemaDetailId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreProductDemandMapper extends BaseMapper<StoreProductDemand>
/**
*
*
* @param storeProdDemandId
* @param id
* @return
*/
public StoreProductDemand selectStoreProductDemandByStoreProdDemandId(Long storeProdDemandId);
public StoreProductDemand selectStoreProductDemandByStoreProdDemandId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreProductDemandMapper extends BaseMapper<StoreProductDemand>
/**
*
*
* @param storeProdDemandId
* @param id
* @return
*/
public int deleteStoreProductDemandByStoreProdDemandId(Long storeProdDemandId);
public int deleteStoreProductDemandByStoreProdDemandId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreProductDetailMapper extends BaseMapper<StoreProductDetail>
/**
*
*
* @param storeProdDetailId
* @param id
* @return
*/
public StoreProductDetail selectStoreProductDetailByStoreProdDetailId(Long storeProdDetailId);
public StoreProductDetail selectStoreProductDetailByStoreProdDetailId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreProductDetailMapper extends BaseMapper<StoreProductDetail>
/**
*
*
* @param storeProdDetailId
* @param id
* @return
*/
public int deleteStoreProductDetailByStoreProdDetailId(Long storeProdDetailId);
public int deleteStoreProductDetailByStoreProdDetailId(Long id);
/**
*

View File

@ -19,10 +19,10 @@ public interface StoreProductFileMapper extends BaseMapper<StoreProductFile> {
/**
*
*
* @param storeProdFileId
* @param id
* @return
*/
public StoreProductFile selectStoreProductFileByStoreProdFileId(Long storeProdFileId);
public StoreProductFile selectStoreProductFileByStoreProdFileId(Long id);
/**
*
@ -51,10 +51,10 @@ public interface StoreProductFileMapper extends BaseMapper<StoreProductFile> {
/**
*
*
* @param storeProdFileId
* @param id
* @return
*/
public int deleteStoreProductFileByStoreProdFileId(Long storeProdFileId);
public int deleteStoreProductFileByStoreProdFileId(Long id);
/**
*

View File

@ -2,9 +2,6 @@ package com.ruoyi.xkt.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.xkt.domain.StoreProduct;
import com.ruoyi.xkt.dto.storeProduct.StoreProdPageDTO;
import com.ruoyi.xkt.dto.storeProduct.StoreProdPageResDTO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -18,10 +15,10 @@ public interface StoreProductMapper extends BaseMapper<StoreProduct> {
/**
*
*
* @param storeProdId
* @param id
* @return
*/
public StoreProduct selectStoreProductByStoreProdId(Long storeProdId);
public StoreProduct selectStoreProductByStoreProdId(Long id);
/**
*
@ -50,10 +47,10 @@ public interface StoreProductMapper extends BaseMapper<StoreProduct> {
/**
*
*
* @param storeProdId
* @param id
* @return
*/
public int deleteStoreProductByStoreProdId(Long storeProdId);
public int deleteStoreProductByStoreProdId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreProductProcessMapper extends BaseMapper<StoreProductProces
/**
*
*
* @param storeProdProcessId
* @param id
* @return
*/
public StoreProductProcess selectStoreProductProcessByStoreProdProcessId(Long storeProdProcessId);
public StoreProductProcess selectStoreProductProcessByStoreProdProcessId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreProductProcessMapper extends BaseMapper<StoreProductProces
/**
*
*
* @param storeProdProcessId
* @param id
* @return
*/
public int deleteStoreProductProcessByStoreProdProcessId(Long storeProdProcessId);
public int deleteStoreProductProcessByStoreProdProcessId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreProductServiceMapper extends BaseMapper<StoreProductServic
/**
*
*
* @param storeProdSvcId
* @param id
* @return
*/
public StoreProductService selectStoreProductServiceByStoreProdSvcId(Long storeProdSvcId);
public StoreProductService selectStoreProductServiceByStoreProdSvcId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreProductServiceMapper extends BaseMapper<StoreProductServic
/**
*
*
* @param storeProdSvcId
* @param id
* @return
*/
public int deleteStoreProductServiceByStoreProdSvcId(Long storeProdSvcId);
public int deleteStoreProductServiceByStoreProdSvcId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreProductStockMapper extends BaseMapper<StoreProductStock> {
/**
*
*
* @param storeProdStockId
* @param id
* @return
*/
public StoreProductStock selectStoreProductStockByStoreProdStockId(Long storeProdStockId);
public StoreProductStock selectStoreProductStockByStoreProdStockId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreProductStockMapper extends BaseMapper<StoreProductStock> {
/**
*
*
* @param storeProdStockId
* @param id
* @return
*/
public int deleteStoreProductStockByStoreProdStockId(Long storeProdStockId);
public int deleteStoreProductStockByStoreProdStockId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreProductStorageDemandDeducteMapper extends BaseMapper<Store
/**
*
*
* @param storeProdStorDemaDeducteId
* @param id
* @return
*/
public StoreProductStorageDemandDeducte selectStoreProductStorageDemandDeducteByStoreProdStorDemaDeducteId(Long storeProdStorDemaDeducteId);
public StoreProductStorageDemandDeducte selectStoreProductStorageDemandDeducteByStoreProdStorDemaDeducteId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreProductStorageDemandDeducteMapper extends BaseMapper<Store
/**
*
*
* @param storeProdStorDemaDeducteId
* @param id
* @return
*/
public int deleteStoreProductStorageDemandDeducteByStoreProdStorDemaDeducteId(Long storeProdStorDemaDeducteId);
public int deleteStoreProductStorageDemandDeducteByStoreProdStorDemaDeducteId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreProductStorageDetailMapper extends BaseMapper<StoreProduct
/**
*
*
* @param storeProdStorDetailId
* @param id
* @return
*/
public StoreProductStorageDetail selectStoreProductStorageDetailByStoreProdStorDetailId(Long storeProdStorDetailId);
public StoreProductStorageDetail selectStoreProductStorageDetailByStoreProdStorDetailId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreProductStorageDetailMapper extends BaseMapper<StoreProduct
/**
*
*
* @param storeProdStorDetailId
* @param id
* @return
*/
public int deleteStoreProductStorageDetailByStoreProdStorDetailId(Long storeProdStorDetailId);
public int deleteStoreProductStorageDetailByStoreProdStorDetailId(Long id);
/**
*

View File

@ -15,10 +15,10 @@ public interface StoreProductStorageMapper extends BaseMapper<StoreProductStorag
/**
*
*
* @param storeProdStorId
* @param id
* @return
*/
public StoreProductStorage selectStoreProductStorageByStoreProdStorId(Long storeProdStorId);
public StoreProductStorage selectStoreProductStorageByStoreProdStorId(Long id);
/**
*
@ -47,10 +47,10 @@ public interface StoreProductStorageMapper extends BaseMapper<StoreProductStorag
/**
*
*
* @param storeProdStorId
* @param id
* @return
*/
public int deleteStoreProductStorageByStoreProdStorId(Long storeProdStorId);
public int deleteStoreProductStorageByStoreProdStorId(Long id);
/**
*

Some files were not shown because too many files have changed in this diff Show More