diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeMatchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeMatchController.java index 130ccab1f..ba46fae3a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeMatchController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeMatchController.java @@ -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 list = storeProductBarcodeMatchService.selectStoreProductBarcodeMatchList(storeProductBarcodeMatch); + List 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 list = storeProductBarcodeMatchService.selectStoreProductBarcodeMatchList(storeProductBarcodeMatch); + List list = barcodeMatchService.selectStoreProductBarcodeMatchList(storeProductBarcodeMatch); ExcelUtil util = new ExcelUtil(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)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java index fccf77a8e..0327467bc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java @@ -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)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storePordColor/StoreProdColorVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storePordColor/StoreProdColorVO.java deleted file mode 100644 index 7587d7016..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storePordColor/StoreProdColorVO.java +++ /dev/null @@ -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; - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdFuzzyResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdFuzzyResVO.java new file mode 100644 index 000000000..9edc02677 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdFuzzyResVO.java @@ -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 colorList; + + @Data + public static class StoreProdFuzzyColorResVO { + @ApiModelProperty("档口颜色ID") + private Long storeColorId; + @ApiModelProperty("颜色名称") + private String colorName; + } +} 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 6ea88bb25..221af9fbd 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 @@ -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 fileList; + private List fileList; @ApiModelProperty(name = "档口类目属性列表") private List 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; + } + } 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 192d74366..d4cf65a3a 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 @@ -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; + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdBarcodeMatch/BarcodeMatchVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdBarcodeMatch/BarcodeMatchVO.java new file mode 100644 index 000000000..3876e7b1c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdBarcodeMatch/BarcodeMatchVO.java @@ -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 colorList; + + @Data + public static class BarcodeMatchColorVO { + @NotNull(message = "颜色ID不能为空") + @ApiModelProperty("档口颜色ID") + private Long storeColorId; + @ApiModelProperty("颜色尺码ID列表") + @NotNull(message = "颜色尺码ID列表不能为空") + @Valid + List sizeList; + } + + @Data + public static class BarcodeMatchSizeVO { + @NotNull(message = "尺码不能为空") + @ApiModelProperty("尺码") + private Integer size; + @NotBlank(message = "条码不能为空") + @ApiModelProperty("条码") + private String barcode; + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdCateAttr/StoreProdCateAttrVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdCateAttr/StoreProdCateAttrVO.java deleted file mode 100644 index cc382306b..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdCateAttr/StoreProdCateAttrVO.java +++ /dev/null @@ -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; - -} 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 deleted file mode 100644 index 779b8cde8..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorPrice/StoreProdColorPriceVO.java +++ /dev/null @@ -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; - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreProdColorSizeVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreProdColorSizeVO.java deleted file mode 100644 index 8535be170..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreProdColorSizeVO.java +++ /dev/null @@ -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; - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdDetail/StoreProdDetailVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdDetail/StoreProdDetailVO.java deleted file mode 100644 index 5428d8f40..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdDetail/StoreProdDetailVO.java +++ /dev/null @@ -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; - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdProcess/StoreProdProcessVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdProcess/StoreProdProcessVO.java deleted file mode 100644 index 4964e0725..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdProcess/StoreProdProcessVO.java +++ /dev/null @@ -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; - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdSvc/StoreProdSvcVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdSvc/StoreProdSvcVO.java deleted file mode 100644 index d5ea5fb64..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdSvc/StoreProdSvcVO.java +++ /dev/null @@ -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; - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductFile/StoreProdFileResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductFile/StoreProdFileResVO.java deleted file mode 100644 index a86288d92..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductFile/StoreProdFileResVO.java +++ /dev/null @@ -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; - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductFile/StoreProdFileVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductFile/StoreProdFileVO.java deleted file mode 100644 index d465a111e..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductFile/StoreProdFileVO.java +++ /dev/null @@ -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; - -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearch.java b/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearch.java index 13d36b47d..6493564a5 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearch.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearch.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchHot.java b/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchHot.java index da4a5393a..f725c5142 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchHot.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchHot.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchResult.java b/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchResult.java index 1757fa507..56a4eebdf 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchResult.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchResult.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/Store.java b/xkt/src/main/java/com/ruoyi/xkt/domain/Store.java index 3aebba1c7..2a6c57260 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/Store.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/Store.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCertificate.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCertificate.java index 005df564a..6eaa69818 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCertificate.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCertificate.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreColor.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreColor.java index 3dfcde9bb..7be7195eb 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreColor.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreColor.java @@ -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()) 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 2efc49b7d..19db7bded 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCustomer.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCustomer.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCustomerProductDiscount.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCustomerProductDiscount.java index c91b693ca..0c2ff486a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCustomerProductDiscount.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCustomerProductDiscount.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreFactory.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreFactory.java index 4c28d18f4..492ef7c0a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreFactory.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreFactory.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreHomepage.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreHomepage.java index 58d40e698..4bd2317c1 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreHomepage.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreHomepage.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrder.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrder.java index 0c09ff8f3..a3fee4451 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrder.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrder.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderDetail.java index 94a312914..ba100afdc 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderDetail.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderDetail.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderExpress.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderExpress.java index 9c8a09a33..e96c40fa0 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderExpress.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderExpress.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderReceive.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderReceive.java index 676ed258c..9fffefefe 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderReceive.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderReceive.java @@ -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()) 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 7e517adb1..fc4b52bfd 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductBarcodeMatch.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductBarcodeMatch.java index ef6701724..4ae69cbd2 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductBarcodeMatch.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductBarcodeMatch.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductBarcodeRecord.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductBarcodeRecord.java index 0d6e1d8e6..e0d7b9141 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductBarcodeRecord.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductBarcodeRecord.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java index dd155a9ec..8eb1c4b94 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColor.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColor.java index a6e4d98c6..abe44c475 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColor.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColor.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorPrice.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorPrice.java index fd29a8f23..59daabdff 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorPrice.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorPrice.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorSize.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorSize.java index 5e69f1060..5015afdb5 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorSize.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorSize.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemand.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemand.java index 1b11ecd9a..0a81d19a3 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemand.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemand.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandDetail.java index ddce30e4b..0dc2863ae 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandDetail.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandDetail.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDetail.java index 0d1be4bc1..2ab7114aa 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDetail.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDetail.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductFile.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductFile.java index a6e0c74ee..2242e3b92 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductFile.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductFile.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductProcess.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductProcess.java index 3b279e915..a64d6c0e2 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductProcess.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductProcess.java @@ -23,7 +23,7 @@ public class StoreProductProcess extends XktBaseEntity { * 档口商品工艺信息ID */ @TableId - private Long storeProdProcessId; + private Long id; /** * 档口商品ID diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductService.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductService.java index 95a436459..591e81a07 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductService.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStock.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStock.java index 961e6b9ed..68045e933 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStock.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStock.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStorage.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStorage.java index 458107f70..0bf123adf 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStorage.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStorage.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStorageDemandDeducte.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStorageDemandDeducte.java index b0237ee71..5363fd59e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStorageDemandDeducte.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStorageDemandDeducte.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStorageDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStorageDetail.java index c43233f53..0157eafed 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStorageDetail.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductStorageDetail.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreQuickFunction.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreQuickFunction.java index b4632509a..24d0631ec 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreQuickFunction.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreQuickFunction.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreRole.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreRole.java index 36b8eeb75..a14b05368 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreRole.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreRole.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreRoleAccount.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreRoleAccount.java index b87cdf45a..a26729f15 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreRoleAccount.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreRoleAccount.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreRoleMenu.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreRoleMenu.java index 1def60da7..7792282f0 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreRoleMenu.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreRoleMenu.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSale.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSale.java index c44ab19b7..e3b6bb78e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSale.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSale.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleDetail.java index f39560935..92ab6db63 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleDetail.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleDetail.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleRefundRecord.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleRefundRecord.java index f28d6009f..2b89fb2ee 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleRefundRecord.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleRefundRecord.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/SysFile.java b/xkt/src/main/java/com/ruoyi/xkt/domain/SysFile.java index c2e348a77..d137c0664 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/SysFile.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/SysFile.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserAccount.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserAccount.java index 0aba55ad9..3ba863794 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserAccount.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/UserAccount.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserAddress.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserAddress.java index 9550a4ca6..d48965ae4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserAddress.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/UserAddress.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserAuthentication.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserAuthentication.java index 50e46e64f..13c60f7e5 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserAuthentication.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/UserAuthentication.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserBillingStatement.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserBillingStatement.java index 4649f288e..f5ec8a27a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserBillingStatement.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/UserBillingStatement.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserBrowsingHistory.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserBrowsingHistory.java index 3df8f1bf1..3daf8c400 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserBrowsingHistory.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/UserBrowsingHistory.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserFavorites.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserFavorites.java index ce170d1a3..2d9faa965 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserFavorites.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/UserFavorites.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserNotice.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserNotice.java index 325b9cb37..1dda5c4db 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserNotice.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/UserNotice.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserNoticeSetting.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserNoticeSetting.java index e1ab80e65..9e4908eaf 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserNoticeSetting.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/UserNoticeSetting.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserQuickFunction.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserQuickFunction.java index 834b7fb6f..15aad440a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserQuickFunction.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/UserQuickFunction.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserShoppingCart.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserShoppingCart.java index 6f6241fd6..23ecdfb1f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserShoppingCart.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/UserShoppingCart.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserSubscriptions.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserSubscriptions.java index c6f1befd5..97b2f1940 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserSubscriptions.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/UserSubscriptions.java @@ -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()) diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdBarcodeMatch/BarcodeMatchDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdBarcodeMatch/BarcodeMatchDTO.java new file mode 100644 index 000000000..7f4c06f81 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdBarcodeMatch/BarcodeMatchDTO.java @@ -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 colorList; + + @Data + public static class BarcodeMatchColorDTO { + @NotNull(message = "颜色ID不能为空") + @ApiModelProperty("档口颜色ID") + private Long storeColorId; + @ApiModelProperty("颜色尺码ID列表") + @NotNull(message = "颜色尺码ID列表不能为空") + @Valid + List sizeList; + } + + @Data + public static class BarcodeMatchSizeDTO { + @NotNull(message = "尺码不能为空") + @ApiModelProperty("尺码") + private Integer size; + @NotBlank(message = "条码不能为空") + @ApiModelProperty("条码") + private String barcode; + } + +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdFuzzyResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdFuzzyResDTO.java new file mode 100644 index 000000000..8e3d7c32d --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdFuzzyResDTO.java @@ -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 colorList; + + @Data + public static class StoreProdFuzzyColorResVO { + @ApiModelProperty("档口颜色ID") + private Long storeColorId; + @ApiModelProperty("颜色名称") + private String colorName; + } +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageResDTO.java index 71e65691f..49d32a7fa 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageResDTO.java @@ -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; } 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 e53083467..4979a6ec4 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 @@ -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") diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchHotMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchHotMapper.java index 125d74fc7..2e164c4c9 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchHotMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchHotMapper.java @@ -15,10 +15,10 @@ public interface PictureSearchHotMapper extends BaseMapper { /** * 查询图搜热款 * - * @param picSearchHotId 图搜热款主键 + * @param id 图搜热款主键 * @return 图搜热款 */ - public PictureSearchHot selectPictureSearchHotByPicSearchHotId(Long picSearchHotId); + public PictureSearchHot selectPictureSearchHotByPicSearchHotId(Long id); /** * 查询图搜热款列表 @@ -47,10 +47,10 @@ public interface PictureSearchHotMapper extends BaseMapper { /** * 删除图搜热款 * - * @param picSearchHotId 图搜热款主键 + * @param id 图搜热款主键 * @return 结果 */ - public int deletePictureSearchHotByPicSearchHotId(Long picSearchHotId); + public int deletePictureSearchHotByPicSearchHotId(Long id); /** * 批量删除图搜热款 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchMapper.java index 5080c9cb1..3430f5f3e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchMapper.java @@ -15,10 +15,10 @@ public interface PictureSearchMapper extends BaseMapper { /** * 查询以图搜款 * - * @param picSearchId 以图搜款主键 + * @param id 以图搜款主键 * @return 以图搜款 */ - public PictureSearch selectPictureSearchByPicSearchId(Long picSearchId); + public PictureSearch selectPictureSearchByPicSearchId(Long id); /** * 查询以图搜款列表 @@ -47,10 +47,10 @@ public interface PictureSearchMapper extends BaseMapper { /** * 删除以图搜款 * - * @param picSearchId 以图搜款主键 + * @param id 以图搜款主键 * @return 结果 */ - public int deletePictureSearchByPicSearchId(Long picSearchId); + public int deletePictureSearchByPicSearchId(Long id); /** * 批量删除以图搜款 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchResultMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchResultMapper.java index 57dbcc91c..5fad3bfc6 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchResultMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchResultMapper.java @@ -15,10 +15,10 @@ public interface PictureSearchResultMapper extends BaseMapper { /** * 查询档口认证 * - * @param storeCertId 档口认证主键 + * @param id 档口认证主键 * @return 档口认证 */ - public StoreCertificate selectStoreCertificateByStoreCertId(Long storeCertId); + public StoreCertificate selectStoreCertificateByStoreCertId(Long id); /** * 查询档口认证列表 @@ -47,10 +47,10 @@ public interface StoreCertificateMapper extends BaseMapper { /** * 删除档口认证 * - * @param storeCertId 档口认证主键 + * @param id 档口认证主键 * @return 结果 */ - public int deleteStoreCertificateByStoreCertId(Long storeCertId); + public int deleteStoreCertificateByStoreCertId(Long id); /** * 批量删除档口认证 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreColorMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreColorMapper.java index 2f1ed62fe..600201bda 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreColorMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreColorMapper.java @@ -16,10 +16,10 @@ public interface StoreColorMapper extends BaseMapper { /** * 查询档口所有颜色 * - * @param storeColorId 档口所有颜色主键 + * @param id 档口所有颜色主键 * @return 档口所有颜色 */ - public StoreColor selectStoreColorByStoreColorId(Long storeColorId); + public StoreColor selectStoreColorByStoreColorId(Long id); /** * 查询档口所有颜色列表 @@ -48,10 +48,10 @@ public interface StoreColorMapper extends BaseMapper { /** * 删除档口所有颜色 * - * @param storeColorId 档口所有颜色主键 + * @param id 档口所有颜色主键 * @return 结果 */ - public int deleteStoreColorByStoreColorId(Long storeColorId); + public int deleteStoreColorByStoreColorId(Long id); /** * 批量删除档口所有颜色 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreCustomerMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreCustomerMapper.java index 51db35b6d..3d9c36fb1 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreCustomerMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreCustomerMapper.java @@ -15,10 +15,10 @@ public interface StoreCustomerMapper extends BaseMapper { /** * 查询档口客户 * - * @param storeCusId 档口客户主键 + * @param id 档口客户主键 * @return 档口客户 */ - public StoreCustomer selectStoreCustomerByStoreCusId(Long storeCusId); + public StoreCustomer selectStoreCustomerByStoreCusId(Long id); /** * 查询档口客户列表 @@ -47,10 +47,10 @@ public interface StoreCustomerMapper extends BaseMapper { /** * 删除档口客户 * - * @param storeCusId 档口客户主键 + * @param id 档口客户主键 * @return 结果 */ - public int deleteStoreCustomerByStoreCusId(Long storeCusId); + public int deleteStoreCustomerByStoreCusId(Long id); /** * 批量删除档口客户 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreCustomerProductDiscountMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreCustomerProductDiscountMapper.java index aaaa88e62..9621dbf9e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreCustomerProductDiscountMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreCustomerProductDiscountMapper.java @@ -15,10 +15,10 @@ public interface StoreCustomerProductDiscountMapper extends BaseMapper { /** * 查询档口合作工厂 * - * @param storeFacId 档口合作工厂主键 + * @param id 档口合作工厂主键 * @return 档口合作工厂 */ - public StoreFactory selectStoreFactoryByStoreFacId(Long storeFacId); + public StoreFactory selectStoreFactoryByStoreFacId(Long id); /** * 查询档口合作工厂列表 @@ -47,10 +47,10 @@ public interface StoreFactoryMapper extends BaseMapper { /** * 删除档口合作工厂 * - * @param storeFacId 档口合作工厂主键 + * @param id 档口合作工厂主键 * @return 结果 */ - public int deleteStoreFactoryByStoreFacId(Long storeFacId); + public int deleteStoreFactoryByStoreFacId(Long id); /** * 批量删除档口合作工厂 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreHomepageMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreHomepageMapper.java index b3069955d..629abd4d0 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreHomepageMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreHomepageMapper.java @@ -15,10 +15,10 @@ public interface StoreHomepageMapper extends BaseMapper { /** * 查询档口首页 * - * @param storeHomeId 档口首页主键 + * @param id 档口首页主键 * @return 档口首页 */ - public StoreHomepage selectStoreHomepageByStoreHomeId(Long storeHomeId); + public StoreHomepage selectStoreHomepageByStoreHomeId(Long id); /** * 查询档口首页列表 @@ -47,10 +47,10 @@ public interface StoreHomepageMapper extends BaseMapper { /** * 删除档口首页 * - * @param storeHomeId 档口首页主键 + * @param id 档口首页主键 * @return 结果 */ - public int deleteStoreHomepageByStoreHomeId(Long storeHomeId); + public int deleteStoreHomepageByStoreHomeId(Long id); /** * 批量删除档口首页 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreMapper.java index 234841989..2996e7a6b 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreMapper.java @@ -15,10 +15,10 @@ public interface StoreMapper extends BaseMapper { /** * 查询档口 * - * @param storeId 档口主键 + * @param id 档口主键 * @return 档口 */ - public Store selectStoreByStoreId(Long storeId); + public Store selectStoreByStoreId(Long id); /** * 查询档口列表 @@ -47,10 +47,10 @@ public interface StoreMapper extends BaseMapper { /** * 删除档口 * - * @param storeId 档口主键 + * @param id 档口主键 * @return 结果 */ - public int deleteStoreByStoreId(Long storeId); + public int deleteStoreByStoreId(Long id); /** * 批量删除档口 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderDetailMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderDetailMapper.java index 2c27c28ce..9c64fb94c 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderDetailMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderDetailMapper.java @@ -15,10 +15,10 @@ public interface StoreOrderDetailMapper extends BaseMapper { /** * 查询档口代发订单明细 * - * @param storeOrderDetailId 档口代发订单明细主键 + * @param id 档口代发订单明细主键 * @return 档口代发订单明细 */ - public StoreOrderDetail selectStoreOrderDetailByStoreOrderDetailId(Long storeOrderDetailId); + public StoreOrderDetail selectStoreOrderDetailByStoreOrderDetailId(Long id); /** * 查询档口代发订单明细列表 @@ -47,10 +47,10 @@ public interface StoreOrderDetailMapper extends BaseMapper { /** * 删除档口代发订单明细 * - * @param storeOrderDetailId 档口代发订单明细主键 + * @param id 档口代发订单明细主键 * @return 结果 */ - public int deleteStoreOrderDetailByStoreOrderDetailId(Long storeOrderDetailId); + public int deleteStoreOrderDetailByStoreOrderDetailId(Long id); /** * 批量删除档口代发订单明细 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderExpressMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderExpressMapper.java index da09f5a5f..6ebaed2d4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderExpressMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderExpressMapper.java @@ -15,10 +15,10 @@ public interface StoreOrderExpressMapper extends BaseMapper { /** * 查询档口代发订单快递 * - * @param storeOrderExprId 档口代发订单快递主键 + * @param id 档口代发订单快递主键 * @return 档口代发订单快递 */ - public StoreOrderExpress selectStoreOrderExpressByStoreOrderExprId(Long storeOrderExprId); + public StoreOrderExpress selectStoreOrderExpressByStoreOrderExprId(Long id); /** * 查询档口代发订单快递列表 @@ -47,10 +47,10 @@ public interface StoreOrderExpressMapper extends BaseMapper { /** * 删除档口代发订单快递 * - * @param storeOrderExprId 档口代发订单快递主键 + * @param id 档口代发订单快递主键 * @return 结果 */ - public int deleteStoreOrderExpressByStoreOrderExprId(Long storeOrderExprId); + public int deleteStoreOrderExpressByStoreOrderExprId(Long id); /** * 批量删除档口代发订单快递 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderMapper.java index 6aa0bfb85..106014618 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderMapper.java @@ -15,10 +15,10 @@ public interface StoreOrderMapper extends BaseMapper { /** * 查询档口代发订单 * - * @param storeOrderId 档口代发订单主键 + * @param id 档口代发订单主键 * @return 档口代发订单 */ - public StoreOrder selectStoreOrderByStoreOrderId(Long storeOrderId); + public StoreOrder selectStoreOrderByStoreOrderId(Long id); /** * 查询档口代发订单列表 @@ -47,10 +47,10 @@ public interface StoreOrderMapper extends BaseMapper { /** * 删除档口代发订单 * - * @param storeOrderId 档口代发订单主键 + * @param id 档口代发订单主键 * @return 结果 */ - public int deleteStoreOrderByStoreOrderId(Long storeOrderId); + public int deleteStoreOrderByStoreOrderId(Long id); /** * 批量删除档口代发订单 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderReceiveMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderReceiveMapper.java index e3be6852d..46adceb04 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderReceiveMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderReceiveMapper.java @@ -15,10 +15,10 @@ public interface StoreOrderReceiveMapper extends BaseMapper { /** * 查询档口代发订单收件人 * - * @param storeOrderRcvId 档口代发订单收件人主键 + * @param id 档口代发订单收件人主键 * @return 档口代发订单收件人 */ - public StoreOrderReceive selectStoreOrderReceiveByStoreOrderRcvId(Long storeOrderRcvId); + public StoreOrderReceive selectStoreOrderReceiveByStoreOrderRcvId(Long id); /** * 查询档口代发订单收件人列表 @@ -47,10 +47,10 @@ public interface StoreOrderReceiveMapper extends BaseMapper { /** * 删除档口代发订单收件人 * - * @param storeOrderRcvId 档口代发订单收件人主键 + * @param id 档口代发订单收件人主键 * @return 结果 */ - public int deleteStoreOrderReceiveByStoreOrderRcvId(Long storeOrderRcvId); + public int deleteStoreOrderReceiveByStoreOrderRcvId(Long id); /** * 批量删除档口代发订单收件人 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductBarcodeMatchMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductBarcodeMatchMapper.java index 8d7247439..bb88f5c1d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductBarcodeMatchMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductBarcodeMatchMapper.java @@ -15,10 +15,10 @@ public interface StoreProductBarcodeMatchMapper extends BaseMapper { /** * 查询档口当前商品颜色 * - * @param storeProdColorId 档口当前商品颜色主键 + * @param id 档口当前商品颜色主键 * @return 档口当前商品颜色 */ - public StoreProductColor selectStoreProductColorByStoreProdColorId(Long storeProdColorId); + public StoreProductColor selectStoreProductColorByStoreProdColorId(Long id); /** * 查询档口当前商品颜色列表 @@ -52,10 +52,10 @@ public interface StoreProductColorMapper extends BaseMapper { /** * 删除档口当前商品颜色 * - * @param storeProdColorId 档口当前商品颜色主键 + * @param id 档口当前商品颜色主键 * @return 结果 */ - public int deleteStoreProductColorByStoreProdColorId(Long storeProdColorId); + public int deleteStoreProductColorByStoreProdColorId(Long id); /** * 批量删除档口当前商品颜色 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorPriceMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorPriceMapper.java index 8da3c72af..3530ddfd6 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorPriceMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorPriceMapper.java @@ -16,10 +16,10 @@ public interface StoreProductColorPriceMapper extends BaseMapper /** * 查询档口商品需求单 * - * @param storeProdDemandId 档口商品需求单主键 + * @param id 档口商品需求单主键 * @return 档口商品需求单 */ - public StoreProductDemand selectStoreProductDemandByStoreProdDemandId(Long storeProdDemandId); + public StoreProductDemand selectStoreProductDemandByStoreProdDemandId(Long id); /** * 查询档口商品需求单列表 @@ -47,10 +47,10 @@ public interface StoreProductDemandMapper extends BaseMapper /** * 删除档口商品需求单 * - * @param storeProdDemandId 档口商品需求单主键 + * @param id 档口商品需求单主键 * @return 结果 */ - public int deleteStoreProductDemandByStoreProdDemandId(Long storeProdDemandId); + public int deleteStoreProductDemandByStoreProdDemandId(Long id); /** * 批量删除档口商品需求单 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductDetailMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductDetailMapper.java index a73f12494..06f830050 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductDetailMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductDetailMapper.java @@ -15,10 +15,10 @@ public interface StoreProductDetailMapper extends BaseMapper /** * 查询档口商品详情内容 * - * @param storeProdDetailId 档口商品详情内容主键 + * @param id 档口商品详情内容主键 * @return 档口商品详情内容 */ - public StoreProductDetail selectStoreProductDetailByStoreProdDetailId(Long storeProdDetailId); + public StoreProductDetail selectStoreProductDetailByStoreProdDetailId(Long id); /** * 查询档口商品详情内容列表 @@ -47,10 +47,10 @@ public interface StoreProductDetailMapper extends BaseMapper /** * 删除档口商品详情内容 * - * @param storeProdDetailId 档口商品详情内容主键 + * @param id 档口商品详情内容主键 * @return 结果 */ - public int deleteStoreProductDetailByStoreProdDetailId(Long storeProdDetailId); + public int deleteStoreProductDetailByStoreProdDetailId(Long id); /** * 批量删除档口商品详情内容 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductFileMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductFileMapper.java index 3e257f417..3722de9ca 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductFileMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductFileMapper.java @@ -19,10 +19,10 @@ public interface StoreProductFileMapper extends BaseMapper { /** * 查询档口商品文件 * - * @param storeProdFileId 档口商品文件主键 + * @param id 档口商品文件主键 * @return 档口商品文件 */ - public StoreProductFile selectStoreProductFileByStoreProdFileId(Long storeProdFileId); + public StoreProductFile selectStoreProductFileByStoreProdFileId(Long id); /** * 查询档口商品文件列表 @@ -51,10 +51,10 @@ public interface StoreProductFileMapper extends BaseMapper { /** * 删除档口商品文件 * - * @param storeProdFileId 档口商品文件主键 + * @param id 档口商品文件主键 * @return 结果 */ - public int deleteStoreProductFileByStoreProdFileId(Long storeProdFileId); + public int deleteStoreProductFileByStoreProdFileId(Long id); /** * 批量删除档口商品文件 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductMapper.java index 9dbf63aa4..3cc9a40c6 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductMapper.java @@ -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 { /** * 查询档口商品 * - * @param storeProdId 档口商品主键 + * @param id 档口商品主键 * @return 档口商品 */ - public StoreProduct selectStoreProductByStoreProdId(Long storeProdId); + public StoreProduct selectStoreProductByStoreProdId(Long id); /** * 查询档口商品列表 @@ -50,10 +47,10 @@ public interface StoreProductMapper extends BaseMapper { /** * 删除档口商品 * - * @param storeProdId 档口商品主键 + * @param id 档口商品主键 * @return 结果 */ - public int deleteStoreProductByStoreProdId(Long storeProdId); + public int deleteStoreProductByStoreProdId(Long id); /** * 批量删除档口商品 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductProcessMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductProcessMapper.java index 258602819..f53d56af7 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductProcessMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductProcessMapper.java @@ -15,10 +15,10 @@ public interface StoreProductProcessMapper extends BaseMapper { /** * 查询档口商品库存 * - * @param storeProdStockId 档口商品库存主键 + * @param id 档口商品库存主键 * @return 档口商品库存 */ - public StoreProductStock selectStoreProductStockByStoreProdStockId(Long storeProdStockId); + public StoreProductStock selectStoreProductStockByStoreProdStockId(Long id); /** * 查询档口商品库存列表 @@ -47,10 +47,10 @@ public interface StoreProductStockMapper extends BaseMapper { /** * 删除档口商品库存 * - * @param storeProdStockId 档口商品库存主键 + * @param id 档口商品库存主键 * @return 结果 */ - public int deleteStoreProductStockByStoreProdStockId(Long storeProdStockId); + public int deleteStoreProductStockByStoreProdStockId(Long id); /** * 批量删除档口商品库存 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStorageDemandDeducteMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStorageDemandDeducteMapper.java index cda0c092e..d65ff5fb2 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStorageDemandDeducteMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStorageDemandDeducteMapper.java @@ -15,10 +15,10 @@ public interface StoreProductStorageDemandDeducteMapper extends BaseMapper /** * 查询档口快捷功能 * - * @param storeQuickFuncId 档口快捷功能主键 + * @param id 档口快捷功能主键 * @return 档口快捷功能 */ - public StoreQuickFunction selectStoreQuickFunctionByStoreQuickFuncId(Long storeQuickFuncId); + public StoreQuickFunction selectStoreQuickFunctionByStoreQuickFuncId(Long id); /** * 查询档口快捷功能列表 @@ -47,10 +47,10 @@ public interface StoreQuickFunctionMapper extends BaseMapper /** * 删除档口快捷功能 * - * @param storeQuickFuncId 档口快捷功能主键 + * @param id 档口快捷功能主键 * @return 结果 */ - public int deleteStoreQuickFunctionByStoreQuickFuncId(Long storeQuickFuncId); + public int deleteStoreQuickFunctionByStoreQuickFuncId(Long id); /** * 批量删除档口快捷功能 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreRoleAccountMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreRoleAccountMapper.java index 1c9230de7..6e3b6b411 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreRoleAccountMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreRoleAccountMapper.java @@ -15,10 +15,10 @@ public interface StoreRoleAccountMapper extends BaseMapper { /** * 查询档口子角色账号 * - * @param storeRoleAccId 档口子角色账号主键 + * @param id 档口子角色账号主键 * @return 档口子角色账号 */ - public StoreRoleAccount selectStoreRoleAccountByStoreRoleAccId(Long storeRoleAccId); + public StoreRoleAccount selectStoreRoleAccountByStoreRoleAccId(Long id); /** * 查询档口子角色账号列表 @@ -47,10 +47,10 @@ public interface StoreRoleAccountMapper extends BaseMapper { /** * 删除档口子角色账号 * - * @param storeRoleAccId 档口子角色账号主键 + * @param id 档口子角色账号主键 * @return 结果 */ - public int deleteStoreRoleAccountByStoreRoleAccId(Long storeRoleAccId); + public int deleteStoreRoleAccountByStoreRoleAccId(Long id); /** * 批量删除档口子角色账号 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreRoleMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreRoleMapper.java index b18ec03e6..0ac15a31c 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreRoleMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreRoleMapper.java @@ -15,10 +15,10 @@ public interface StoreRoleMapper extends BaseMapper { /** * 查询档口子角色 * - * @param storeRoleId 档口子角色主键 + * @param id 档口子角色主键 * @return 档口子角色 */ - public StoreRole selectStoreRoleByStoreRoleId(Long storeRoleId); + public StoreRole selectStoreRoleByStoreRoleId(Long id); /** * 查询档口子角色列表 @@ -47,10 +47,10 @@ public interface StoreRoleMapper extends BaseMapper { /** * 删除档口子角色 * - * @param storeRoleId 档口子角色主键 + * @param id 档口子角色主键 * @return 结果 */ - public int deleteStoreRoleByStoreRoleId(Long storeRoleId); + public int deleteStoreRoleByStoreRoleId(Long id); /** * 批量删除档口子角色 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreRoleMenuMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreRoleMenuMapper.java index 5b3b67407..00cf81d36 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreRoleMenuMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreRoleMenuMapper.java @@ -15,10 +15,10 @@ public interface StoreRoleMenuMapper extends BaseMapper { /** * 查询档口子角色菜单 * - * @param storeRoleMenuId 档口子角色菜单主键 + * @param id 档口子角色菜单主键 * @return 档口子角色菜单 */ - public StoreRoleMenu selectStoreRoleMenuByStoreRoleMenuId(Long storeRoleMenuId); + public StoreRoleMenu selectStoreRoleMenuByStoreRoleMenuId(Long id); /** * 查询档口子角色菜单列表 @@ -47,10 +47,10 @@ public interface StoreRoleMenuMapper extends BaseMapper { /** * 删除档口子角色菜单 * - * @param storeRoleMenuId 档口子角色菜单主键 + * @param id 档口子角色菜单主键 * @return 结果 */ - public int deleteStoreRoleMenuByStoreRoleMenuId(Long storeRoleMenuId); + public int deleteStoreRoleMenuByStoreRoleMenuId(Long id); /** * 批量删除档口子角色菜单 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleDetailMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleDetailMapper.java index c1967b3ca..62043a014 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleDetailMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleDetailMapper.java @@ -15,10 +15,10 @@ public interface StoreSaleDetailMapper extends BaseMapper { /** * 查询档口销售明细 * - * @param storeSaleDetailId 档口销售明细主键 + * @param id 档口销售明细主键 * @return 档口销售明细 */ - public StoreSaleDetail selectStoreSaleDetailByStoreSaleDetailId(Long storeSaleDetailId); + public StoreSaleDetail selectStoreSaleDetailByStoreSaleDetailId(Long id); /** * 查询档口销售明细列表 @@ -47,10 +47,10 @@ public interface StoreSaleDetailMapper extends BaseMapper { /** * 删除档口销售明细 * - * @param storeSaleDetailId 档口销售明细主键 + * @param id 档口销售明细主键 * @return 结果 */ - public int deleteStoreSaleDetailByStoreSaleDetailId(Long storeSaleDetailId); + public int deleteStoreSaleDetailByStoreSaleDetailId(Long id); /** * 批量删除档口销售明细 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleMapper.java index a0280af07..374b3bbf5 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleMapper.java @@ -15,10 +15,10 @@ public interface StoreSaleMapper extends BaseMapper { /** * 查询档口销售出库 * - * @param storeSaleId 档口销售出库主键 + * @param id 档口销售出库主键 * @return 档口销售出库 */ - public StoreSale selectStoreSaleByStoreSaleId(Long storeSaleId); + public StoreSale selectStoreSaleByStoreSaleId(Long id); /** * 查询档口销售出库列表 @@ -47,10 +47,10 @@ public interface StoreSaleMapper extends BaseMapper { /** * 删除档口销售出库 * - * @param storeSaleId 档口销售出库主键 + * @param id 档口销售出库主键 * @return 结果 */ - public int deleteStoreSaleByStoreSaleId(Long storeSaleId); + public int deleteStoreSaleByStoreSaleId(Long id); /** * 批量删除档口销售出库 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleRefundRecordMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleRefundRecordMapper.java index 9aeb325fd..5899bca0e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleRefundRecordMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleRefundRecordMapper.java @@ -15,10 +15,10 @@ public interface StoreSaleRefundRecordMapper extends BaseMapper { /** * 查询file * - * @param fileId file主键 + * @param id file主键 * @return file */ - public SysFile selectSysFileByFileId(Long fileId); + public SysFile selectSysFileByFileId(Long id); /** * 查询file列表 @@ -47,10 +47,10 @@ public interface SysFileMapper extends BaseMapper { /** * 删除file * - * @param fileId file主键 + * @param id file主键 * @return 结果 */ - public int deleteSysFileByFileId(Long fileId); + public int deleteSysFileByFileId(Long id); /** * 批量删除file diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAccountMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAccountMapper.java index a3702d04c..3a6c61bdb 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAccountMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAccountMapper.java @@ -15,10 +15,10 @@ public interface UserAccountMapper extends BaseMapper { /** * 查询用户账户（支付宝、微信等） * - * @param userAccId 用户账户（支付宝、微信等）主键 + * @param id 用户账户（支付宝、微信等）主键 * @return 用户账户（支付宝、微信等） */ - public UserAccount selectUserAccountByUserAccId(Long userAccId); + public UserAccount selectUserAccountByUserAccId(Long id); /** * 查询用户账户（支付宝、微信等）列表 @@ -47,10 +47,10 @@ public interface UserAccountMapper extends BaseMapper { /** * 删除用户账户（支付宝、微信等） * - * @param userAccId 用户账户（支付宝、微信等）主键 + * @param id 用户账户（支付宝、微信等）主键 * @return 结果 */ - public int deleteUserAccountByUserAccId(Long userAccId); + public int deleteUserAccountByUserAccId(Long id); /** * 批量删除用户账户（支付宝、微信等） diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAddressMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAddressMapper.java index c10ad904a..f3f16687d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAddressMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAddressMapper.java @@ -15,10 +15,10 @@ public interface UserAddressMapper extends BaseMapper { /** * 查询用户收货地址 * - * @param userAddrId 用户收货地址主键 + * @param id 用户收货地址主键 * @return 用户收货地址 */ - public UserAddress selectUserAddressByUserAddrId(Long userAddrId); + public UserAddress selectUserAddressByUserAddrId(Long id); /** * 查询用户收货地址列表 @@ -47,10 +47,10 @@ public interface UserAddressMapper extends BaseMapper { /** * 删除用户收货地址 * - * @param userAddrId 用户收货地址主键 + * @param id 用户收货地址主键 * @return 结果 */ - public int deleteUserAddressByUserAddrId(Long userAddrId); + public int deleteUserAddressByUserAddrId(Long id); /** * 批量删除用户收货地址 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAuthenticationMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAuthenticationMapper.java index 9d426ce81..8ac9738a0 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAuthenticationMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAuthenticationMapper.java @@ -15,10 +15,10 @@ public interface UserAuthenticationMapper extends BaseMapper /** * 查询用户代发认证 * - * @param userAuthId 用户代发认证主键 + * @param id 用户代发认证主键 * @return 用户代发认证 */ - public UserAuthentication selectUserAuthenticationByUserAuthId(Long userAuthId); + public UserAuthentication selectUserAuthenticationByUserAuthId(Long id); /** * 查询用户代发认证列表 @@ -47,10 +47,10 @@ public interface UserAuthenticationMapper extends BaseMapper /** * 删除用户代发认证 * - * @param userAuthId 用户代发认证主键 + * @param id 用户代发认证主键 * @return 结果 */ - public int deleteUserAuthenticationByUserAuthId(Long userAuthId); + public int deleteUserAuthenticationByUserAuthId(Long id); /** * 批量删除用户代发认证 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserBillingStatementMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserBillingStatementMapper.java index 90ac48b43..e89390c5a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserBillingStatementMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserBillingStatementMapper.java @@ -15,10 +15,10 @@ public interface UserBillingStatementMapper extends BaseMapper { /** * 查询用户收藏商品 * - * @param userFavoId 用户收藏商品主键 + * @param id 用户收藏商品主键 * @return 用户收藏商品 */ - public UserFavorites selectUserFavoritesByUserFavoId(Long userFavoId); + public UserFavorites selectUserFavoritesByUserFavoId(Long id); /** * 查询用户收藏商品列表 @@ -47,10 +47,10 @@ public interface UserFavoritesMapper extends BaseMapper { /** * 删除用户收藏商品 * - * @param userFavoId 用户收藏商品主键 + * @param id 用户收藏商品主键 * @return 结果 */ - public int deleteUserFavoritesByUserFavoId(Long userFavoId); + public int deleteUserFavoritesByUserFavoId(Long id); /** * 批量删除用户收藏商品 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserNoticeMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserNoticeMapper.java index be7c909d6..6a6c11cc1 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserNoticeMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserNoticeMapper.java @@ -15,10 +15,10 @@ public interface UserNoticeMapper extends BaseMapper { /** * 查询用户所有通知 * - * @param userNoticeId 用户所有通知主键 + * @param id 用户所有通知主键 * @return 用户所有通知 */ - public UserNotice selectUserNoticeByUserNoticeId(Long userNoticeId); + public UserNotice selectUserNoticeByUserNoticeId(Long id); /** * 查询用户所有通知列表 @@ -47,10 +47,10 @@ public interface UserNoticeMapper extends BaseMapper { /** * 删除用户所有通知 * - * @param userNoticeId 用户所有通知主键 + * @param id 用户所有通知主键 * @return 结果 */ - public int deleteUserNoticeByUserNoticeId(Long userNoticeId); + public int deleteUserNoticeByUserNoticeId(Long id); /** * 批量删除用户所有通知 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserNoticeSettingMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserNoticeSettingMapper.java index ca1735c3f..4c98d9c3d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserNoticeSettingMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserNoticeSettingMapper.java @@ -15,10 +15,10 @@ public interface UserNoticeSettingMapper extends BaseMapper { /** * 查询用户通知接收设置 * - * @param userNoticeSetId 用户通知接收设置主键 + * @param id 用户通知接收设置主键 * @return 用户通知接收设置 */ - public UserNoticeSetting selectUserNoticeSettingByUserNoticeSetId(Long userNoticeSetId); + public UserNoticeSetting selectUserNoticeSettingByUserNoticeSetId(Long id); /** * 查询用户通知接收设置列表 @@ -47,10 +47,10 @@ public interface UserNoticeSettingMapper extends BaseMapper { /** * 删除用户通知接收设置 * - * @param userNoticeSetId 用户通知接收设置主键 + * @param id 用户通知接收设置主键 * @return 结果 */ - public int deleteUserNoticeSettingByUserNoticeSetId(Long userNoticeSetId); + public int deleteUserNoticeSettingByUserNoticeSetId(Long id); /** * 批量删除用户通知接收设置 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserQuickFunctionMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserQuickFunctionMapper.java index 138b4c3ff..3ec4884d6 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserQuickFunctionMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserQuickFunctionMapper.java @@ -15,10 +15,10 @@ public interface UserQuickFunctionMapper extends BaseMapper { /** * 查询用户快捷功能 * - * @param userQuickFuncId 用户快捷功能主键 + * @param id 用户快捷功能主键 * @return 用户快捷功能 */ - public UserQuickFunction selectUserQuickFunctionByUserQuickFuncId(Long userQuickFuncId); + public UserQuickFunction selectUserQuickFunctionByUserQuickFuncId(Long id); /** * 查询用户快捷功能列表 @@ -47,10 +47,10 @@ public interface UserQuickFunctionMapper extends BaseMapper { /** * 删除用户快捷功能 * - * @param userQuickFuncId 用户快捷功能主键 + * @param id 用户快捷功能主键 * @return 结果 */ - public int deleteUserQuickFunctionByUserQuickFuncId(Long userQuickFuncId); + public int deleteUserQuickFunctionByUserQuickFuncId(Long id); /** * 批量删除用户快捷功能 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserShoppingCartMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserShoppingCartMapper.java index c2a95eb69..7307e44bb 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserShoppingCartMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserShoppingCartMapper.java @@ -15,10 +15,10 @@ public interface UserShoppingCartMapper extends BaseMapper { /** * 查询用户进货车 * - * @param userShopCartId 用户进货车主键 + * @param id 用户进货车主键 * @return 用户进货车 */ - public UserShoppingCart selectUserShoppingCartByUserShopCartId(Long userShopCartId); + public UserShoppingCart selectUserShoppingCartByUserShopCartId(Long id); /** * 查询用户进货车列表 @@ -47,10 +47,10 @@ public interface UserShoppingCartMapper extends BaseMapper { /** * 删除用户进货车 * - * @param userShopCartId 用户进货车主键 + * @param id 用户进货车主键 * @return 结果 */ - public int deleteUserShoppingCartByUserShopCartId(Long userShopCartId); + public int deleteUserShoppingCartByUserShopCartId(Long id); /** * 批量删除用户进货车 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserSubscriptionsMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserSubscriptionsMapper.java index ad3a8a1c1..fe939fd39 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserSubscriptionsMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserSubscriptionsMapper.java @@ -15,10 +15,10 @@ public interface UserSubscriptionsMapper extends BaseMapper { /** * 查询用户关注u档口 * - * @param userSubsId 用户关注u档口主键 + * @param id 用户关注u档口主键 * @return 用户关注u档口 */ - public UserSubscriptions selectUserSubscriptionsByUserSubsId(Long userSubsId); + public UserSubscriptions selectUserSubscriptionsByUserSubsId(Long id); /** * 查询用户关注u档口列表 @@ -47,10 +47,10 @@ public interface UserSubscriptionsMapper extends BaseMapper { /** * 删除用户关注u档口 * - * @param userSubsId 用户关注u档口主键 + * @param id 用户关注u档口主键 * @return 结果 */ - public int deleteUserSubscriptionsByUserSubsId(Long userSubsId); + public int deleteUserSubscriptionsByUserSubsId(Long id); /** * 批量删除用户关注u档口 diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductBarcodeMatchService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductBarcodeMatchService.java index 538c68bfa..c83e0f4d4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductBarcodeMatchService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductBarcodeMatchService.java @@ -1,6 +1,7 @@ package com.ruoyi.xkt.service; import com.ruoyi.xkt.domain.StoreProductBarcodeMatch; +import com.ruoyi.xkt.dto.storeProdBarcodeMatch.BarcodeMatchDTO; import java.util.List; @@ -58,4 +59,8 @@ public interface IStoreProductBarcodeMatchService { * @return 结果 */ public int deleteStoreProductBarcodeMatchByStoreProdBarcodeMatchId(Long storeProdBarcodeMatchId); + + + int updateBarcodeMatch(BarcodeMatchDTO barcodeMatchDTO); + } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java index ef700767c..d252802fb 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java @@ -76,8 +76,8 @@ public interface IStoreProductService { * 根据档口ID和商品货号模糊查询货号列表 * @param storeId 档口ID * @param prodArtNum 商品货号 - * @return List + * @return List */ - List fuzzyQueryList(Long storeId, String prodArtNum); + List fuzzyQueryList(Long storeId, String prodArtNum); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductBarcodeMatchServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductBarcodeMatchServiceImpl.java index 47625de19..e0b5cec3e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductBarcodeMatchServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductBarcodeMatchServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.xkt.service.impl; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.xkt.domain.StoreProductBarcodeMatch; +import com.ruoyi.xkt.dto.storeProdBarcodeMatch.BarcodeMatchDTO; import com.ruoyi.xkt.mapper.StoreProductBarcodeMatchMapper; import com.ruoyi.xkt.service.IStoreProductBarcodeMatchService; import org.springframework.beans.factory.annotation.Autowired; @@ -90,4 +91,9 @@ public class StoreProductBarcodeMatchServiceImpl implements IStoreProductBarcode public int deleteStoreProductBarcodeMatchByStoreProdBarcodeMatchId(Long storeProdBarcodeMatchId) { return storeProductBarcodeMatchMapper.deleteStoreProductBarcodeMatchByStoreProdBarcodeMatchId(storeProdBarcodeMatchId); } + + @Override + public int updateBarcodeMatch(BarcodeMatchDTO barcodeMatchDTO) { + return 0; + } } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java index 35c5a9097..41b20ad19 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java @@ -63,9 +63,9 @@ public class StoreProductServiceImpl implements IStoreProductService { @Transactional(readOnly = true) public StoreProdResDTO selectStoreProductByStoreProdId(Long storeProdId) { StoreProduct storeProd = Optional.ofNullable(this.storeProdMapper.selectOne(new LambdaQueryWrapper() - .eq(StoreProduct::getStoreProdId, storeProdId).eq(StoreProduct::getDelFlag, "0"))) + .eq(StoreProduct::getId, storeProdId).eq(StoreProduct::getDelFlag, "0"))) .orElseThrow(() -> new ServiceException("档口商品不存在!", HttpStatus.ERROR)); - StoreProdResDTO storeProdResDTO = BeanUtil.toBean(storeProd, StoreProdResDTO.class); + StoreProdResDTO storeProdResDTO = BeanUtil.toBean(storeProd, StoreProdResDTO.class).setStoreProdId(storeProd.getId()); // 档口文件（商品主图、主图视频、下载的商品详情） List fileResList = this.storeProdFileMapper.selectListByStoreProdId(storeProdId); storeProdResDTO.setFileList(CollectionUtils.isEmpty(fileResList) ? new ArrayList<>() : BeanUtil.copyToList(fileResList, StoreProdFileResDTO.class)); @@ -97,7 +97,7 @@ public class StoreProductServiceImpl implements IStoreProductService { @Transactional(readOnly = true) public StoreProdPicSpaceResDTO getStoreProductPicSpace(Long storeId) { Store store = Optional.ofNullable(this.storeMapper.selectOne(new LambdaQueryWrapper() - .eq(Store::getStoreId, storeId).eq(Store::getDelFlag, "0"))) + .eq(Store::getId, storeId).eq(Store::getDelFlag, "0"))) .orElseThrow(() -> new ServiceException("档口不存在!", HttpStatus.ERROR)); return StoreProdPicSpaceResDTO.builder().storeId(storeId).storeName(store.getStoreName()) .fileList(this.storeProdFileMapper.selectPicSpaceList(storeId, "DOWNLOAD")).build(); @@ -162,50 +162,50 @@ public class StoreProductServiceImpl implements IStoreProductService { List fileList = BeanUtil.copyToList(fileDTOList, SysFile.class); this.fileMapper.insert(fileList); // 将文件名称和文件ID映射到Map中 - Map fileMap = fileList.stream().collect(Collectors.toMap(SysFile::getFileName, SysFile::getFileId)); + Map fileMap = fileList.stream().collect(Collectors.toMap(SysFile::getFileName, SysFile::getId)); // 档口文件（商品主图、主图视频、下载的商品详情） List prodFileList = fileDTOList.stream() .map(x -> BeanUtil.toBean(x, StoreProductFile.class).setFileId(fileMap.get(x.getFileName())) - .setStoreProdId(storeProd.getStoreProdId())) + .setStoreProdId(storeProd.getId()).setStoreId(storeProdDTO.getStoreId())) .collect(Collectors.toList()); this.storeProdFileMapper.insert(prodFileList); // 档口类目属性列表 List cateAttrList = storeProdDTO.getCateAttrList().stream() .map(x -> BeanUtil.toBean(x, StoreProductCategoryAttribute.class) - .setStoreProdId(storeProd.getStoreProdId())) + .setStoreProdId(storeProd.getId())) .collect(Collectors.toList()); this.storeProdCateAttrMapper.insert(cateAttrList); // 档口颜色列表 List colorList = storeProdDTO.getColorList().stream() .map(x -> BeanUtil.toBean(x, StoreProductColor.class) - .setStoreProdId(storeProd.getStoreProdId())) + .setStoreProdId(storeProd.getId()).setStoreId(storeProdDTO.getStoreId())) .collect(Collectors.toList()); this.storeProdColorMapper.insert(colorList); // 档口颜色尺码列表 List sizeList = storeProdDTO.getSizeList().stream() .map(x -> BeanUtil.toBean(x, StoreProductColorSize.class) - .setStoreProdId(storeProd.getStoreProdId())) + .setStoreProdId(storeProd.getId())) .collect(Collectors.toList()); this.storeProdColorSizeMapper.insert(sizeList); // 档口颜色价格列表 List priceList = storeProdDTO.getPriceList().stream() .map(x -> BeanUtil.toBean(x, StoreProductColorPrice.class) - .setStoreProdId(storeProd.getStoreProdId())) + .setStoreProdId(storeProd.getId())) .collect(Collectors.toList()); this.storeProdColorPriceMapper.insert(priceList); // 档口详情内容 StoreProductDetail storeProdDetail = BeanUtil.toBean(storeProdDTO.getDetail(), StoreProductDetail.class) - .setStoreProdId(storeProd.getStoreProdId()); + .setStoreProdId(storeProd.getId()); this.storeProdDetailMapper.insert(storeProdDetail); // 档口服务承诺 if (ObjectUtils.isNotEmpty(storeProdDTO.getSvc())) { this.storeProdSvcMapper.insert(BeanUtil.toBean(storeProdDTO.getSvc(), StoreProductService.class) - .setStoreProdId(storeProd.getStoreProdId())); + .setStoreProdId(storeProd.getId())); } // 档口生产工艺信息 if (ObjectUtils.isNotEmpty(storeProdDTO.getProcess())) { this.storeProdProcMapper.insert(BeanUtil.toBean(storeProdDTO.getProcess(), StoreProductProcess.class) - .setStoreProdId(storeProd.getStoreProdId())); + .setStoreProdId(storeProd.getId())); } return count; } @@ -220,7 +220,7 @@ public class StoreProductServiceImpl implements IStoreProductService { @Transactional public int updateStoreProduct(final Long storeProdId, StoreProdDTO storeProdDTO) { StoreProduct storeProd = Optional.ofNullable(this.storeProdMapper.selectOne(new LambdaQueryWrapper() - .eq(StoreProduct::getStoreProdId, storeProdId).eq(StoreProduct::getDelFlag, "0"))) + .eq(StoreProduct::getId, storeProdId).eq(StoreProduct::getDelFlag, "0"))) .orElseThrow(() -> new ServiceException("档口商品不存在!", HttpStatus.ERROR)); // 将档口商品的del_flag置为2 storeProd.setDelFlag("2"); @@ -302,14 +302,15 @@ public class StoreProductServiceImpl implements IStoreProductService { */ @Override @Transactional(readOnly = true) - public List fuzzyQueryList(Long storeId, String prodArtNum) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + public List fuzzyQueryList(Long storeId, String prodArtNum) { + /* LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(StoreProduct::getStoreId, storeId).eq(StoreProduct::getDelFlag, "0"); if (StringUtils.isNotBlank(prodArtNum)) { queryWrapper.like(StoreProduct::getProdArtNum, prodArtNum); } List storeProdList = this.storeProdMapper.selectList(queryWrapper); return CollectionUtils.isEmpty(storeProdList) ? new ArrayList<>() - : storeProdList.stream().map(StoreProduct::getProdArtNum).distinct().collect(Collectors.toList()); + : storeProdList.stream().map(StoreProduct::getProdArtNum).distinct().collect(Collectors.toList());*/ + return null; } } diff --git a/xkt/src/main/resources/mapper/PictureSearchHotMapper.xml b/xkt/src/main/resources/mapper/PictureSearchHotMapper.xml index df18e618c..26008dfc4 100644 --- a/xkt/src/main/resources/mapper/PictureSearchHotMapper.xml +++ b/xkt/src/main/resources/mapper/PictureSearchHotMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select pic_search_hot_id, store_prod_file_id, file_id, store_id, search_count, version, del_flag, create_by, create_time, update_by, update_time from picture_search_hot + select id, store_prod_file_id, file_id, store_id, search_count, version, del_flag, create_by, create_time, update_by, update_time from picture_search_hot - where pic_search_hot_id = #{picSearchHotId} + where id = #{id} @@ -80,17 +80,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where pic_search_hot_id = #{picSearchHotId} + where id = #{id} - delete from picture_search_hot where pic_search_hot_id = #{picSearchHotId} + delete from picture_search_hot where id = #{id} - delete from picture_search_hot where pic_search_hot_id in - - #{picSearchHotId} + delete from picture_search_hot where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/PictureSearchMapper.xml b/xkt/src/main/resources/mapper/PictureSearchMapper.xml index f29dc6267..1fcf35ad6 100644 --- a/xkt/src/main/resources/mapper/PictureSearchMapper.xml +++ b/xkt/src/main/resources/mapper/PictureSearchMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select pic_search_id, search_file_id, user_id, voucher_date, version, del_flag, create_by, create_time, update_by, update_time from picture_search + select id, search_file_id, user_id, voucher_date, version, del_flag, create_by, create_time, update_by, update_time from picture_search - where pic_search_id = #{picSearchId} + where id = #{id} @@ -75,17 +75,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where pic_search_id = #{picSearchId} + where id = #{id} - delete from picture_search where pic_search_id = #{picSearchId} + delete from picture_search where id = #{id} - delete from picture_search where pic_search_id in - - #{picSearchId} + delete from picture_search where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/PictureSearchResultMapper.xml b/xkt/src/main/resources/mapper/PictureSearchResultMapper.xml index 8493047f5..0e582ebcc 100644 --- a/xkt/src/main/resources/mapper/PictureSearchResultMapper.xml +++ b/xkt/src/main/resources/mapper/PictureSearchResultMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select pic_search_res_id, pic_search_id, file_id, category_id, score, sort_expr_values, version, del_flag, create_by, create_time, update_by, update_time from picture_search_result + select id, pic_search_id, file_id, category_id, score, sort_expr_values, version, del_flag, create_by, create_time, update_by, update_time from picture_search_result - where pic_search_res_id = #{picSearchResId} + where id = #{id} @@ -85,17 +85,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where pic_search_res_id = #{picSearchResId} + where id = #{id} - delete from picture_search_result where pic_search_res_id = #{picSearchResId} + delete from picture_search_result where id = #{id} - delete from picture_search_result where pic_search_res_id in - - #{picSearchResId} + delete from picture_search_result where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreCertificateMapper.xml b/xkt/src/main/resources/mapper/StoreCertificateMapper.xml index b5ddc05aa..6be0f9461 100644 --- a/xkt/src/main/resources/mapper/StoreCertificateMapper.xml +++ b/xkt/src/main/resources/mapper/StoreCertificateMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_cert_id, store_id, real_name, phone, id_card, id_card_front_file_id, id_card_back_file_id, license_file_id, social_credit_code, sole_proprietorship_type, market_entry_type, license_name, register_org, register_status, legal_name, real_business_address, business_scope, register_capital, establish_date, business_term_start_date, business_term_end_date, approval_date, cert_status, version, del_flag, create_by, create_time, update_by, update_time from store_certificate + select id, store_id, real_name, phone, id_card, id_card_front_file_id, id_card_back_file_id, license_file_id, social_credit_code, sole_proprietorship_type, market_entry_type, license_name, register_org, register_status, legal_name, real_business_address, business_scope, register_capital, establish_date, business_term_start_date, business_term_end_date, approval_date, cert_status, version, del_flag, create_by, create_time, update_by, update_time from store_certificate - where store_cert_id = #{storeCertId} + where id = #{id} @@ -170,17 +170,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_cert_id = #{storeCertId} + where id = #{id} - delete from store_certificate where store_cert_id = #{storeCertId} + delete from store_certificate where id = #{id} - delete from store_certificate where store_cert_id in - - #{storeCertId} + delete from store_certificate where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreColorMapper.xml b/xkt/src/main/resources/mapper/StoreColorMapper.xml index 0c42e1144..92517f910 100644 --- a/xkt/src/main/resources/mapper/StoreColorMapper.xml +++ b/xkt/src/main/resources/mapper/StoreColorMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_color_id, store_id, color_name, order_num, version, del_flag, create_by, create_time, update_by, update_time from store_color + select id, store_id, color_name, order_num, version, del_flag, create_by, create_time, update_by, update_time from store_color - where store_color_id = #{storeColorId} + where id = #{id} @@ -75,23 +75,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_color_id = #{storeColorId} + where id = #{id} - delete from store_color where store_color_id = #{storeColorId} + delete from store_color where id = #{id} - delete from store_color where store_color_id in - - #{storeColorId} + delete from store_color where id in + + #{id} @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -79,17 +79,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_cus_id = #{storeCusId} + where id = #{id} - delete from store_customer where store_cus_id = #{storeCusId} + delete from store_customer where id = #{id} - delete from store_customer where store_cus_id in - - #{storeCusId} + delete from store_customer where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreCustomerProductDiscountMapper.xml b/xkt/src/main/resources/mapper/StoreCustomerProductDiscountMapper.xml index dfc9b3f52..e632ba536 100644 --- a/xkt/src/main/resources/mapper/StoreCustomerProductDiscountMapper.xml +++ b/xkt/src/main/resources/mapper/StoreCustomerProductDiscountMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_cus_prod_disc_id, store_prod_id, store_cus_id, store_prod_color_id, discount, version, del_flag, create_by, create_time, update_by, update_time from store_customer_product_discount + select id, store_prod_id, store_cus_id, store_prod_color_id, discount, version, del_flag, create_by, create_time, update_by, update_time from store_customer_product_discount - where store_cus_prod_disc_id = #{storeCusProdDiscId} + where id = #{id} @@ -80,17 +80,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_cus_prod_disc_id = #{storeCusProdDiscId} + where id = #{id} - delete from store_customer_product_discount where store_cus_prod_disc_id = #{storeCusProdDiscId} + delete from store_customer_product_discount where id = #{id} - delete from store_customer_product_discount where store_cus_prod_disc_id in - - #{storeCusProdDiscId} + delete from store_customer_product_discount where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreFactoryMapper.xml b/xkt/src/main/resources/mapper/StoreFactoryMapper.xml index f38fb5813..e788445f1 100644 --- a/xkt/src/main/resources/mapper/StoreFactoryMapper.xml +++ b/xkt/src/main/resources/mapper/StoreFactoryMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_fac_id, store_id, fac_name, fac_address, fac_phone, remark, fac_status, version, del_flag, create_by, create_time, update_by, update_time from store_factory + select id, store_id, fac_name, fac_address, fac_phone, remark, fac_status, version, del_flag, create_by, create_time, update_by, update_time from store_factory - where store_fac_id = #{storeFacId} + where id = #{id} @@ -89,17 +89,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_fac_id = #{storeFacId} + where id = #{id} - delete from store_factory where store_fac_id = #{storeFacId} + delete from store_factory where id = #{id} - delete from store_factory where store_fac_id in - - #{storeFacId} + delete from store_factory where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreHomepageMapper.xml b/xkt/src/main/resources/mapper/StoreHomepageMapper.xml index 8b229fbe6..acee9a7ba 100644 --- a/xkt/src/main/resources/mapper/StoreHomepageMapper.xml +++ b/xkt/src/main/resources/mapper/StoreHomepageMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_home_id, store_id, type, file_id, order_num, version, del_flag, create_by, create_time, update_by, update_time from store_homepage + select id, store_id, type, file_id, order_num, version, del_flag, create_by, create_time, update_by, update_time from store_homepage - where store_home_id = #{storeHomeId} + where id = #{id} @@ -80,17 +80,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_home_id = #{storeHomeId} + where id = #{id} - delete from store_homepage where store_home_id = #{storeHomeId} + delete from store_homepage where id = #{id} - delete from store_homepage where store_home_id in - - #{storeHomeId} + delete from store_homepage where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreMapper.xml b/xkt/src/main/resources/mapper/StoreMapper.xml index c4bb11afa..225de4382 100644 --- a/xkt/src/main/resources/mapper/StoreMapper.xml +++ b/xkt/src/main/resources/mapper/StoreMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_id, user_id, store_name, brand_name, login_account, contact_name, contact_phone, contact_back_phone, wechat_account, qq_account, alipay_account, operate_years, store_address, fac_address, prod_scale, integrity_gold, remark, trial_end_time, storage_usage, store_status, template_num, version, del_flag, create_by, create_time, update_by, update_time from store + select id, user_id, store_name, brand_name, login_account, contact_name, contact_phone, contact_back_phone, wechat_account, qq_account, alipay_account, operate_years, store_address, fac_address, prod_scale, integrity_gold, remark, trial_end_time, storage_usage, store_status, template_num, version, del_flag, create_by, create_time, update_by, update_time from store - where store_id = #{storeId} + where id = #{id} @@ -159,17 +159,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_id = #{storeId} + where id = #{id} - delete from store where store_id = #{storeId} + delete from store where id = #{id} - delete from store where store_id in - - #{storeId} + delete from store where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreOrderDetailMapper.xml b/xkt/src/main/resources/mapper/StoreOrderDetailMapper.xml index 8b055022b..7d45f7d8d 100644 --- a/xkt/src/main/resources/mapper/StoreOrderDetailMapper.xml +++ b/xkt/src/main/resources/mapper/StoreOrderDetailMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_order_detail_id, store_order_id, store_order_detail_refund_id, store_prod_color_size_id, store_prod_id, store_id, price, quantity, amount, detail_status, version, del_flag, create_by, create_time, update_by, update_time from store_order_detail + select id, store_order_id, store_order_detail_refund_id, store_prod_color_size_id, store_prod_id, store_id, price, quantity, amount, detail_status, version, del_flag, create_by, create_time, update_by, update_time from store_order_detail - where store_order_detail_id = #{storeOrderDetailId} + where id = #{id} @@ -105,17 +105,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_order_detail_id = #{storeOrderDetailId} + where id = #{id} - delete from store_order_detail where store_order_detail_id = #{storeOrderDetailId} + delete from store_order_detail where id = #{id} - delete from store_order_detail where store_order_detail_id in - - #{storeOrderDetailId} + delete from store_order_detail where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreOrderExpressMapper.xml b/xkt/src/main/resources/mapper/StoreOrderExpressMapper.xml index f7766b9e3..ea6dc3e28 100644 --- a/xkt/src/main/resources/mapper/StoreOrderExpressMapper.xml +++ b/xkt/src/main/resources/mapper/StoreOrderExpressMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_order_expr_id, store_order_detail_id, store_order_id, store_id, delivery_type, express_id, express_fee, tracking_num, expr_status, version, del_flag, create_by, create_time, update_by, update_time from store_order_express + select id, store_order_detail_id, store_order_id, store_id, delivery_type, express_id, express_fee, tracking_num, expr_status, version, del_flag, create_by, create_time, update_by, update_time from store_order_express - where store_order_expr_id = #{storeOrderExprId} + where id = #{id} @@ -100,17 +100,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_order_expr_id = #{storeOrderExprId} + where id = #{id} - delete from store_order_express where store_order_expr_id = #{storeOrderExprId} + delete from store_order_express where id = #{id} - delete from store_order_express where store_order_expr_id in - - #{storeOrderExprId} + delete from store_order_express where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreOrderMapper.xml b/xkt/src/main/resources/mapper/StoreOrderMapper.xml index 144fe7778..8ff7b57ba 100644 --- a/xkt/src/main/resources/mapper/StoreOrderMapper.xml +++ b/xkt/src/main/resources/mapper/StoreOrderMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_order_id, store_id, user_id, code, order_type, refund_original_id, express_id, express_fee, delivery_type, delivery_end_time, refund_reason_id, quantity, amount, reject_reason, voucher_date, order_status, version, del_flag, create_by, create_time, update_by, update_time from store_order + select id, store_id, user_id, code, order_type, refund_original_id, express_id, express_fee, delivery_type, delivery_end_time, refund_reason_id, quantity, amount, reject_reason, voucher_date, order_status, version, del_flag, create_by, create_time, update_by, update_time from store_order - where store_order_id = #{storeOrderId} + where id = #{id} @@ -135,17 +135,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_order_id = #{storeOrderId} + where id = #{id} - delete from store_order where store_order_id = #{storeOrderId} + delete from store_order where id = #{id} - delete from store_order where store_order_id in - - #{storeOrderId} + delete from store_order where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreOrderReceiveMapper.xml b/xkt/src/main/resources/mapper/StoreOrderReceiveMapper.xml index 6e998178c..b13580984 100644 --- a/xkt/src/main/resources/mapper/StoreOrderReceiveMapper.xml +++ b/xkt/src/main/resources/mapper/StoreOrderReceiveMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_order_rcv_id, store_order_id, sys_user_address_id, receive_name, receive_phone, province_code, city_id, district_code, detail_address, remark, version, del_flag, create_by, create_time, update_by, update_time from store_order_receive + select id, store_order_id, sys_user_address_id, receive_name, receive_phone, province_code, city_id, district_code, detail_address, remark, version, del_flag, create_by, create_time, update_by, update_time from store_order_receive - where store_order_rcv_id = #{storeOrderRcvId} + where id = #{id} @@ -104,17 +104,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_order_rcv_id = #{storeOrderRcvId} + where id = #{id} - delete from store_order_receive where store_order_rcv_id = #{storeOrderRcvId} + delete from store_order_receive where id = #{id} - delete from store_order_receive where store_order_rcv_id in - - #{storeOrderRcvId} + delete from store_order_receive where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreProductBarcodeMatchMapper.xml b/xkt/src/main/resources/mapper/StoreProductBarcodeMatchMapper.xml index 5f9a5ae50..ff22c8f5d 100644 --- a/xkt/src/main/resources/mapper/StoreProductBarcodeMatchMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductBarcodeMatchMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_barcode_match_id, store_prod_id, store_prod_color_size_id, other_sys_barcode_prefix, other_sys_barcode, version, del_flag, create_by, create_time, update_by, update_time from store_product_barcode_match + select id, store_prod_id, store_prod_color_size_id, other_sys_barcode_prefix, other_sys_barcode, version, del_flag, create_by, create_time, update_by, update_time from store_product_barcode_match - where store_prod_barcode_match_id = #{storeProdBarcodeMatchId} + where id = #{id} @@ -80,17 +80,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_barcode_match_id = #{storeProdBarcodeMatchId} + where id = #{id} - delete from store_product_barcode_match where store_prod_barcode_match_id = #{storeProdBarcodeMatchId} + delete from store_product_barcode_match where id = #{idid} - delete from store_product_barcode_match where store_prod_barcode_match_id in - - #{storeProdBarcodeMatchId} + delete from store_product_barcode_match where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreProductBarcodeRecordMapper.xml b/xkt/src/main/resources/mapper/StoreProductBarcodeRecordMapper.xml index 15351e30d..6859d4567 100644 --- a/xkt/src/main/resources/mapper/StoreProductBarcodeRecordMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductBarcodeRecordMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_barcode_record_id, store_prod_id, store_prod_color_size_id, barcode, version, del_flag, create_by, create_time, update_by, update_time from store_product_barcode_record + select id, store_prod_id, store_prod_color_size_id, barcode, version, del_flag, create_by, create_time, update_by, update_time from store_product_barcode_record - where store_prod_barcode_record_id = #{storeProdBarcodeRecordId} + where id = #{id} @@ -75,17 +75,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_barcode_record_id = #{storeProdBarcodeRecordId} + where id = #{id} - delete from store_product_barcode_record where store_prod_barcode_record_id = #{storeProdBarcodeRecordId} + delete from store_product_barcode_record where id = #{id} - delete from store_product_barcode_record where store_prod_barcode_record_id in - - #{storeProdBarcodeRecordId} + delete from store_product_barcode_record where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreProductCategoryAttributeMapper.xml b/xkt/src/main/resources/mapper/StoreProductCategoryAttributeMapper.xml index fc8f906f7..e96a59efc 100644 --- a/xkt/src/main/resources/mapper/StoreProductCategoryAttributeMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductCategoryAttributeMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_attr_id, store_prod_id, sys_dict_type, version, del_flag, create_by, create_time, update_by, update_time from store_product_category_attribute + select id, store_prod_id, sys_dict_type, version, del_flag, create_by, create_time, update_by, update_time from store_product_category_attribute - where store_prod_attr_id = #{storeProdAttrId} + where id = #{id} @@ -70,17 +70,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_attr_id = #{storeProdAttrId} + where id = #{id} - delete from store_product_category_attribute where store_prod_attr_id = #{storeProdAttrId} + delete from store_product_category_attribute where id = #{id} - delete from store_product_category_attribute where store_prod_attr_id in - - #{storeProdAttrId} + delete from store_product_category_attribute where id in + + #{id} diff --git a/xkt/src/main/resources/mapper/StoreProductColorMapper.xml b/xkt/src/main/resources/mapper/StoreProductColorMapper.xml index 397fac3dc..86261c651 100644 --- a/xkt/src/main/resources/mapper/StoreProductColorMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductColorMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_color_id, store_color_id, store_prod_id, store_id, color_name, version, del_flag, create_by, create_time, update_by, update_time from store_product_color + select id, store_color_id, store_prod_id, store_id, color_name, version, del_flag, create_by, create_time, update_by, update_time from store_product_color - where store_prod_color_id = #{storeProdColorId} + where id = #{id} @@ -76,17 +76,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_color_id = #{storeProdColorId} + where id = #{id} - delete from store_product_color where store_prod_color_id = #{storeProdColorId} + delete from store_product_color where id = #{id} - delete from store_product_color where store_prod_color_id in - - #{storeProdColorId} + delete from store_product_color where id in + + #{id} @@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spc.create_time AS createTime FROM store_product_color spc - LEFT JOIN store_product sp ON spc.store_prod_id = sp.store_prod_id + LEFT JOIN store_product sp ON spc.store_prod_id = sp.id LEFT JOIN store_product_color_price spcp ON spc.store_color_id = spcp.store_color_id AND spc.store_prod_id = spcp.store_prod_id AND spc.store_color_id = spcp.store_color_id @@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spc.order_num AS orderNum FROM store_product_color spc - LEFT JOIN store_product sp ON spc.store_prod_id = sp.store_prod_id + LEFT JOIN store_product sp ON spc.store_prod_id = sp.id WHERE spc.del_flag = 0 AND spc.store_id = #{storeId} diff --git a/xkt/src/main/resources/mapper/StoreProductColorPriceMapper.xml b/xkt/src/main/resources/mapper/StoreProductColorPriceMapper.xml index 1ded328ff..82a7c26a4 100644 --- a/xkt/src/main/resources/mapper/StoreProductColorPriceMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductColorPriceMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_color_price_id, store_prod_color_id, store_prod_id, price, version, del_flag, create_by, create_time, update_by, update_time from store_product_color_price + select id, store_prod_color_id, store_prod_id, price, version, del_flag, create_by, create_time, update_by, update_time from store_product_color_price - where store_prod_color_price_id = #{storeProdColorPriceId} + where id = #{id} @@ -75,17 +75,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_color_price_id = #{storeProdColorPriceId} + where id = #{id} - delete from store_product_color_price where store_prod_color_price_id = #{storeProdColorPriceId} + delete from store_product_color_price where id = #{id} - delete from store_product_color_price where store_prod_color_price_id in - - #{storeProdColorPriceId} + delete from store_product_color_price where id in + + #{id} diff --git a/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml b/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml index 6ea628603..461ee03b0 100644 --- a/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_color_size_id, store_prod_color_id, store_prod_id, size, barcode_prefix, standard, version, del_flag, create_by, create_time, update_by, update_time from store_product_color_size + select id, store_prod_color_id, store_prod_id, size, barcode_prefix, standard, version, del_flag, create_by, create_time, update_by, update_time from store_product_color_size - where store_prod_color_size_id = #{storeProdColorSizeId} + where id = #{id} @@ -85,17 +85,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_color_size_id = #{storeProdColorSizeId} + where id = #{id} - delete from store_product_color_size where store_prod_color_size_id = #{storeProdColorSizeId} + delete from store_product_color_size where id = #{id} - delete from store_product_color_size where store_prod_color_size_id in - - #{storeProdColorSizeId} + delete from store_product_color_size where id in + + #{id} diff --git a/xkt/src/main/resources/mapper/StoreProductDemandDetailMapper.xml b/xkt/src/main/resources/mapper/StoreProductDemandDetailMapper.xml index d87b7347b..3b07ad28f 100644 --- a/xkt/src/main/resources/mapper/StoreProductDemandDetailMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductDemandDetailMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_dema_detail_id, store_prod_demand_id, store_prod_color_id, store_prod_id, size_30, size_31, size_32, size_33, size_34, size_35, size_36, size_37, size_38, size_39, size_40, size_41, size_42, size_43, emergency, detail_status, version, del_flag, create_by, create_time, update_by, update_time from store_product_demand_detail + select id, store_prod_demand_id, store_prod_color_id, store_prod_id, size_30, size_31, size_32, size_33, size_34, size_35, size_36, size_37, size_38, size_39, size_40, size_41, size_42, size_43, emergency, detail_status, version, del_flag, create_by, create_time, update_by, update_time from store_product_demand_detail - where store_prod_dema_detail_id = #{storeProdDemaDetailId} + where id = #{id} @@ -155,17 +155,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_dema_detail_id = #{storeProdDemaDetailId} + where id = #{id} - delete from store_product_demand_detail where store_prod_dema_detail_id = #{storeProdDemaDetailId} + delete from store_product_demand_detail where id = #{id} - delete from store_product_demand_detail where store_prod_dema_detail_id in - - #{storeProdDemaDetailId} + delete from store_product_demand_detail where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreProductDemandMapper.xml b/xkt/src/main/resources/mapper/StoreProductDemandMapper.xml index ea925dc26..3bede7341 100644 --- a/xkt/src/main/resources/mapper/StoreProductDemandMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductDemandMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_demand_id, code, demand_status, version, del_flag, create_by, create_time, update_by, update_time from store_product_demand + select id, code, demand_status, version, del_flag, create_by, create_time, update_by, update_time from store_product_demand - where store_prod_demand_id = #{storeProdDemandId} + where id = #{id} @@ -70,17 +70,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_demand_id = #{storeProdDemandId} + where id = #{id} - delete from store_product_demand where store_prod_demand_id = #{storeProdDemandId} + delete from store_product_demand where id = #{id} - delete from store_product_demand where store_prod_demand_id in - - #{storeProdDemandId} + delete from store_product_demand where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreProductDetailMapper.xml b/xkt/src/main/resources/mapper/StoreProductDetailMapper.xml index 423c67e7c..18d0e680f 100644 --- a/xkt/src/main/resources/mapper/StoreProductDetailMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductDetailMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_detail_id, store_prod_id, detail, version, del_flag, create_by, create_time, update_by, update_time from store_product_detail + select id, store_prod_id, detail, version, del_flag, create_by, create_time, update_by, update_time from store_product_detail - where store_prod_detail_id = #{storeProdDetailId} + where id = #{id} @@ -70,17 +70,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_detail_id = #{storeProdDetailId} + where id = #{id} - delete from store_product_detail where store_prod_detail_id = #{storeProdDetailId} + delete from store_product_detail where id = #{id} - delete from store_product_detail where store_prod_detail_id in - - #{storeProdDetailId} + delete from store_product_detail where id in + + #{id} diff --git a/xkt/src/main/resources/mapper/StoreProductFileMapper.xml b/xkt/src/main/resources/mapper/StoreProductFileMapper.xml index 705d660c2..6ec1c8e03 100644 --- a/xkt/src/main/resources/mapper/StoreProductFileMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductFileMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_file_id, store_prod_id, store_id, file_id, file_type, file_size, order_num, version, del_flag, create_by, create_time, update_by, update_time from store_product_file + select id, store_prod_id, store_id, file_id, file_type, file_size, order_num, version, del_flag, create_by, create_time, update_by, update_time from store_product_file - where store_prod_file_id = #{storeProdFileId} + where id = #{id} @@ -86,17 +86,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_file_id = #{storeProdFileId} + where id = #{id} - delete from store_product_file where store_prod_file_id = #{storeProdFileId} + delete from store_product_file where id = #{id} - delete from store_product_file where store_prod_file_id in - - #{storeProdFileId} + delete from store_product_file where id in + + #{id} @@ -115,36 +115,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spf.order_num AS orderNum FROM store_product_file spf - LEFT JOIN sys_file sf ON spf.file_id = sf.file_id AND spf.del_flag = 0 + LEFT JOIN sys_file sf ON spf.file_id = sf.id AND spf.del_flag = 0 WHERE spf.store_prod_id = #{storeProdId} - - - @@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -131,17 +131,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_id = #{storeProdId} + where id = #{id} - delete from store_product where store_prod_id = #{storeProdId} + delete from store_product where id = #{id} - delete from store_product where store_prod_id in - - #{storeProdId} + delete from store_product where id in + + #{id} diff --git a/xkt/src/main/resources/mapper/StoreProductProcessMapper.xml b/xkt/src/main/resources/mapper/StoreProductProcessMapper.xml index 73f93fa94..826529ca5 100644 --- a/xkt/src/main/resources/mapper/StoreProductProcessMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductProcessMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_process_id, store_prod_id, shoe_type, shoe_size, main_skin, main_skin_usage, match_skin, match_skin_usage, neckline, insole, fastener, shoe_accessories, toe_cap, edge_binding, mid_outsole, platform_sole, midsole_factory_code, outsole_factory_code, heel_factory_code, components, second_sole_material, second_upper_material, custom_attr, version, del_flag, create_by, create_time, update_by, update_time from store_product_process + select id, store_prod_id, shoe_type, shoe_size, main_skin, main_skin_usage, match_skin, match_skin_usage, neckline, insole, fastener, shoe_accessories, toe_cap, edge_binding, mid_outsole, platform_sole, midsole_factory_code, outsole_factory_code, heel_factory_code, components, second_sole_material, second_upper_material, custom_attr, version, del_flag, create_by, create_time, update_by, update_time from store_product_process - where store_prod_process_id = #{storeProdProcessId} + where id = #{id} @@ -170,17 +170,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_process_id = #{storeProdProcessId} + where id = #{id} - delete from store_product_process where store_prod_process_id = #{storeProdProcessId} + delete from store_product_process where id = #{id} - delete from store_product_process where store_prod_process_id in - - #{storeProdProcessId} + delete from store_product_process where id in + + #{id} diff --git a/xkt/src/main/resources/mapper/StoreProductServiceMapper.xml b/xkt/src/main/resources/mapper/StoreProductServiceMapper.xml index 1f07e9950..4b8b6cda6 100644 --- a/xkt/src/main/resources/mapper/StoreProductServiceMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductServiceMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_svc_id, store_prod_id, custom_refund, thirty_day_refund, one_batch_sale, refund_within_three_day, version, del_flag, create_by, create_time, update_by, update_time from store_product_service + select id, store_prod_id, custom_refund, thirty_day_refund, one_batch_sale, refund_within_three_day, version, del_flag, create_by, create_time, update_by, update_time from store_product_service - where store_prod_svc_id = #{storeProdSvcId} + where id = #{id} @@ -85,17 +85,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_svc_id = #{storeProdSvcId} + where id = #{id} - delete from store_product_service where store_prod_svc_id = #{storeProdSvcId} + delete from store_product_service where id = #{id} - delete from store_product_service where store_prod_svc_id in - - #{storeProdSvcId} + delete from store_product_service where id in + + #{id} diff --git a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml index 2541bd437..1448033ad 100644 --- a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_stock_id, store_prod_id, store_prod_color_id, size_30, size_31, size_32, size_33, size_34, size_35, size_36, size_37, size_38, size_39, size_40, size_41, size_42, size_43, version, del_flag, create_by, create_time, update_by, update_time from store_product_stock + select id, store_prod_id, store_prod_color_id, size_30, size_31, size_32, size_33, size_34, size_35, size_36, size_37, size_38, size_39, size_40, size_41, size_42, size_43, version, del_flag, create_by, create_time, update_by, update_time from store_product_stock - where store_prod_stock_id = #{storeProdStockId} + where id = #{id} @@ -140,17 +140,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_stock_id = #{storeProdStockId} + where id = #{id} - delete from store_product_stock where store_prod_stock_id = #{storeProdStockId} + delete from store_product_stock where id = #{id} - delete from store_product_stock where store_prod_stock_id in - - #{storeProdStockId} + delete from store_product_stock where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreProductStorageDemandDeducteMapper.xml b/xkt/src/main/resources/mapper/StoreProductStorageDemandDeducteMapper.xml index 9fef23860..45ab4073f 100644 --- a/xkt/src/main/resources/mapper/StoreProductStorageDemandDeducteMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductStorageDemandDeducteMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_stor_dema_deducte_id, store_prod_stor_detail_id, store_prod_demand_id, store_prod_color_id, store_prod_id, storage_code, demand_code, size_30, size_31, size_32, size_33, size_34, size_35, size_36, size_37, size_38, size_39, size_40, size_41, size_42, size_43, version, del_flag, create_by, create_time, update_by, update_time from store_product_storage_demand_deducte + select id, store_prod_stor_detail_id, store_prod_demand_id, store_prod_color_id, store_prod_id, storage_code, demand_code, size_30, size_31, size_32, size_33, size_34, size_35, size_36, size_37, size_38, size_39, size_40, size_41, size_42, size_43, version, del_flag, create_by, create_time, update_by, update_time from store_product_storage_demand_deducte - where store_prod_stor_dema_deducte_id = #{storeProdStorDemaDeducteId} + where id = #{id} @@ -160,17 +160,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_stor_dema_deducte_id = #{storeProdStorDemaDeducteId} + where id = #{id} - delete from store_product_storage_demand_deducte where store_prod_stor_dema_deducte_id = #{storeProdStorDemaDeducteId} + delete from store_product_storage_demand_deducte where id = #{id} - delete from store_product_storage_demand_deducte where store_prod_stor_dema_deducte_id in - - #{storeProdStorDemaDeducteId} + delete from store_product_storage_demand_deducte where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreProductStorageDetailMapper.xml b/xkt/src/main/resources/mapper/StoreProductStorageDetailMapper.xml index 483e6af07..9c2dead2d 100644 --- a/xkt/src/main/resources/mapper/StoreProductStorageDetailMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductStorageDetailMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_stor_detail_id, store_prod_stor_id, store_prod_color_id, store_prod_id, size_30, size_31, size_32, size_33, size_34, size_35, size_36, size_37, size_38, size_39, size_40, size_41, size_42, size_43, total_num, produce_price, total_produce_price, version, del_flag, create_by, create_time, update_by, update_time from store_product_storage_detail + select id, store_prod_stor_id, store_prod_color_id, store_prod_id, size_30, size_31, size_32, size_33, size_34, size_35, size_36, size_37, size_38, size_39, size_40, size_41, size_42, size_43, total_num, produce_price, total_produce_price, version, del_flag, create_by, create_time, update_by, update_time from store_product_storage_detail - where store_prod_stor_detail_id = #{storeProdStorDetailId} + where id = #{id} @@ -160,17 +160,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_stor_detail_id = #{storeProdStorDetailId} + where id = #{id} - delete from store_product_storage_detail where store_prod_stor_detail_id = #{storeProdStorDetailId} + delete from store_product_storage_detail where id = #{id} - delete from store_product_storage_detail where store_prod_stor_detail_id in - - #{storeProdStorDetailId} + delete from store_product_storage_detail where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreProductStorageMapper.xml b/xkt/src/main/resources/mapper/StoreProductStorageMapper.xml index d446ba27e..b994645f1 100644 --- a/xkt/src/main/resources/mapper/StoreProductStorageMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductStorageMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_prod_stor_id, code, storage_type, total_num, total_produce_price, storage_status, version, del_flag, create_by, create_time, update_by, update_time from store_product_storage + select id, code, storage_type, total_num, total_produce_price, storage_status, version, del_flag, create_by, create_time, update_by, update_time from store_product_storage - where store_prod_stor_id = #{storeProdStorId} + where id = #{id} @@ -85,17 +85,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_prod_stor_id = #{storeProdStorId} + where id = #{id} - delete from store_product_storage where store_prod_stor_id = #{storeProdStorId} + delete from store_product_storage where id = #{id} - delete from store_product_storage where store_prod_stor_id in - - #{storeProdStorId} + delete from store_product_storage where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreQuickFunctionMapper.xml b/xkt/src/main/resources/mapper/StoreQuickFunctionMapper.xml index e365fa4df..c3a9ef224 100644 --- a/xkt/src/main/resources/mapper/StoreQuickFunctionMapper.xml +++ b/xkt/src/main/resources/mapper/StoreQuickFunctionMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_quick_func_id, store_id, func_name, func_icon, func_url, order_num, version, del_flag, create_by, create_time, update_by, update_time from store_quick_function + select id, store_id, func_name, func_icon, func_url, order_num, version, del_flag, create_by, create_time, update_by, update_time from store_quick_function - where store_quick_func_id = #{storeQuickFuncId} + where id = #{id} @@ -85,17 +85,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_quick_func_id = #{storeQuickFuncId} + where id = #{id} - delete from store_quick_function where store_quick_func_id = #{storeQuickFuncId} + delete from store_quick_function where id = #{id} - delete from store_quick_function where store_quick_func_id in - - #{storeQuickFuncId} + delete from store_quick_function where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreRoleAccountMapper.xml b/xkt/src/main/resources/mapper/StoreRoleAccountMapper.xml index 3f4cee16c..ad75ad630 100644 --- a/xkt/src/main/resources/mapper/StoreRoleAccountMapper.xml +++ b/xkt/src/main/resources/mapper/StoreRoleAccountMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_role_acc_id, store_role_id, store_id, user_id, acc_status, version, del_flag, create_by, create_time, update_by, update_time from store_role_account + select id, store_role_id, store_id, user_id, acc_status, version, del_flag, create_by, create_time, update_by, update_time from store_role_account - where store_role_acc_id = #{storeRoleAccId} + where id = #{id} @@ -80,17 +80,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_role_acc_id = #{storeRoleAccId} + where id = #{id} - delete from store_role_account where store_role_acc_id = #{storeRoleAccId} + delete from store_role_account where id = #{id} - delete from store_role_account where store_role_acc_id in - - #{storeRoleAccId} + delete from store_role_account where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreRoleMapper.xml b/xkt/src/main/resources/mapper/StoreRoleMapper.xml index 83fe33859..c2a16eea5 100644 --- a/xkt/src/main/resources/mapper/StoreRoleMapper.xml +++ b/xkt/src/main/resources/mapper/StoreRoleMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_role_id, store_id, role_status, version, del_flag, create_by, create_time, update_by, update_time from store_role + select id, store_id, role_status, version, del_flag, create_by, create_time, update_by, update_time from store_role - where store_role_id = #{storeRoleId} + where id = #{id} @@ -70,17 +70,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_role_id = #{storeRoleId} + where id = #{id} - delete from store_role where store_role_id = #{storeRoleId} + delete from store_role where id = #{id} - delete from store_role where store_role_id in - - #{storeRoleId} + delete from store_role where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreRoleMenuMapper.xml b/xkt/src/main/resources/mapper/StoreRoleMenuMapper.xml index f5440df1d..7ab6e7b6f 100644 --- a/xkt/src/main/resources/mapper/StoreRoleMenuMapper.xml +++ b/xkt/src/main/resources/mapper/StoreRoleMenuMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_role_menu_id, store_role_id, store_id, menu_name, menu_status, version, del_flag, create_by, create_time, update_by, update_time from store_role_menu + select id, store_role_id, store_id, menu_name, menu_status, version, del_flag, create_by, create_time, update_by, update_time from store_role_menu - where store_role_menu_id = #{storeRoleMenuId} + where id = #{id} @@ -80,17 +80,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_role_menu_id = #{storeRoleMenuId} + where id = #{id} - delete from store_role_menu where store_role_menu_id = #{storeRoleMenuId} + delete from store_role_menu where id = #{id} - delete from store_role_menu where store_role_menu_id in - - #{storeRoleMenuId} + delete from store_role_menu where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreSaleDetailMapper.xml b/xkt/src/main/resources/mapper/StoreSaleDetailMapper.xml index 9a13963a3..212506b4d 100644 --- a/xkt/src/main/resources/mapper/StoreSaleDetailMapper.xml +++ b/xkt/src/main/resources/mapper/StoreSaleDetailMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_sale_detail_id, store_sale_id, store_prod_id, store_prod_color_size_id, sale_type, price, discounted_price, quantity, amount, other_discount, version, del_flag, create_by, create_time, update_by, update_time from store_sale_detail + select id, store_sale_id, store_prod_id, store_prod_color_size_id, sale_type, price, discounted_price, quantity, amount, other_discount, version, del_flag, create_by, create_time, update_by, update_time from store_sale_detail - where store_sale_detail_id = #{storeSaleDetailId} + where id = #{id} @@ -105,17 +105,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_sale_detail_id = #{storeSaleDetailId} + where id = #{id} - delete from store_sale_detail where store_sale_detail_id = #{storeSaleDetailId} + delete from store_sale_detail where id = #{id} - delete from store_sale_detail where store_sale_detail_id in - - #{storeSaleDetailId} + delete from store_sale_detail where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreSaleMapper.xml b/xkt/src/main/resources/mapper/StoreSaleMapper.xml index 6103e0d00..fe0ec5fa7 100644 --- a/xkt/src/main/resources/mapper/StoreSaleMapper.xml +++ b/xkt/src/main/resources/mapper/StoreSaleMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_sale_id, store_id, store_cus_id, sale_type, code, voucher_date, quantity, amount, pay_way, remark, version, del_flag, create_by, create_time, update_by, update_time from store_sale + select id, store_id, store_cus_id, sale_type, code, voucher_date, quantity, amount, pay_way, remark, version, del_flag, create_by, create_time, update_by, update_time from store_sale - where store_sale_id = #{storeSaleId} + where id = #{id} @@ -104,17 +104,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_sale_id = #{storeSaleId} + where id = #{id} - delete from store_sale where store_sale_id = #{storeSaleId} + delete from store_sale where id = #{id} - delete from store_sale where store_sale_id in - - #{storeSaleId} + delete from store_sale where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreSaleRefundRecordMapper.xml b/xkt/src/main/resources/mapper/StoreSaleRefundRecordMapper.xml index 574583ee0..40d0993af 100644 --- a/xkt/src/main/resources/mapper/StoreSaleRefundRecordMapper.xml +++ b/xkt/src/main/resources/mapper/StoreSaleRefundRecordMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select store_sale_refund_record_id, store_sale_id, store_id, store_cus_id, store_prod_id, sale_type, code, quantity, amount, pay_way, remark, version, del_flag, create_by, create_time, update_by, update_time from store_sale_refund_record + select id, store_sale_id, store_id, store_cus_id, store_prod_id, sale_type, code, quantity, amount, pay_way, remark, version, del_flag, create_by, create_time, update_by, update_time from store_sale_refund_record - where store_sale_refund_record_id = #{storeSaleRefundRecordId} + where id = #{id} @@ -109,17 +109,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where store_sale_refund_record_id = #{storeSaleRefundRecordId} + where id = #{id} - delete from store_sale_refund_record where store_sale_refund_record_id = #{storeSaleRefundRecordId} + delete from store_sale_refund_record where id = #{id} - delete from store_sale_refund_record where store_sale_refund_record_id in - - #{storeSaleRefundRecordId} + delete from store_sale_refund_record where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/SysFileMapper.xml b/xkt/src/main/resources/mapper/SysFileMapper.xml index a3e78489f..4461a5c80 100644 --- a/xkt/src/main/resources/mapper/SysFileMapper.xml +++ b/xkt/src/main/resources/mapper/SysFileMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select file_id, file_name, file_url, file_size, version, del_flag, create_by, create_time, update_by, update_time from sys_file + select id, file_name, file_url, file_size, version, del_flag, create_by, create_time, update_by, update_time from sys_file - where file_id = #{fileId} + where id = #{id} @@ -75,17 +75,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where file_id = #{fileId} + where id = #{id} - delete from sys_file where file_id = #{fileId} + delete from sys_file where id = #{id} - delete from sys_file where file_id in - - #{fileId} + delete from sys_file where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/UserAccountMapper.xml b/xkt/src/main/resources/mapper/UserAccountMapper.xml index 40e0a821b..ffdd86ff9 100644 --- a/xkt/src/main/resources/mapper/UserAccountMapper.xml +++ b/xkt/src/main/resources/mapper/UserAccountMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select user_acc_id, user_id, account_type, account_phone, account_name, balance, version, del_flag, create_by, create_time, update_by, update_time from user_account + select id, user_id, account_type, account_phone, account_name, balance, version, del_flag, create_by, create_time, update_by, update_time from user_account - where user_acc_id = #{userAccId} + where id = #{id} @@ -85,17 +85,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where user_acc_id = #{userAccId} + where id = #{id} - delete from user_account where user_acc_id = #{userAccId} + delete from user_account where id = #{id} - delete from user_account where user_acc_id in - - #{userAccId} + delete from user_account where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/UserAddressMapper.xml b/xkt/src/main/resources/mapper/UserAddressMapper.xml index dfae87a8b..c4fa8c268 100644 --- a/xkt/src/main/resources/mapper/UserAddressMapper.xml +++ b/xkt/src/main/resources/mapper/UserAddressMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select user_addr_id, user_id, receive_name, receive_phone, province_code, city_code, district_code, detail_address, version, del_flag, create_by, create_time, update_by, update_time from user_address + select id, user_id, receive_name, receive_phone, province_code, city_code, district_code, detail_address, version, del_flag, create_by, create_time, update_by, update_time from user_address - where user_addr_id = #{userAddrId} + where id = #{id} @@ -97,17 +97,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where user_addr_id = #{userAddrId} + where id = #{id} - delete from user_address where user_addr_id = #{userAddrId} + delete from user_address where id = #{id} - delete from user_address where user_addr_id in - - #{userAddrId} + delete from user_address where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/UserAuthenticationMapper.xml b/xkt/src/main/resources/mapper/UserAuthenticationMapper.xml index 9c7e1c94c..4ab94d5ab 100644 --- a/xkt/src/main/resources/mapper/UserAuthenticationMapper.xml +++ b/xkt/src/main/resources/mapper/UserAuthenticationMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select user_auth_id, user_id, real_name, phone, id_card, id_card_front_file_id, id_card_back_file_id, auth_status, version, del_flag, create_by, create_time, update_by, update_time from user_authentication + select id, user_id, real_name, phone, id_card, id_card_front_file_id, id_card_back_file_id, auth_status, version, del_flag, create_by, create_time, update_by, update_time from user_authentication - where user_auth_id = #{userAuthId} + where id = #{id} @@ -94,17 +94,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where user_auth_id = #{userAuthId} + where id = #{id} - delete from user_authentication where user_auth_id = #{userAuthId} + delete from user_authentication where id = #{id} - delete from user_authentication where user_auth_id in - - #{userAuthId} + delete from user_authentication where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/UserBillingStatementMapper.xml b/xkt/src/main/resources/mapper/UserBillingStatementMapper.xml index 2078906fb..5a665a235 100644 --- a/xkt/src/main/resources/mapper/UserBillingStatementMapper.xml +++ b/xkt/src/main/resources/mapper/UserBillingStatementMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select user_bill_stat_id, user_id, user_acc_id, code, trans_type, trans_remark, pay_way, income, expenses, acc_balance, version, del_flag, create_by, create_time, update_by, update_time from user_billing_statement + select id, user_id, user_acc_id, code, trans_type, trans_remark, pay_way, income, expenses, acc_balance, version, del_flag, create_by, create_time, update_by, update_time from user_billing_statement - where user_bill_stat_id = #{userBillStatId} + where id = #{id} @@ -105,17 +105,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where user_bill_stat_id = #{userBillStatId} + where id = #{id} - delete from user_billing_statement where user_bill_stat_id = #{userBillStatId} + delete from user_billing_statement where id = #{id} - delete from user_billing_statement where user_bill_stat_id in - - #{userBillStatId} + delete from user_billing_statement where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/UserBrowsingHistoryMapper.xml b/xkt/src/main/resources/mapper/UserBrowsingHistoryMapper.xml index 3ff6d4515..569c67584 100644 --- a/xkt/src/main/resources/mapper/UserBrowsingHistoryMapper.xml +++ b/xkt/src/main/resources/mapper/UserBrowsingHistoryMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select user_brow_his_id, user_id, file_id, store_prod_file_id, store_id, store_name, prod_art_num, price, prod_title, voucher_date, version, del_flag, create_by, create_time, update_by, update_time from user_browsing_history + select id, user_id, file_id, store_prod_file_id, store_id, store_name, prod_art_num, price, prod_title, voucher_date, version, del_flag, create_by, create_time, update_by, update_time from user_browsing_history - where user_brow_his_id = #{userBrowHisId} + where id = #{id} @@ -105,17 +105,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where user_brow_his_id = #{userBrowHisId} + where id = #{id} - delete from user_browsing_history where user_brow_his_id = #{userBrowHisId} + delete from user_browsing_history where id = #{id} - delete from user_browsing_history where user_brow_his_id in - - #{userBrowHisId} + delete from user_browsing_history where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/UserFavoritesMapper.xml b/xkt/src/main/resources/mapper/UserFavoritesMapper.xml index eb2e9d8e7..21671d345 100644 --- a/xkt/src/main/resources/mapper/UserFavoritesMapper.xml +++ b/xkt/src/main/resources/mapper/UserFavoritesMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select user_favo_id, user_id, store_id, store_prod_id, version, del_flag, create_by, create_time, update_by, update_time from user_favorites + select id, user_id, store_id, store_prod_id, version, del_flag, create_by, create_time, update_by, update_time from user_favorites - where user_favo_id = #{userFavoId} + where id = #{id} @@ -75,17 +75,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where user_favo_id = #{userFavoId} + where id = #{id} - delete from user_favorites where user_favo_id = #{userFavoId} + delete from user_favorites where id = #{id} - delete from user_favorites where user_favo_id in - - #{userFavoId} + delete from user_favorites where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/UserNoticeMapper.xml b/xkt/src/main/resources/mapper/UserNoticeMapper.xml index 01a80d934..b05aa9332 100644 --- a/xkt/src/main/resources/mapper/UserNoticeMapper.xml +++ b/xkt/src/main/resources/mapper/UserNoticeMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select user_notice_id, notice_id, user_id, read, voucher_date, version, del_flag, create_by, create_time, update_by, update_time from user_notice + select id, notice_id, user_id, read, voucher_date, version, del_flag, create_by, create_time, update_by, update_time from user_notice - where user_notice_id = #{userNoticeId} + where id = #{id} @@ -80,17 +80,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where user_notice_id = #{userNoticeId} + where id = #{id} - delete from user_notice where user_notice_id = #{userNoticeId} + delete from user_notice where id = #{id} - delete from user_notice where user_notice_id in - - #{userNoticeId} + delete from user_notice where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/UserNoticeSettingMapper.xml b/xkt/src/main/resources/mapper/UserNoticeSettingMapper.xml index 653c1907a..ca3fbb072 100644 --- a/xkt/src/main/resources/mapper/UserNoticeSettingMapper.xml +++ b/xkt/src/main/resources/mapper/UserNoticeSettingMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select user_notice_set_id, user_id, notice_type, allow, version, del_flag, create_by, create_time, update_by, update_time from user_notice_setting + select id, user_id, notice_type, allow, version, del_flag, create_by, create_time, update_by, update_time from user_notice_setting - where user_notice_set_id = #{userNoticeSetId} + where id = #{id} @@ -75,17 +75,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where user_notice_set_id = #{userNoticeSetId} + where id = #{id} - delete from user_notice_setting where user_notice_set_id = #{userNoticeSetId} + delete from user_notice_setting where id = #{id} - delete from user_notice_setting where user_notice_set_id in - - #{userNoticeSetId} + delete from user_notice_setting where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/UserQuickFunctionMapper.xml b/xkt/src/main/resources/mapper/UserQuickFunctionMapper.xml index fd3dda2f0..91e8836bc 100644 --- a/xkt/src/main/resources/mapper/UserQuickFunctionMapper.xml +++ b/xkt/src/main/resources/mapper/UserQuickFunctionMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select user_quick_func_id, user_id, func_name, func_icon, func_url, order_num, version, del_flag, create_by, create_time, update_by, update_time from user_quick_function + select id, user_id, func_name, func_icon, func_url, order_num, version, del_flag, create_by, create_time, update_by, update_time from user_quick_function - where user_quick_func_id = #{userQuickFuncId} + where id = #{id} @@ -85,17 +85,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where user_quick_func_id = #{userQuickFuncId} + where id = #{id} - delete from user_quick_function where user_quick_func_id = #{userQuickFuncId} + delete from user_quick_function where id = #{id} - delete from user_quick_function where user_quick_func_id in - - #{userQuickFuncId} + delete from user_quick_function where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/UserShoppingCartMapper.xml b/xkt/src/main/resources/mapper/UserShoppingCartMapper.xml index c13fe693c..b65eeae7b 100644 --- a/xkt/src/main/resources/mapper/UserShoppingCartMapper.xml +++ b/xkt/src/main/resources/mapper/UserShoppingCartMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select user_shop_cart_id, user_id, store_id, store_prod_color_size_id, store_prod_id, quantity, version, del_flag, create_by, create_time, update_by, update_time from user_shopping_cart + select id, user_id, store_id, store_prod_color_size_id, store_prod_id, quantity, version, del_flag, create_by, create_time, update_by, update_time from user_shopping_cart - where user_shop_cart_id = #{userShopCartId} + where id = #{id} @@ -85,17 +85,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where user_shop_cart_id = #{userShopCartId} + where id = #{id} - delete from user_shopping_cart where user_shop_cart_id = #{userShopCartId} + delete from user_shopping_cart where id = #{id} - delete from user_shopping_cart where user_shop_cart_id in - - #{userShopCartId} + delete from user_shopping_cart where id in + + #{id} \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/UserSubscriptionsMapper.xml b/xkt/src/main/resources/mapper/UserSubscriptionsMapper.xml index d10d61472..ee6e55b6d 100644 --- a/xkt/src/main/resources/mapper/UserSubscriptionsMapper.xml +++ b/xkt/src/main/resources/mapper/UserSubscriptionsMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select user_subs_id, user_id, store_id, version, del_flag, create_by, create_time, update_by, update_time from user_subscriptions + select id, user_id, store_id, version, del_flag, create_by, create_time, update_by, update_time from user_subscriptions - where user_subs_id = #{userSubsId} + where id = #{id} @@ -70,17 +70,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where user_subs_id = #{userSubsId} + where id = #{id} - delete from user_subscriptions where user_subs_id = #{userSubsId} + delete from user_subscriptions where id = #{id} - delete from user_subscriptions where user_subs_id in - - #{userSubsId} + delete from user_subscriptions where id in + + #{id} \ No newline at end of file