diff --git a/src/main/java/org/springblade/modules/jinchao/constant/ProductConst.java b/src/main/java/org/springblade/modules/jinchao/constant/ProductConst.java new file mode 100644 index 0000000..0525a47 --- /dev/null +++ b/src/main/java/org/springblade/modules/jinchao/constant/ProductConst.java @@ -0,0 +1,14 @@ +package org.springblade.modules.jinchao.constant; + +public interface ProductConst { + + /** + * 标准 + */ + Integer TYPE_PRICE_STANDARD = 1; + + /** + * 特定价格 + */ + Integer TYPE_PRICE_CUS = 2; +} diff --git a/src/main/java/org/springblade/modules/jinchao/controller/BizPriceController.java b/src/main/java/org/springblade/modules/jinchao/controller/BizPriceController.java index 8fad8f1..35f6f07 100644 --- a/src/main/java/org/springblade/modules/jinchao/controller/BizPriceController.java +++ b/src/main/java/org/springblade/modules/jinchao/controller/BizPriceController.java @@ -50,8 +50,10 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; + import java.util.Map; import java.util.List; + import jakarta.servlet.http.HttpServletResponse; /** @@ -73,17 +75,18 @@ public class BizPriceController extends BladeController { */ @GetMapping("/detail") @ApiOperationSupport(order = 1) - @Operation(summary = "详情", description = "传入bizPrice") + @Operation(summary = "详情", description = "传入bizPrice") public R detail(BizPriceEntity bizPrice) { BizPriceEntity detail = bizPriceService.getOne(Condition.getQueryWrapper(bizPrice)); return R.data(BizPriceWrapper.build().entityVO(detail)); } + /** * [业务价格] 分页 */ @GetMapping("/list") @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入bizPrice") + @Operation(summary = "分页", description = "传入bizPrice") public R> list(@Parameter(hidden = true) @RequestParam Map bizPrice, Query query) { IPage pages = bizPriceService.page(Condition.getPage(query), Condition.getQueryWrapper(bizPrice, BizPriceEntity.class)); return R.data(BizPriceWrapper.build().pageVO(pages)); @@ -94,7 +97,7 @@ public class BizPriceController extends BladeController { */ @GetMapping("/page") @ApiOperationSupport(order = 3) - @Operation(summary = "分页", description = "传入bizPrice") + @Operation(summary = "分页", description = "传入bizPrice") public R> page(BizPriceVO bizPrice, Query query) { IPage pages = bizPriceService.selectBizPricePage(Condition.getPage(query), bizPrice); return R.data(pages); @@ -105,8 +108,9 @@ public class BizPriceController extends BladeController { */ @PostMapping("/save") @ApiOperationSupport(order = 4) - @Operation(summary = "新增", description = "传入bizPrice") + @Operation(summary = "新增", description = "传入bizPrice") public R save(@Valid @RequestBody BizPriceEntity bizPrice) { + bizPrice.setId(null); return R.status(bizPriceService.save(bizPrice)); } @@ -115,7 +119,7 @@ public class BizPriceController extends BladeController { */ @PostMapping("/update") @ApiOperationSupport(order = 5) - @Operation(summary = "修改", description = "传入bizPrice") + @Operation(summary = "修改", description = "传入bizPrice") public R update(@Valid @RequestBody BizPriceEntity bizPrice) { return R.status(bizPriceService.updateById(bizPrice)); } @@ -125,7 +129,7 @@ public class BizPriceController extends BladeController { */ @PostMapping("/submit") @ApiOperationSupport(order = 6) - @Operation(summary = "新增或修改", description = "传入bizPrice") + @Operation(summary = "新增或修改", description = "传入bizPrice") public R submit(@Valid @RequestBody BizPriceEntity bizPrice) { return R.status(bizPriceService.saveOrUpdate(bizPrice)); } @@ -135,7 +139,7 @@ public class BizPriceController extends BladeController { */ @PostMapping("/remove") @ApiOperationSupport(order = 7) - @Operation(summary = "逻辑删除", description = "传入ids") + @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { return R.status(bizPriceService.deleteLogic(Func.toLongList(ids))); } @@ -147,7 +151,7 @@ public class BizPriceController extends BladeController { @IsAdmin @GetMapping("/export-bizPrice") @ApiOperationSupport(order = 9) - @Operation(summary = "导出数据", description = "传入bizPrice") + @Operation(summary = "导出数据", description = "传入bizPrice") public void exportBizPrice(@Parameter(hidden = true) @RequestParam Map bizPrice, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(bizPrice, BizPriceEntity.class); //if (!AuthUtil.isAdministrator()) { diff --git a/src/main/java/org/springblade/modules/jinchao/controller/CatalogController.java b/src/main/java/org/springblade/modules/jinchao/controller/CatalogController.java index 1f9f7f5..823c4e2 100644 --- a/src/main/java/org/springblade/modules/jinchao/controller/CatalogController.java +++ b/src/main/java/org/springblade/modules/jinchao/controller/CatalogController.java @@ -63,7 +63,7 @@ import jakarta.servlet.http.HttpServletResponse; */ @RestController @AllArgsConstructor -@RequestMapping("jc/catalog") +@RequestMapping("jinchao/catalog") @Tag(name = "[产品目录]", description = "[产品目录]接口") public class CatalogController extends BladeController { diff --git a/src/main/java/org/springblade/modules/jinchao/controller/ContactController.java b/src/main/java/org/springblade/modules/jinchao/controller/ContactController.java index 0d9c840..7bb9932 100644 --- a/src/main/java/org/springblade/modules/jinchao/controller/ContactController.java +++ b/src/main/java/org/springblade/modules/jinchao/controller/ContactController.java @@ -50,8 +50,10 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; + import java.util.Map; import java.util.List; + import jakarta.servlet.http.HttpServletResponse; /** @@ -73,17 +75,18 @@ public class ContactController extends BladeController { */ @GetMapping("/detail") @ApiOperationSupport(order = 1) - @Operation(summary = "详情", description = "传入contact") + @Operation(summary = "详情", description = "传入contact") public R detail(ContactEntity contact) { ContactEntity detail = contactService.getOne(Condition.getQueryWrapper(contact)); return R.data(ContactWrapper.build().entityVO(detail)); } + /** * [客户联系人] 分页 */ @GetMapping("/list") @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入contact") + @Operation(summary = "分页", description = "传入contact") public R> list(@Parameter(hidden = true) @RequestParam Map contact, Query query) { IPage pages = contactService.page(Condition.getPage(query), Condition.getQueryWrapper(contact, ContactEntity.class)); return R.data(ContactWrapper.build().pageVO(pages)); @@ -94,7 +97,7 @@ public class ContactController extends BladeController { */ @GetMapping("/page") @ApiOperationSupport(order = 3) - @Operation(summary = "分页", description = "传入contact") + @Operation(summary = "分页", description = "传入contact") public R> page(ContactVO contact, Query query) { IPage pages = contactService.selectContactPage(Condition.getPage(query), contact); return R.data(pages); @@ -105,8 +108,9 @@ public class ContactController extends BladeController { */ @PostMapping("/save") @ApiOperationSupport(order = 4) - @Operation(summary = "新增", description = "传入contact") + @Operation(summary = "新增", description = "传入contact") public R save(@Valid @RequestBody ContactEntity contact) { + contact.setId(null); return R.status(contactService.save(contact)); } @@ -115,7 +119,7 @@ public class ContactController extends BladeController { */ @PostMapping("/update") @ApiOperationSupport(order = 5) - @Operation(summary = "修改", description = "传入contact") + @Operation(summary = "修改", description = "传入contact") public R update(@Valid @RequestBody ContactEntity contact) { return R.status(contactService.updateById(contact)); } @@ -125,7 +129,7 @@ public class ContactController extends BladeController { */ @PostMapping("/submit") @ApiOperationSupport(order = 6) - @Operation(summary = "新增或修改", description = "传入contact") + @Operation(summary = "新增或修改", description = "传入contact") public R submit(@Valid @RequestBody ContactEntity contact) { return R.status(contactService.saveOrUpdate(contact)); } @@ -135,7 +139,7 @@ public class ContactController extends BladeController { */ @PostMapping("/remove") @ApiOperationSupport(order = 7) - @Operation(summary = "逻辑删除", description = "传入ids") + @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { return R.status(contactService.deleteLogic(Func.toLongList(ids))); } @@ -147,7 +151,7 @@ public class ContactController extends BladeController { @IsAdmin @GetMapping("/export-contact") @ApiOperationSupport(order = 9) - @Operation(summary = "导出数据", description = "传入contact") + @Operation(summary = "导出数据", description = "传入contact") public void exportContact(@Parameter(hidden = true) @RequestParam Map contact, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(contact, ContactEntity.class); //if (!AuthUtil.isAdministrator()) { diff --git a/src/main/java/org/springblade/modules/jinchao/controller/CustomerController.java b/src/main/java/org/springblade/modules/jinchao/controller/CustomerController.java index b347918..74cba44 100644 --- a/src/main/java/org/springblade/modules/jinchao/controller/CustomerController.java +++ b/src/main/java/org/springblade/modules/jinchao/controller/CustomerController.java @@ -50,8 +50,10 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; + import java.util.Map; import java.util.List; + import jakarta.servlet.http.HttpServletResponse; /** @@ -73,17 +75,18 @@ public class CustomerController extends BladeController { */ @GetMapping("/detail") @ApiOperationSupport(order = 1) - @Operation(summary = "详情", description = "传入customer") + @Operation(summary = "详情", description = "传入customer") public R detail(CustomerEntity customer) { CustomerEntity detail = customerService.getOne(Condition.getQueryWrapper(customer)); return R.data(CustomerWrapper.build().entityVO(detail)); } + /** * [客户] 分页 */ @GetMapping("/list") @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入customer") + @Operation(summary = "分页", description = "传入customer") public R> list(@Parameter(hidden = true) @RequestParam Map customer, Query query) { IPage pages = customerService.page(Condition.getPage(query), Condition.getQueryWrapper(customer, CustomerEntity.class)); return R.data(CustomerWrapper.build().pageVO(pages)); @@ -94,7 +97,7 @@ public class CustomerController extends BladeController { */ @GetMapping("/page") @ApiOperationSupport(order = 3) - @Operation(summary = "分页", description = "传入customer") + @Operation(summary = "分页", description = "传入customer") public R> page(CustomerVO customer, Query query) { IPage pages = customerService.selectCustomerPage(Condition.getPage(query), customer); return R.data(pages); @@ -105,8 +108,9 @@ public class CustomerController extends BladeController { */ @PostMapping("/save") @ApiOperationSupport(order = 4) - @Operation(summary = "新增", description = "传入customer") + @Operation(summary = "新增", description = "传入customer") public R save(@Valid @RequestBody CustomerEntity customer) { + customer.setId(null); return R.status(customerService.save(customer)); } @@ -115,7 +119,7 @@ public class CustomerController extends BladeController { */ @PostMapping("/update") @ApiOperationSupport(order = 5) - @Operation(summary = "修改", description = "传入customer") + @Operation(summary = "修改", description = "传入customer") public R update(@Valid @RequestBody CustomerEntity customer) { return R.status(customerService.updateById(customer)); } @@ -125,7 +129,7 @@ public class CustomerController extends BladeController { */ @PostMapping("/submit") @ApiOperationSupport(order = 6) - @Operation(summary = "新增或修改", description = "传入customer") + @Operation(summary = "新增或修改", description = "传入customer") public R submit(@Valid @RequestBody CustomerEntity customer) { return R.status(customerService.saveOrUpdate(customer)); } @@ -135,7 +139,7 @@ public class CustomerController extends BladeController { */ @PostMapping("/remove") @ApiOperationSupport(order = 7) - @Operation(summary = "逻辑删除", description = "传入ids") + @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { return R.status(customerService.deleteLogic(Func.toLongList(ids))); } @@ -147,7 +151,7 @@ public class CustomerController extends BladeController { @IsAdmin @GetMapping("/export-customer") @ApiOperationSupport(order = 9) - @Operation(summary = "导出数据", description = "传入customer") + @Operation(summary = "导出数据", description = "传入customer") public void exportCustomer(@Parameter(hidden = true) @RequestParam Map customer, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(customer, CustomerEntity.class); //if (!AuthUtil.isAdministrator()) { diff --git a/src/main/java/org/springblade/modules/jinchao/controller/ProductController.java b/src/main/java/org/springblade/modules/jinchao/controller/ProductController.java index 0ce1554..9b20799 100644 --- a/src/main/java/org/springblade/modules/jinchao/controller/ProductController.java +++ b/src/main/java/org/springblade/modules/jinchao/controller/ProductController.java @@ -38,20 +38,21 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.modules.jinchao.pojo.vo.ProductVO; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.modules.jinchao.pojo.entity.ProductEntity; -import org.springblade.modules.jinchao.pojo.vo.ProductVO; import org.springblade.modules.jinchao.excel.ProductExcel; import org.springblade.modules.jinchao.wrapper.ProductWrapper; import org.springblade.modules.jinchao.service.IProductService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; + import java.util.Map; import java.util.List; + import jakarta.servlet.http.HttpServletResponse; /** @@ -73,17 +74,18 @@ public class ProductController extends BladeController { */ @GetMapping("/detail") @ApiOperationSupport(order = 1) - @Operation(summary = "详情", description = "传入product") + @Operation(summary = "详情", description = "传入product") public R detail(ProductEntity product) { ProductEntity detail = productService.getOne(Condition.getQueryWrapper(product)); return R.data(ProductWrapper.build().entityVO(detail)); } + /** * [产品] 分页 */ @GetMapping("/list") @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入product") + @Operation(summary = "分页", description = "传入product") public R> list(@Parameter(hidden = true) @RequestParam Map product, Query query) { IPage pages = productService.page(Condition.getPage(query), Condition.getQueryWrapper(product, ProductEntity.class)); return R.data(ProductWrapper.build().pageVO(pages)); @@ -94,7 +96,7 @@ public class ProductController extends BladeController { */ @GetMapping("/page") @ApiOperationSupport(order = 3) - @Operation(summary = "分页", description = "传入product") + @Operation(summary = "分页", description = "传入product") public R> page(ProductVO product, Query query) { IPage pages = productService.selectProductPage(Condition.getPage(query), product); return R.data(pages); @@ -105,8 +107,9 @@ public class ProductController extends BladeController { */ @PostMapping("/save") @ApiOperationSupport(order = 4) - @Operation(summary = "新增", description = "传入product") + @Operation(summary = "新增", description = "传入product") public R save(@Valid @RequestBody ProductEntity product) { + product.setId(null); return R.status(productService.save(product)); } @@ -115,7 +118,7 @@ public class ProductController extends BladeController { */ @PostMapping("/update") @ApiOperationSupport(order = 5) - @Operation(summary = "修改", description = "传入product") + @Operation(summary = "修改", description = "传入product") public R update(@Valid @RequestBody ProductEntity product) { return R.status(productService.updateById(product)); } @@ -125,7 +128,7 @@ public class ProductController extends BladeController { */ @PostMapping("/submit") @ApiOperationSupport(order = 6) - @Operation(summary = "新增或修改", description = "传入product") + @Operation(summary = "新增或修改", description = "传入product") public R submit(@Valid @RequestBody ProductEntity product) { return R.status(productService.saveOrUpdate(product)); } @@ -135,7 +138,7 @@ public class ProductController extends BladeController { */ @PostMapping("/remove") @ApiOperationSupport(order = 7) - @Operation(summary = "逻辑删除", description = "传入ids") + @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { return R.status(productService.deleteLogic(Func.toLongList(ids))); } @@ -147,7 +150,7 @@ public class ProductController extends BladeController { @IsAdmin @GetMapping("/export-product") @ApiOperationSupport(order = 9) - @Operation(summary = "导出数据", description = "传入product") + @Operation(summary = "导出数据", description = "传入product") public void exportProduct(@Parameter(hidden = true) @RequestParam Map product, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(product, ProductEntity.class); //if (!AuthUtil.isAdministrator()) { @@ -157,5 +160,4 @@ public class ProductController extends BladeController { List list = productService.exportProduct(queryWrapper); ExcelUtil.export(response, "[产品]数据" + DateUtil.time(), "[产品]数据表", list, ProductExcel.class); } - } diff --git a/src/main/java/org/springblade/modules/jinchao/controller/ProductObjController.java b/src/main/java/org/springblade/modules/jinchao/controller/ProductObjController.java index 5acfe6a..666e28b 100644 --- a/src/main/java/org/springblade/modules/jinchao/controller/ProductObjController.java +++ b/src/main/java/org/springblade/modules/jinchao/controller/ProductObjController.java @@ -50,8 +50,10 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; + import java.util.Map; import java.util.List; + import jakarta.servlet.http.HttpServletResponse; /** @@ -73,17 +75,18 @@ public class ProductObjController extends BladeController { */ @GetMapping("/detail") @ApiOperationSupport(order = 1) - @Operation(summary = "详情", description = "传入productObj") + @Operation(summary = "详情", description = "传入productObj") public R detail(ProductObjEntity productObj) { ProductObjEntity detail = productObjService.getOne(Condition.getQueryWrapper(productObj)); return R.data(ProductObjWrapper.build().entityVO(detail)); } + /** * [产品实物] 分页 */ @GetMapping("/list") @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入productObj") + @Operation(summary = "分页", description = "传入productObj") public R> list(@Parameter(hidden = true) @RequestParam Map productObj, Query query) { IPage pages = productObjService.page(Condition.getPage(query), Condition.getQueryWrapper(productObj, ProductObjEntity.class)); return R.data(ProductObjWrapper.build().pageVO(pages)); @@ -94,7 +97,7 @@ public class ProductObjController extends BladeController { */ @GetMapping("/page") @ApiOperationSupport(order = 3) - @Operation(summary = "分页", description = "传入productObj") + @Operation(summary = "分页", description = "传入productObj") public R> page(ProductObjVO productObj, Query query) { IPage pages = productObjService.selectProductObjPage(Condition.getPage(query), productObj); return R.data(pages); @@ -105,8 +108,9 @@ public class ProductObjController extends BladeController { */ @PostMapping("/save") @ApiOperationSupport(order = 4) - @Operation(summary = "新增", description = "传入productObj") + @Operation(summary = "新增", description = "传入productObj") public R save(@Valid @RequestBody ProductObjEntity productObj) { + productObj.setId(null); return R.status(productObjService.save(productObj)); } @@ -115,7 +119,7 @@ public class ProductObjController extends BladeController { */ @PostMapping("/update") @ApiOperationSupport(order = 5) - @Operation(summary = "修改", description = "传入productObj") + @Operation(summary = "修改", description = "传入productObj") public R update(@Valid @RequestBody ProductObjEntity productObj) { return R.status(productObjService.updateById(productObj)); } @@ -125,7 +129,7 @@ public class ProductObjController extends BladeController { */ @PostMapping("/submit") @ApiOperationSupport(order = 6) - @Operation(summary = "新增或修改", description = "传入productObj") + @Operation(summary = "新增或修改", description = "传入productObj") public R submit(@Valid @RequestBody ProductObjEntity productObj) { return R.status(productObjService.saveOrUpdate(productObj)); } @@ -135,7 +139,7 @@ public class ProductObjController extends BladeController { */ @PostMapping("/remove") @ApiOperationSupport(order = 7) - @Operation(summary = "逻辑删除", description = "传入ids") + @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { return R.status(productObjService.deleteLogic(Func.toLongList(ids))); } @@ -147,7 +151,7 @@ public class ProductObjController extends BladeController { @IsAdmin @GetMapping("/export-productObj") @ApiOperationSupport(order = 9) - @Operation(summary = "导出数据", description = "传入productObj") + @Operation(summary = "导出数据", description = "传入productObj") public void exportProductObj(@Parameter(hidden = true) @RequestParam Map productObj, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(productObj, ProductObjEntity.class); //if (!AuthUtil.isAdministrator()) { @@ -157,5 +161,4 @@ public class ProductObjController extends BladeController { List list = productObjService.exportProductObj(queryWrapper); ExcelUtil.export(response, "[产品实物]数据" + DateUtil.time(), "[产品实物]数据表", list, ProductObjExcel.class); } - } diff --git a/src/main/java/org/springblade/modules/jinchao/excel/BizPriceExcel.java b/src/main/java/org/springblade/modules/jinchao/excel/BizPriceExcel.java index 4072cf7..a644f63 100644 --- a/src/main/java/org/springblade/modules/jinchao/excel/BizPriceExcel.java +++ b/src/main/java/org/springblade/modules/jinchao/excel/BizPriceExcel.java @@ -86,12 +86,11 @@ public class BizPriceExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("特定用户价格") - private BigDecimal bizPrice; + private Double bizPrice; /** * 是否已删除 */ @ColumnWidth(20) @ExcelProperty("是否已删除") private Integer isDeleted; - } diff --git a/src/main/java/org/springblade/modules/jinchao/excel/ProductExcel.java b/src/main/java/org/springblade/modules/jinchao/excel/ProductExcel.java index d9a0501..d79914c 100644 --- a/src/main/java/org/springblade/modules/jinchao/excel/ProductExcel.java +++ b/src/main/java/org/springblade/modules/jinchao/excel/ProductExcel.java @@ -122,13 +122,13 @@ public class ProductExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("倍率") - private BigDecimal multiple; + private Double multiple; /** * 公司指导价 */ @ColumnWidth(20) @ExcelProperty("公司指导价") - private BigDecimal standardPrice; + private Double standardPrice; /** * 中文备注 */ @@ -141,5 +141,4 @@ public class ProductExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("英文备注") private String remarkEn; - } diff --git a/src/main/java/org/springblade/modules/jinchao/mapper/BizPriceMapper.xml b/src/main/java/org/springblade/modules/jinchao/mapper/BizPriceMapper.xml index 525b84b..7f37181 100644 --- a/src/main/java/org/springblade/modules/jinchao/mapper/BizPriceMapper.xml +++ b/src/main/java/org/springblade/modules/jinchao/mapper/BizPriceMapper.xml @@ -33,5 +33,4 @@ SELECT * FROM jc_biz_price ${ew.customSqlSegment} - diff --git a/src/main/java/org/springblade/modules/jinchao/mapper/ContactMapper.xml b/src/main/java/org/springblade/modules/jinchao/mapper/ContactMapper.xml index 13d38b8..75d2c40 100644 --- a/src/main/java/org/springblade/modules/jinchao/mapper/ContactMapper.xml +++ b/src/main/java/org/springblade/modules/jinchao/mapper/ContactMapper.xml @@ -35,5 +35,4 @@ SELECT * FROM jc_contact ${ew.customSqlSegment} - diff --git a/src/main/java/org/springblade/modules/jinchao/mapper/CustomerMapper.xml b/src/main/java/org/springblade/modules/jinchao/mapper/CustomerMapper.xml index e5e6505..c822a0e 100644 --- a/src/main/java/org/springblade/modules/jinchao/mapper/CustomerMapper.xml +++ b/src/main/java/org/springblade/modules/jinchao/mapper/CustomerMapper.xml @@ -38,5 +38,4 @@ SELECT * FROM jc_customer ${ew.customSqlSegment} - diff --git a/src/main/java/org/springblade/modules/jinchao/mapper/ProductObjMapper.xml b/src/main/java/org/springblade/modules/jinchao/mapper/ProductObjMapper.xml index 62cb69b..878eff8 100644 --- a/src/main/java/org/springblade/modules/jinchao/mapper/ProductObjMapper.xml +++ b/src/main/java/org/springblade/modules/jinchao/mapper/ProductObjMapper.xml @@ -40,5 +40,4 @@ SELECT * FROM jc_product_obj ${ew.customSqlSegment} - diff --git a/src/main/java/org/springblade/modules/jinchao/pojo/entity/ProductEntity.java b/src/main/java/org/springblade/modules/jinchao/pojo/entity/ProductEntity.java index f76d267..222e21d 100644 --- a/src/main/java/org/springblade/modules/jinchao/pojo/entity/ProductEntity.java +++ b/src/main/java/org/springblade/modules/jinchao/pojo/entity/ProductEntity.java @@ -91,12 +91,12 @@ public class ProductEntity extends TenantEntity { * 倍率 */ @Schema(description = "倍率") - private BigDecimal multiple; + private Double multiple; /** * 公司指导价 */ @Schema(description = "公司指导价") - private BigDecimal standardPrice; + private Double standardPrice; /** * 中文备注 */ @@ -107,5 +107,4 @@ public class ProductEntity extends TenantEntity { */ @Schema(description = "英文备注") private String remarkEn; - } diff --git a/src/main/java/org/springblade/modules/jinchao/pojo/vo/ProductVO.java b/src/main/java/org/springblade/modules/jinchao/pojo/vo/ProductVO.java new file mode 100644 index 0000000..4f814e3 --- /dev/null +++ b/src/main/java/org/springblade/modules/jinchao/pojo/vo/ProductVO.java @@ -0,0 +1,73 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.modules.jinchao.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.modules.jinchao.pojo.entity.ProductEntity; +import org.springblade.modules.jinchao.pojo.entity.ProductObjEntity; + +import java.io.Serial; + +/** + * [产品] 视图实体类 + * + * @author BladeX + * @since 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ProductVO extends ProductEntity { + @Serial + private static final long serialVersionUID = 1L; + + /** + * [1]标准;[2]客户特定价 + */ + @Schema(description = "[1]标准;[2]客户特定价") + private Integer type; + /** + * [产品]id + */ + @Schema(description = "[产品]id") + private Long productId; + /** + * 业务员[用户]id + */ + @Schema(description = "业务员[用户]id") + private Long saleUserId; + /** + * [客户]id + */ + @Schema(description = "[客户]id") + private Long customerId; + /** + * 特定用户价格 + */ + @Schema(description = "特定用户价格") + private Double bizPrice; +}